Calclavia 07332ca245 Merge branch 'master' into universal-wires ... Conflicts: common/mekanism/induction/common/MekanismInduction.java resources/assets/mekanism/lang/en_US.lang		2013-12-02 19:47:38 +08:00
..
de_DE.lang	Update de_DE.lang	2013-12-01 18:43:13 +01:00
en_US.lang	Merge branch 'master' into universal-wires	2013-12-02 19:47:38 +08:00
fr_FR.lang	French Translation	2013-11-27 00:52:47 +01:00
pl_PL.lang	Added name for bins, fixed IC2 bug, hopefully fixed ConcurrentModificationException	2013-11-11 17:23:14 -05:00
ru_RU.lang	Remove Capacitor and Empty Capacitor, fix mouses, made sorter and miner maintain configuration	2013-11-21 21:37:03 -05:00
zh_CN.lang	Update zh_CN.lang	2013-11-27 13:34:14 +08:00