Commit graph

11 commits

Author SHA1 Message Date
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
aac74a100a Lots of GUI element work. Fixed Crystallizer typo. 2014-04-12 02:51:02 +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
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
Ben Spiers
f84bc43be1 Move separator into mek core, let IDEA optimise imports. Hope I didn't screw anything up too badly. 2014-01-03 02:09:21 +00:00
Aidan Brady
f6704dc5ea Added name for bins, fixed IC2 bug, hopefully fixed ConcurrentModificationException 2013-11-11 17:23:14 -05:00
Aidan Brady
01a6174fdb Lots of things! 2013-11-03 16:54:33 -05:00
Aidan Brady
c3fa020561 New Electric Pump model! 2013-11-03 12:07:23 -05:00
Aidan C. Brady
91a8839203 Deleted Theoretical Elementizer, Weather Orb, and Steve's Stopwatch. They are no longer fitting for Mekanism's goal. 2013-11-01 11:33:00 -04:00
Aidan Brady
340ccd1e87 Slightly better packet management, removed Control Panel 2013-10-27 00:08:39 -04:00
magik6k
6d5ae084ec Add Polish translation 2013-10-25 20:55:50 +02:00