8 commits

Author	SHA1	Message	Date
Muramasa	e981c0db30	One more conflict	2016-09-16 00:27:47 +01:00
Muramasa	6ac01a92c9	Fix conflicts	2016-09-16 00:17:08 +01:00
Muramasa	f94313e9b1	Bugfixes 6 fix: Removed commented code	2016-08-14 07:24:57 +01:00
Muramasa	19062e1d36	Bugfixes 6	2016-08-14 05:56:41 +01:00
Muramasa	bfccecf87b	Bugfixes 5	2016-08-14 05:36:12 +01:00
Shawn Buckley	9353aa711b	Reformat code	2015-10-21 22:06:25 -04:00
Shawn Buckley	c68e84f1e2	Remove jdgui-comments	2015-10-21 21:11:56 -04:00
Shawn Buckley	1185424fa7	Move source files	2015-10-21 20:46:52 -04:00

Renamed from main/java/gregtech/common/blocks/GT_Item_Machines.java (Browse further)