Merge branch 'master' into ThE-larger_cell

dependencies.gradle

@@ -1,23 +1,23 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.79:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.91:dev")
     api("com.github.GTNewHorizons:Yamcl:0.5.86:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.1.16:dev")
 
     compileOnly("com.github.GTNewHorizons:Avaritia:1.46:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.4:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TecTech:5.3.13:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:bartworks:0.8.11:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TecTech:5.3.14:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:bartworks:0.8.12:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.11-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly("curse.maven:witchery-69673:2234410") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.29:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Chisel:2.12.2-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.32:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false }
     compileOnly("curse.maven:extra-utilities-225561:2264384") { transitive = false }

src/main/java/com/dreammaster/gthandler/GT_CoreModSupport.java

@@ -5,7 +5,6 @@
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.MaterialBuilder;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.TextureSet;
 import gregtech.api.interfaces.IMaterialHandler;
@@ -78,36 +77,4 @@ public void onMaterialsInit() {
          * "custom", true, aID); }
          */
     }
-
-    @Override
-    public void onComponentInit() {
-        for (OrePrefixes ore : OrePrefixes.values()) {
-            ore.enableComponent(Materials.RedAlloy);
-            // ore.enableComponent(SomeMaterial);
-        }
-
-        /** This is just left here as an example of how to add components. **/
-        /*
-         * //Enabling specific components: OrePrefixes.spring.enableComponent(Materials.Cobalt);
-         * OrePrefixes.ingotDouble.enableComponent(Materials.Cobalt);
-         * OrePrefixes.ingotTriple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.ingotQuadruple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.ingotQuintuple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.plateDouble.enableComponent(Materials.Cobalt);
-         * OrePrefixes.plateTriple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.plateQuadruple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.plateQuintuple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.plateDense.enableComponent(Materials.Cobalt);
-         */
-    }
-
-    @Override
-    public void onComponentIteration(Materials aMaterial) {
-        /** This is just left here as an example of how to add components. **/
-        /*
-         * //Enabling/Disabling components depending on the current Materials values: if ((aMaterial.mTypes & 0x40) !=
-         * 0) { //This material can be made into tool heads OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial);
-         * }
-         */
-    }
 }

src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java

@@ -140,7 +140,6 @@ public Object getPipeL() {
      */
     private static final GT_Loader_Items ItemLoader = new GT_Loader_Items();
     private static final GT_Loader_Machines MachineLoader = new GT_Loader_Machines();
-    private static final GT_Loader_FluidPipes FluidPipeLoader = new GT_Loader_FluidPipes();
     private static final GT_Loader_Materials MaterialLoader = new GT_Loader_Materials();
     private static final GT_Loader_Wires WireLoader = new GT_Loader_Wires();
     private static final GT_Loader_Batteries BatteryLoader = new GT_Loader_Batteries();
@@ -158,7 +157,6 @@ public void run() {
             BlockHarvestToolFix.fixBOPHarvestTools();
         }
         MaterialLoader.run();
-        FluidPipeLoader.run();
         WireLoader.run();
         ItemLoader.run();
         MachineLoader.run();