modmuss50
|
721ba370bb
|
Remove old partsystem, time for a new one
|
2016-03-02 15:43:39 +00:00 |
|
modmuss50
|
e680f3fb1f
|
Updates, and re added support
|
2016-02-29 11:20:40 +00:00 |
|
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
|
54817286e6
|
Revert "test to fix build issue"
This reverts commit eed1a7a719.
|
2015-12-30 17:09:17 +00:00 |
|
modmuss50
|
0c7f07001b
|
temp remove jei support to track down build issue.
|
2015-12-30 17:06:24 +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
|
abcaccdc82
|
Added waila support back
|
2015-12-13 19:41:46 +00:00 |
|
modmuss50
|
fb6b5135e4
|
Merge branch 'master' into 1.8.8
# Conflicts:
# ToAddBack/partSystem/parts/CablePart.java
|
2015-12-12 17:39:23 +00:00 |
|
Modmuss50
|
d5ce5cba04
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
# src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
|
2015-12-12 11:41:21 +00:00 |
|
modmuss50
|
3fb7dd102b
|
Inital Just Enough Items support
|
2015-11-29 10:42:34 +00:00 |
|
Modmuss50
|
abb9b5102f
|
2731
|
2015-11-23 14:49:35 +00:00 |
|
