Ben Spiers 8786b16b58 Merge branch 'development' into greylocke ... Conflicts: resources/assets/mekanism/lang/pl_PL.lang		2014-04-14 17:11:48 +01:00
..
de_DE.lang	Lots of GUI element work. Fixed Crystallizer typo.	2014-04-12 02:51:02 +01:00
en_GB.lang	Stop FML complaining about item conflicts, fix my translation.	2014-01-05 17:53:10 +00:00
en_US.lang	Add Glow Panel to localisation files	2014-04-14 01:42:47 +01:00
fr_FR.lang	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
pl_PL.lang	Merge branch 'development' into greylocke	2014-04-14 17:11:48 +01:00
pt_BR.lang	Lots of GUI element work. Fixed Crystallizer typo.	2014-04-12 02:51:02 +01:00
ru_RU.lang	Update ru_RU.lang	2014-01-12 15:21:21 +03:00
zh_CN.lang	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
zh_TW.lang	Lots of GUI element work. Fixed Crystallizer typo.	2014-04-12 02:51:02 +01:00