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 |
|
modmuss50
|
d973d6b108
|
Added back some more compat
|
2015-12-28 10:57:22 +00:00 |
|
Modmuss50
|
0fdba82490
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
# src/main/java/techreborn/compat/CompatManager.java
|
2015-12-16 17:10:25 +00:00 |
|
Modmuss50
|
abb9b5102f
|
2731
|
2015-11-23 14:49:35 +00:00 |
|
