Fixed ic2 classic support on the master!

This commit is contained in:
Modmuss50 2015-09-14 21:05:26 +01:00
parent 8eee2959d2
commit 0bf7e1968e
2 changed files with 4 additions and 2 deletions

View file

@ -35,7 +35,7 @@ repositories {
} }
maven { maven {
name = "Modmuss50" name = "Modmuss50"
url = "http://modmuss50.me/maven/" url = "http://maven.modmuss50.me/"
} }
maven { maven {
name = "Qmunity" name = "Qmunity"
@ -116,6 +116,7 @@ dependencies {
compile 'Azanor:Thaumcraft:4.2.3.5:deobf@jar' compile 'Azanor:Thaumcraft:4.2.3.5:deobf@jar'
compile "com.github.azanor:baubles:1.0.1.10:deobf@jar" compile "com.github.azanor:baubles:1.0.1.10:deobf@jar"
compile name: "MineTweaker3", version: "1.7.10-3.0.9C", classifier: "Dev" compile name: "MineTweaker3", version: "1.7.10-3.0.9C", classifier: "Dev"
shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-2:api'
} }

View file

@ -1,6 +1,7 @@
package techreborn.compat; package techreborn.compat;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
import ic2.api.info.IC2Classic;
import techreborn.compat.ee3.EmcValues; import techreborn.compat.ee3.EmcValues;
import techreborn.compat.minetweaker.MinetweakerCompat; import techreborn.compat.minetweaker.MinetweakerCompat;
import techreborn.compat.recipes.*; import techreborn.compat.recipes.*;
@ -17,7 +18,7 @@ public class CompatManager {
public CompatManager() { public CompatManager() {
registerCompact(CompatModuleWaila.class, "Waila"); registerCompact(CompatModuleWaila.class, "Waila");
registerCompact(RecipesIC2.class, "IC2"); registerCompact(RecipesIC2.class, "IC2", !IC2Classic.isIc2ClassicLoaded());
registerCompact(RecipesBuildcraft.class, "BuildCraft|Core", "IC2"); registerCompact(RecipesBuildcraft.class, "BuildCraft|Core", "IC2");
registerCompact(RecipesThermalExpansion.class, "ThermalExpansion"); registerCompact(RecipesThermalExpansion.class, "ThermalExpansion");
registerCompact(EmcValues.class, "EE3"); registerCompact(EmcValues.class, "EE3");