modmuss50 9a585bcfb2 Merge branch '1.7.10' into 1.8.9 ... Conflicts: build.gradle src/main/java/techreborn/blocks/BlockOre.java src/main/java/techreborn/items/ItemCells.java		2016-02-16 13:49:25 +00:00
..
compat	Merge branch '1.7.10' into 1.8.9	2016-02-16 13:49:25 +00:00
partSystem	Merge branch 'master' into 1.8.8	2015-12-12 17:39:23 +00:00