Merge branch 'master' into creative-controller-recipe

Author: serenibyss

dependencies.gradle

@@ -1,18 +1,18 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.167:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.173:dev")
     api("com.github.GTNewHorizons:Yamcl:0.7.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
-    implementation("com.github.GTNewHorizons:GTNHLib:0.6.13:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.6.14:dev")
 
     compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Avaritia:1.61:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.35:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.9-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.10-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
@@ -23,8 +23,8 @@ dependencies {
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
     compileOnly("com.github.GTNewHorizons:amunra:0.8.1:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.5-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.3:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.22-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.5:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.23-GTNH:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.2-GTNH:dev")
     //compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false }
 

src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java

@@ -244,15 +244,15 @@ private void runGTRecipes() {
         // Ti & O Plasma Recipes
         GTValues.RA.stdBuilder().fluidInputs(Aluminium.getMolten(144), Fluorine.getGas(144))
                 .fluidOutputs(Titanium.getPlasma(144)).duration(8 * SECONDS).eut(49_152)
-                .metadata(FUSION_THRESHOLD, 100_000_000).addTo(fusionRecipes);
+                .metadata(FUSION_THRESHOLD, 100_000_000L).addTo(fusionRecipes);
 
         GTValues.RA.stdBuilder().fluidInputs(Helium.getPlasma(144), Lithium.getMolten(144))
                 .fluidOutputs(Boron.getPlasma(144)).duration(12 * SECONDS).eut(10_240)
-                .metadata(FUSION_THRESHOLD, 50_000_000).addTo(fusionRecipes);
+                .metadata(FUSION_THRESHOLD, 50_000_000L).addTo(fusionRecipes);
 
         GTValues.RA.stdBuilder().fluidInputs(Boron.getPlasma(144), Lithium.getMolten(144))
                 .fluidOutputs(Oxygen.getPlasma(144)).duration(12 * SECONDS).eut(49_152)
-                .metadata(FUSION_THRESHOLD, 100_000_000).addTo(fusionRecipes);
+                .metadata(FUSION_THRESHOLD, 100_000_000L).addTo(fusionRecipes);
 
         GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(2))
                 .fluidInputs(RadoxGas.getGas(2160), Oxygen.getPlasma(7500L), Titanium.getPlasma(100L))