Commit graph

5 commits

Author SHA1 Message Date
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