Johannes Gäßler 668ca431a8 Merge remote-tracking branch 'origin/unstable' into OilRefining ... Conflicts: src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java		2017-06-18 17:26:04 +02:00
..
automation	Refactored mDescription to mDescriptionArray, added a deprecated field	2017-04-26 20:37:47 +02:00
boilers	Correcting Steel Boiler Tooltip #1080	2017-06-06 13:00:11 +02:00
generators	that makes it look better?	2017-06-01 12:01:20 +02:00
machines	Merge remote-tracking branch 'origin/unstable' into OilRefining	2017-06-18 17:26:04 +02:00
storage	Add missing translation lines. #772	2017-06-05 20:45:15 +02:00