8 commits

Author	SHA1	Message	Date
OneEyeMaker	eec5b2faa7	Fixed merge conflicts.	2016-07-26 09:02:10 +03:00
OneEyeMaker	ce1e6917e0	Preparations for moving all heating coils to another block.	2016-07-18 09:06:26 +03:00
Blood-Asp	4537392c10	Reserving Meta IDs	2016-01-10 14:18:16 +01:00
Blood-Asp	66427b2178	fix fluidstack memory overflow	2015-12-06 18:37:10 +01:00
Shawn Buckley	9353aa711b	Reformat code	2015-10-21 22:06:25 -04:00
Shawn Buckley	445e6c3f25	Replace T/F with builtin boolean values	2015-10-21 22:01:39 -04:00
Shawn Buckley	bea4cfc545	Bring in experimental branch	2015-10-21 20:47:13 -04:00
Shawn Buckley	1185424fa7	Move source files	2015-10-21 20:46:52 -04:00

Renamed from main/java/gregtech/api/GregTech_API.java (Browse further)