Blood-Asp 1296755b27 Merge branch 'refs/heads/pr/1077' into unstable ... # Conflicts: # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java		2017-06-07 09:37:13 +02:00
..
bloodasp/galacticgreg	Bugs & Removal of GG's TileEntityOres	2016-07-29 20:13:02 +01:00
gregtech	Merge branch 'refs/heads/pr/1077' into unstable	2017-06-07 09:37:13 +02:00
speiger/src/crops/api	Added Crop Calculator support.	2016-04-26 13:30:26 -07:00