TechReborn/src/main/java/techreborn/compat
modmuss50 0922e0b886
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
2016-12-26 23:49:42 +00:00
..
ic2 Auto Format code 2016-10-08 20:46:16 +01:00
jei Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 2016-12-26 23:49:42 +00:00
minetweaker Auto Format code 2016-10-08 20:46:16 +01:00
psi Comment out psi support and remove jar 2016-05-08 09:53:48 +01:00
theoneprobe TOP support now changes colours based on energy system config 2016-12-10 17:15:30 -08:00
tinkers Auto format 2016-11-25 13:25:51 +00:00
waila Auto Format code 2016-10-08 20:46:16 +01:00
CompatManager.java Auto format 2016-11-25 13:25:51 +00:00
ICompatModule.java Auto Format code 2016-10-08 20:46:16 +01:00