Commit graph

349 commits

Author SHA1 Message Date
Ben Spiers
51c1bd4500 Merge branch 'master' into development 2014-04-14 17:07:36 +01:00
Ben Spiers
1298d544d5 Add tiers to Mechanical Pipe, primarily to allow pumping out greater volumes of fluid per connection, for mods that require massive amounts of fluid per tick, for example AS' turbines need ten buckets per tick to spin up. Also fix capacity updating. 2014-04-01 19:16:07 +01:00
Vexatos
e573b97913 Update de_DE.lang 2014-03-24 20:03:07 +01:00
Aidan C. Brady
92cfba7308 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-03-15 20:32:29 -04:00
Aidan C. Brady
7398b21554 Loads of work on Seismic Vibrator 2014-03-15 20:05:26 -04:00
kostek00
aa4007ecf7 Update pl_PL.lang
Translated lacking lines, moved lines to mach en_US.lang file, changed translation for some items and blocks and changed big letter for second and later words as there is no such thing in polish if it's not invented name which they aren't.
2014-03-12 18:30:42 +01:00
Vexatos
9e4d347f8a Update en_US.lang 2014-03-12 17:34:17 +01:00
Vexatos
734f24d592 Update de_DE.lang 2014-03-12 17:33:50 +01:00
Vexatos
8ddc6a9c37 Update de_DE.lang 2014-03-12 17:27:56 +01:00
Vexatos
9778404451 Update de_DE.lang 2014-03-12 17:22:35 +01:00
Aidan C. Brady
3fd2701524 Hopefully finish GUI stuff 2014-03-09 18:51:46 -04:00
Aidan C. Brady
bb0ad74295 Work on sorter material filters 2014-03-09 18:23:06 -04:00
Aidan C. Brady
509d857576 Just about finished, onto sorters 2014-03-09 12:10:51 -04:00
Aidan C. Brady
850481bf3d Got the GUI working mostly 2014-03-09 11:56:08 -04:00
Aidan C. Brady
1b27b6a37b Work on Digital Miner material filters 2014-03-09 11:37:42 -04:00
Aidan C. Brady
1500bfe929 Filter Cards, all done 2014-03-08 17:47:39 -05:00
Mr-Turing
afc8f5b8f5 Update pt_BR.lang
Fixed minor mistakes and added to pt_BR translation.
Still missing tooltips and equipment.
2014-03-06 15:51:13 -03:00
BrunoLG
82bc0afcb8 Create pt_BR.lang 2014-03-05 15:54:26 -03:00
Aidan Brady
f165a6a753 Whoops! Got rid of the old Atomic Disassembler icon 2014-03-01 17:49:41 -05:00
mymagadsl
40e64fed63 Update zh_TW.lang
fix: 
tile.MachineBlock2.OxidationChamber.name=化學氧化機
to:
tile.MachineBlock2.ChemicalOxidizer.name=化學氧化機
2014-02-26 23:44:03 +08:00
mymagadsl
94dffbf4a1 Create zh_TW.lang
Modified from zh_cn.lang
2014-02-23 12:53:03 +08:00
Aidan Brady
5b7a889be2 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-21 17:31:33 -05:00
Aidan Brady
ecb410d005 Fixed recipes, added sounds 2014-02-21 17:30:40 -05:00
Vexatos
f26c84283f Update de_DE.lang 2014-02-21 18:48:10 +01:00
Aidan C. Brady
9915d18baa Add visible configuration to Metallurgic Infuser, made Chemical Crystalizer auto-eject and gave it inventory configuration 2014-02-17 00:14:02 -05:00
Aidan Brady
87de087df9 Typo fix 2014-02-15 15:25:37 -05:00
Aidan Brady
f18eea9a14 Step 2 of another Digital Miner overhaul 2014-02-15 15:01:17 -05:00
Aidan Brady
1a179b914c Fix Digital Miner text 2014-02-15 14:50:40 -05:00
Aidan Brady
0904b4d7f6 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-10 21:12:31 -05:00
Aidan Brady
28459b134e Armored Jetpack…done. Also made Charcoal Blocks fuel sources 2014-02-10 21:10:30 -05:00
Aidan C. Brady
0618856b96 Fix GUI 2014-02-08 19:45:31 -05:00
Aidan Brady
f617e188f4 Quick fixes 2014-02-05 21:37:17 -05:00
Aidan Brady
81fed07f96 Start on Armored Jetpack 2014-02-05 21:25:05 -05:00
Aidan Brady
b821be5417 General enhancements 2014-02-05 20:22:43 -05:00
Aidan Brady
6e210f0730 Model positioning 2014-02-05 19:26:57 -05:00
Aidan C. Brady
879bc0e93d Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-05 13:39:29 -05:00
Aidan C. Brady
2e325a0d31 Start on new Advanced Solar Generator model 2014-02-05 13:39:24 -05:00
Aidan Brady
afd954b510 Begin implementation of new AD model 2014-02-04 23:06:33 -05:00
spookydonut (Ash Wiren)
a15d964a8a Added UI elements for #962, making electrolytic separators dump excess gas 2014-02-04 17:07:37 +08:00
Aidan Brady
c8002dda5f Fixed Adv. Electric Machine issue, fixed crash, Robits now display moving treads 2014-02-03 21:28:48 -05:00
Aidan C. Brady
10844201d2 Touch up on Chemical Dissolution Chamber GUI title 2014-02-01 21:27:10 -05:00
Aidan C. Brady
c6cb70c9da Gas tanks can now dump gasses 2014-02-01 20:32:26 -05:00
Aidan
00c055dfdc Merge pull request #942 from Vexatos/patch-1
Update de_DE.lang
2014-02-01 15:17:15 -08:00
Aidan C. Brady
efe2502be1 Friction Boots - semi-working 2014-02-01 16:33:27 -05:00
Vexatos
b69c9af5d3 Update de_DE.lang 2014-02-01 22:11:22 +01:00
Aidan C. Brady
c3a1b6b3c5 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-01 15:15:37 -05:00
Aidan C. Brady
fa55b3a8ce Chemical Crystalizer NEI module 2014-02-01 15:15:30 -05:00
Aidan Brady
3803bfde24 Add resources for Friction Boots 2014-02-01 15:04:37 -05:00
Aidan C. Brady
2085220637 Chemical Dissolution Chamber NEI module 2014-02-01 14:59:31 -05:00
Aidan C. Brady
04441968be Chemical Washer NEI module 2014-02-01 14:36:55 -05:00