Commit graph

363 commits

Author SHA1 Message Date
Ben Spiers 9d06fa91c1 Prepare some gui textures and texture sheets for upcoming GuiProgress. 2014-04-17 02:06:47 +01:00
Ben Spiers 97c5e98d91 Generators and Energy Cube Gui improvements. 2014-04-16 02:36:52 +01:00
Ben Spiers af8973f18a Add Plastic road, update lang. 2014-04-16 00:08:09 +01:00
Ben Spiers 8786b16b58 Merge branch 'development' into greylocke
Conflicts:
	resources/assets/mekanism/lang/pl_PL.lang
2014-04-14 17:11:48 +01:00
Ben Spiers 51c1bd4500 Merge branch 'master' into development 2014-04-14 17:07:36 +01:00
Ben Spiers 9eb207a7ff Add Glow Panel to localisation files 2014-04-14 01:42:47 +01:00
Ben Spiers 3dd06cca78 Glow panels. 2014-04-13 03:05:50 +01:00
Ben Spiers aac74a100a Lots of GUI element work. Fixed Crystallizer typo. 2014-04-12 02:51:02 +01:00
Ben Spiers 5edf734292 Gui work 2014-04-11 21:10:14 +01:00
Ben Spiers 30c6a3b3b2 Work on localisations and Item rendering. 2014-04-11 03:32:52 +01:00
kostek00 575ba0ad65 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-04-10 03:07:27 +01:00
Ben Spiers 04668a16a0 HDPE Blocks! 64 new cosmetic blocks for the low low price of just 4 new textures! 2014-04-10 03:05:28 +01:00
Ben Spiers 9e799ce603 Work on giving the PRC a GUI and adding in some missing textures (I don't usually do pixel art for a reason. This reason should be apparent). 2014-04-08 03:13:36 +01:00
Ben Spiers 8373b93dd3 More work on Guis and elements 2014-04-08 00:00:53 +01:00
Ben Spiers ffebfb0a9e More work on Gas gauge stuff 2014-04-07 03:28:05 +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