Techlone 86318b7b44 Merge branch 'unstable' into advminer2_improvements ... # Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java		2017-06-07 18:17:23 +05: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 branch 'unstable' into advminer2_improvements	2017-06-07 18:17:23 +05:00
storage	Add missing translation lines. #772	2017-06-05 20:45:15 +02:00