diff --git a/build.gradle b/build.gradle index 1ce6837fd..c814fb73c 100644 --- a/build.gradle +++ b/build.gradle @@ -87,8 +87,8 @@ dependencies { deobfCompile "mezz.jei:jei_1.9.4:+" deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.2.0_67:universal' compile "net.darkhax.tesla:Tesla:1.9-1.0.2.23:deobf" - deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132" - deobfCompile "slimeknights:TConstruct:1.9-2.3.0.jenkins193" + //deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132" + //deobfCompile "slimeknights:TConstruct:1.9-2.3.0.jenkins193" } diff --git a/libs/CraftTweaker-Customized-1.9-3.0.3.jar b/libs/CraftTweaker-Customized-1.9-3.0.3.jar deleted file mode 100644 index 2b99a6120..000000000 Binary files a/libs/CraftTweaker-Customized-1.9-3.0.3.jar and /dev/null differ diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index b74e13a8a..a27fa3003 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -4,8 +4,6 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import techreborn.client.render.parts.ClientPartLoader; -import techreborn.compat.minetweaker.MinetweakerCompat; -import techreborn.compat.tinkers.CompatModuleTinkers; import techreborn.compat.waila.CompatModuleWaila; import techreborn.config.ConfigTechReborn; import techreborn.parts.StandalonePartCompact; @@ -40,13 +38,13 @@ public class CompatManager { isGregTechLoaded = true; } - registerCompact(MinetweakerCompat.class, "MineTweaker3"); + //registerCompact(MinetweakerCompat.class, "MineTweaker3"); registerCompact(TechRebornParts.class, "mcmultipart"); registerCompact(ClientPartLoader.class, "mcmultipart", "@client"); registerCompact(StandalonePartCompact.class, "!mcmultipart"); registerCompact(WailaMcMultiPartCompact.class, "mcmultipart", "Waila", "!IC2"); registerCompact(CompatModuleWaila.class, "Waila"); - registerCompact(CompatModuleTinkers.class, "tconstruct"); + //registerCompact(CompatModuleTinkers.class, "tconstruct"); //registerCompact(CompatModulePsi.class, "Psi"); } diff --git a/src/main/java/techreborn/compat/minetweaker/MTAlloySmelter.java b/toaddback/minetweaker/MTAlloySmelter.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTAlloySmelter.java rename to toaddback/minetweaker/MTAlloySmelter.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTAssemblingMachine.java b/toaddback/minetweaker/MTAssemblingMachine.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTAssemblingMachine.java rename to toaddback/minetweaker/MTAssemblingMachine.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTBlastFurnace.java b/toaddback/minetweaker/MTBlastFurnace.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTBlastFurnace.java rename to toaddback/minetweaker/MTBlastFurnace.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTCentrifuge.java b/toaddback/minetweaker/MTCentrifuge.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTCentrifuge.java rename to toaddback/minetweaker/MTCentrifuge.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTChemicalReactor.java b/toaddback/minetweaker/MTChemicalReactor.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTChemicalReactor.java rename to toaddback/minetweaker/MTChemicalReactor.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java b/toaddback/minetweaker/MTFusionReactor.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java rename to toaddback/minetweaker/MTFusionReactor.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTGenerator.java b/toaddback/minetweaker/MTGenerator.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTGenerator.java rename to toaddback/minetweaker/MTGenerator.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTGeneric.java b/toaddback/minetweaker/MTGeneric.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTGeneric.java rename to toaddback/minetweaker/MTGeneric.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTImplosionCompressor.java b/toaddback/minetweaker/MTImplosionCompressor.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTImplosionCompressor.java rename to toaddback/minetweaker/MTImplosionCompressor.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTIndustrialElectrolyzer.java b/toaddback/minetweaker/MTIndustrialElectrolyzer.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTIndustrialElectrolyzer.java rename to toaddback/minetweaker/MTIndustrialElectrolyzer.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTIndustrialGrinder.java b/toaddback/minetweaker/MTIndustrialGrinder.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTIndustrialGrinder.java rename to toaddback/minetweaker/MTIndustrialGrinder.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTIndustrialSawmill.java b/toaddback/minetweaker/MTIndustrialSawmill.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTIndustrialSawmill.java rename to toaddback/minetweaker/MTIndustrialSawmill.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTPlateCuttingMachine.java b/toaddback/minetweaker/MTPlateCuttingMachine.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTPlateCuttingMachine.java rename to toaddback/minetweaker/MTPlateCuttingMachine.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTRollingMachine.java b/toaddback/minetweaker/MTRollingMachine.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTRollingMachine.java rename to toaddback/minetweaker/MTRollingMachine.java diff --git a/src/main/java/techreborn/compat/minetweaker/MTVacuumFreezer.java b/toaddback/minetweaker/MTVacuumFreezer.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MTVacuumFreezer.java rename to toaddback/minetweaker/MTVacuumFreezer.java diff --git a/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java b/toaddback/minetweaker/MinetweakerCompat.java similarity index 100% rename from src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java rename to toaddback/minetweaker/MinetweakerCompat.java diff --git a/src/main/java/techreborn/compat/tinkers/CompatModuleTinkers.java b/toaddback/tinkers/CompatModuleTinkers.java similarity index 100% rename from src/main/java/techreborn/compat/tinkers/CompatModuleTinkers.java rename to toaddback/tinkers/CompatModuleTinkers.java diff --git a/src/main/java/techreborn/compat/tinkers/TinkersFluids.java b/toaddback/tinkers/TinkersFluids.java similarity index 100% rename from src/main/java/techreborn/compat/tinkers/TinkersFluids.java rename to toaddback/tinkers/TinkersFluids.java