Skip to content

Commit ac98a48

Browse files
authored
Merge branch 'master' into creative-controller-recipe
2 parents f1e95b7 + e2ce217 commit ac98a48

File tree

4 files changed

+8
-470
lines changed

4 files changed

+8
-470
lines changed

dependencies.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// Add your dependencies here
22

33
dependencies {
4-
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.167:dev")
4+
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.173:dev")
55
api("com.github.GTNewHorizons:Yamcl:0.7.0:dev")
66
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
77

8-
implementation("com.github.GTNewHorizons:GTNHLib:0.6.13:dev")
8+
implementation("com.github.GTNewHorizons:GTNHLib:0.6.14:dev")
99

1010
compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false }
1111
compileOnly("com.github.GTNewHorizons:Avaritia:1.61:dev") { transitive = false }
1212
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false }
1313
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.35:dev") { transitive = false }
1414
compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
15-
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.9-GTNH:dev") { transitive = false }
15+
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.10-GTNH:dev") { transitive = false }
1616
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
1717
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
1818
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
@@ -23,8 +23,8 @@ dependencies {
2323
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
2424
compileOnly("com.github.GTNewHorizons:amunra:0.8.1:dev") { transitive = false }
2525
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.5-GTNH:dev") { transitive = false }
26-
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.3:dev") { transitive = false }
27-
compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.22-GTNH:dev") { transitive = false }
26+
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.5:dev") { transitive = false }
27+
compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.23-GTNH:dev") { transitive = false }
2828
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.2-GTNH:dev")
2929
//compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false }
3030

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,15 @@ private void runGTRecipes() {
244244
// Ti & O Plasma Recipes
245245
GTValues.RA.stdBuilder().fluidInputs(Aluminium.getMolten(144), Fluorine.getGas(144))
246246
.fluidOutputs(Titanium.getPlasma(144)).duration(8 * SECONDS).eut(49_152)
247-
.metadata(FUSION_THRESHOLD, 100_000_000).addTo(fusionRecipes);
247+
.metadata(FUSION_THRESHOLD, 100_000_000L).addTo(fusionRecipes);
248248

249249
GTValues.RA.stdBuilder().fluidInputs(Helium.getPlasma(144), Lithium.getMolten(144))
250250
.fluidOutputs(Boron.getPlasma(144)).duration(12 * SECONDS).eut(10_240)
251-
.metadata(FUSION_THRESHOLD, 50_000_000).addTo(fusionRecipes);
251+
.metadata(FUSION_THRESHOLD, 50_000_000L).addTo(fusionRecipes);
252252

253253
GTValues.RA.stdBuilder().fluidInputs(Boron.getPlasma(144), Lithium.getMolten(144))
254254
.fluidOutputs(Oxygen.getPlasma(144)).duration(12 * SECONDS).eut(49_152)
255-
.metadata(FUSION_THRESHOLD, 100_000_000).addTo(fusionRecipes);
255+
.metadata(FUSION_THRESHOLD, 100_000_000L).addTo(fusionRecipes);
256256

257257
GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(2))
258258
.fluidInputs(RadoxGas.getGas(2160), Oxygen.getPlasma(7500L), Titanium.getPlasma(100L))

0 commit comments

Comments
 (0)