Ellpeck 30483e24a4 Merge remote-tracking branch 'origin/master'		2016-08-05 13:07:21 +02:00
..
java	Made the reconstructor use the right amount of energy for items >_>	2016-08-05 13:07:11 +02:00
resources	Update zh_CN file (#189)	2016-08-05 12:51:07 +02:00