From 7c347b39cc6c51a018c94b3e54a65af02268e2d9 Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Tue, 19 Nov 2024 23:57:13 -0300 Subject: [PATCH 1/7] Changed HIP Unit Recipe (#1088) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../gthandler/recipes/AssemblerRecipes.java | 26 ++++++++++++------- .../recipes/AssemblingLineRecipes.java | 26 ++++++++----------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 8c7de7536..7b3a5bf1a 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -2359,11 +2359,14 @@ public void run() { .itemInputs( ItemList.Casing_Pipe_Bronze.get(1), ItemList.Electric_Pump_LuV.get(2), - ItemList.Duct_Tape.get(4), - TRINIUM_NAQUADAH_CARBON.getComponentByPrefix(OrePrefixes.pipeMedium, 16), - HASTELLOY_X.getComponentByPrefix(OrePrefixes.pipeMedium, 16), - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 32)) - .fluidInputs(FluidRegistry.getFluidStack("pyrotheum", 2000)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Invar, 8), + CustomItemList.MicaInsulatorFoil.get(64), + CustomItemList.MicaInsulatorFoil.get(64), + CustomItemList.MicaInsulatorFoil.get(64), + TRINIUM_NAQUADAH_CARBON.getComponentByPrefix(OrePrefixes.pipeMedium, 2), + HASTELLOY_X.getComponentByPrefix(OrePrefixes.pipeMedium, 2), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 2)) + .fluidInputs(FluidRegistry.getFluidStack("pyrotheum", 16000)) .itemOutputs(ItemList.Heating_Duct_Casing.get(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); @@ -2372,11 +2375,14 @@ public void run() { .itemInputs( ItemList.Casing_Pipe_TungstenSteel.get(1), ItemList.Electric_Pump_LuV.get(2), - ItemList.Duct_Tape.get(4), - TRINIUM_NAQUADAH_CARBON.getComponentByPrefix(OrePrefixes.pipeMedium, 16), - HASTELLOY_X.getComponentByPrefix(OrePrefixes.pipeMedium, 16), - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 32)) - .fluidInputs(FluidRegistry.getFluidStack("cryotheum", 2000)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 8), + ItemList.Reactor_Coolant_Sp_3.get(1), + ItemList.Reactor_Coolant_Sp_3.get(1), + ItemList.Reactor_Coolant_Sp_3.get(1), + TRINIUM_NAQUADAH_CARBON.getComponentByPrefix(OrePrefixes.pipeMedium, 2), + HASTELLOY_X.getComponentByPrefix(OrePrefixes.pipeMedium, 2), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 2)) + .fluidInputs(FluidRegistry.getFluidStack("cryotheum", 16000)) .itemOutputs(ItemList.Coolant_Duct_Casing.get(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index de335ec17..908cbd7d0 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -23,7 +23,6 @@ import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_C276; import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_X; -import static gtPlusPlus.core.material.MaterialsAlloy.STABALLOY; import static tectech.thing.CustomItemList.DATApipe; import static tectech.thing.CustomItemList.Machine_Multi_DataBank; import static tectech.thing.CustomItemList.Machine_Multi_Switch; @@ -1107,23 +1106,20 @@ public void run() { GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Machine_Multi_IndustrialCompressor.get(1)) .metadata(RESEARCH_TIME, 1800 * SECONDS) .itemInputs( - GTOreDictUnificator.get(OrePrefixes.block, Materials.StellarAlloy, 64L), - ItemList.Heating_Duct_Casing.get(32L), - ItemList.Coolant_Duct_Casing.get(32L), - STABALLOY.getBlock(32), - GTModHandler.getIC2Item("mixedMetalIngot", 24L), - new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 }, - new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }, - ItemList.Electric_Piston_ZPM.get(8), - ItemList.Conveyor_Module_ZPM.get(4), - ItemList.Sensor_ZPM.get(2), - ItemList.Field_Generator_ZPM.get(1)) + ItemList.Machine_Multi_IndustrialCompressor.get(4), + ItemList.Heating_Duct_Casing.get(4L), + ItemList.Coolant_Duct_Casing.get(4L), + GTOreDictUnificator.get(OrePrefixes.block, Materials.Naquadria, 4), + ItemList.Electric_Piston_ZPM.get(16), + ItemList.Robot_Arm_ZPM.get(4), + ItemList.Electric_Pump_ZPM.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }) .itemOutputs(ItemList.Machine_Multi_HIPCompressor.get(1)) .fluidInputs( - Materials.Naquadria.getMolten(1152), + GGMaterial.incoloy903.getMolten(256 * 144), + Materials.NaquadahEnriched.getMolten(64 * 144), Materials.LiquidAir.getFluid(16000), - Materials.Lubricant.getFluid(16000), - Materials.Neutronium.getMolten(1152)) + Materials.Lubricant.getFluid(16000)) .duration(120 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(AssemblyLine); GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, getModItem(Avaritia.ID, "Singularity", 1L, 0)) From 6553696d92e055ea44050ef27ba37e19e2577f13 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:40:37 +0000 Subject: [PATCH 2/7] Fix golem bell recipes (#1089) --- .../com/dreammaster/scripts/ScriptThaumcraft.java | 14 ++++---------- .../dreammaster/scripts/ScriptThaumicHorizons.java | 1 + 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java index f5a98f10d..8f0b2c67e 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java @@ -4524,12 +4524,14 @@ private void golemancy() { .add(Aspect.getAspect("instrumentum"), 9).add(Aspect.getAspect("meto"), 12) .add(Aspect.getAspect("motus"), 6).add(Aspect.getAspect("praecantatio"), 3)); TCHelper.setResearchComplexity("CORELUMBER", 3); + + TCHelper.removeArcaneRecipe(getModItem(Thaumcraft.ID, "GolemBell", 1, 0)); TCHelper.clearPages("GOLEMBELL"); TCHelper.addResearchPage("GOLEMBELL", new ResearchPage("tc.research_page.GOLEMBELL.1")); TCHelper.addResearchPage("GOLEMBELL", new ResearchPage("tc.research_page.GOLEMBELL.2")); ThaumcraftApi.addArcaneCraftingRecipe( "GOLEMBELL", - createItemStack(Thaumcraft.ID, "GolemBell", 1, 0, "{markers:[0:{side:1b}]}", missing), + getModItem(Thaumcraft.ID, "GolemBell", 1, 0, missing), new AspectList().add(Aspect.getAspect("ordo"), 10).add(Aspect.getAspect("aer"), 5), "abc", "def", @@ -4554,15 +4556,7 @@ private void golemancy() { "craftingToolFile"); TCHelper.addResearchPage( "GOLEMBELL", - new ResearchPage( - TCHelper.findArcaneRecipe( - createItemStack( - Thaumcraft.ID, - "GolemBell", - 1, - 0, - "{markers:[0:{side:1b}]}", - missing)))); + new ResearchPage(TCHelper.findArcaneRecipe(getModItem(Thaumcraft.ID, "GolemBell", 1, 0, missing)))); ThaumcraftApi.addArcaneCraftingRecipe( "UPGRADEAIR", getModItem(Thaumcraft.ID, "ItemGolemUpgrade", 1, 0, missing), diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumicHorizons.java b/src/main/java/com/dreammaster/scripts/ScriptThaumicHorizons.java index 389d3f71f..5d891abaf 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumicHorizons.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumicHorizons.java @@ -35,6 +35,7 @@ public List getDependencies() { public void loadRecipes() { TCHelper.removeArcaneRecipe(getModItem(ThaumicHorizons.ID, "boatGreatwood", 1, 0, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicHorizons.ID, "boatThaumium", 1, 0, missing)); + TCHelper.removeArcaneRecipe(getModItem(ThaumicHorizons.ID, "Golemancy Bell TH", 1, 0)); TCHelper.removeArcaneRecipe(getModItem(ThaumicHorizons.ID, "planarConduit", 1, 0, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicHorizons.ID, "transductionAmplifier", 1, 0, missing)); TCHelper.removeInfusionRecipe(getModItem(ThaumicHorizons.ID, "vortexStabilizer", 1, 0, missing)); From b729c5e61caacdadb1fd313c415f84579a155f21 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 22 Nov 2024 21:42:49 +0100 Subject: [PATCH 3/7] update --- dependencies.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index aea39646c..68efb7fde 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,29 +1,29 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.70:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:509.50.73:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") implementation("com.github.GTNewHorizons:GTNHLib:0.5.20:dev") - compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.8:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.9:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.25:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.26:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.14-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.15-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:witchery-69673:2234410") compileOnly("com.github.GTNewHorizons:Chisel:2.15.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.7:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.8:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false } compileOnly("com.github.GTNewHorizons:amunra:0.7.1:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.5-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.17:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.19:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev") runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612") From 42e4ebe31d4a2a80c3b3daee45dcdb79f38964cd Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sat, 23 Nov 2024 08:05:24 -0600 Subject: [PATCH 4/7] update --- dependencies.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 68efb7fde..f80032822 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:509.50.73:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.73:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -10,7 +10,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.9:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.26:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.27:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.15-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false } @@ -18,13 +18,13 @@ dependencies { compileOnly rfg.deobf("curse.maven:witchery-69673:2234410") compileOnly("com.github.GTNewHorizons:Chisel:2.15.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.8:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.9:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false } compileOnly("com.github.GTNewHorizons:amunra:0.7.1:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.5-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.19:dev") { transitive = false } - compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev") + compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.7-GTNH:dev") runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612") runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.2.1-GTNH:dev") From 1ab188896fd339883d75ba7e6bd37ba009afad23 Mon Sep 17 00:00:00 2001 From: OmdaCZ <140348253+OmdaCZ@users.noreply.github.com> Date: Sat, 23 Nov 2024 16:08:48 +0100 Subject: [PATCH 5/7] Recipe for Portable Shower (#1048) Co-authored-by: Martin Robertz --- .../dreammaster/scripts/ScriptWarpTheory.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptWarpTheory.java b/src/main/java/com/dreammaster/scripts/ScriptWarpTheory.java index ce5d0ceaa..958baa7bf 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptWarpTheory.java +++ b/src/main/java/com/dreammaster/scripts/ScriptWarpTheory.java @@ -4,8 +4,11 @@ import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.BloodMagic; import static gregtech.api.enums.Mods.Minecraft; +import static gregtech.api.enums.Mods.OpenBlocks; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.ThaumicBases; +import static gregtech.api.enums.Mods.ThaumicExploration; +import static gregtech.api.enums.Mods.ThaumicTinkerer; import static gregtech.api.enums.Mods.WarpTheory; import static gregtech.api.enums.Mods.Witchery; import static gregtech.api.util.GTModHandler.getModItem; @@ -52,6 +55,7 @@ public void loadRecipes() { TCHelper.removeInfusionRecipe(getModItem(WarpTheory.ID, "item.warptheory.cleanserminor", 1, 0, missing)); TCHelper.removeInfusionRecipe(getModItem(WarpTheory.ID, "item.warptheory.cleanser", 1, 0, missing)); TCHelper.removeInfusionRecipe(getModItem(WarpTheory.ID, "item.warptheory.amulet", 1, 0, missing)); + TCHelper.removeInfusionRecipe(getModItem(WarpTheory.ID, "item.warptheory.portableshower", 1, 0, missing)); TCHelper.clearPrereq("warptheory.paper"); TCHelper.addResearchPrereq("warptheory.paper", "RESEARCHER2", false); TCHelper.clearPages("warptheory.paper"); @@ -202,8 +206,38 @@ public void loadRecipes() { .add(Aspect.getAspect("potentia"), 12).add(Aspect.getAspect("praecantatio"), 9) .add(Aspect.getAspect("permutatio"), 6).add(Aspect.getAspect("terra"), 3)); TCHelper.setResearchComplexity("warptheory.amulet", 4); + + TCHelper.orphanResearch("warptheory.portableshower"); + TCHelper.clearPrereq("warptheory.portableshower"); + TCHelper.addResearchPrereq("warptheory.portableshower", "PURETEAR", false); + ThaumcraftApi.addInfusionCraftingRecipe( + "warptheory.portableshower", + getModItem(WarpTheory.ID, "item.warptheory.portableshower", 1, 0, missing), + 64, + new AspectList().add(Aspect.getAspect("custom1"), 16).add(Aspect.getAspect("custom5"), 16) + .add(Aspect.getAspect("aer"), 1024).add(Aspect.getAspect("aqua"), 1024) + .add(Aspect.getAspect("praecantatio"), 256).add(Aspect.getAspect("tutamen"), 256) + .add(Aspect.getAspect("cognitio"), 256).add(Aspect.getAspect("tutamen"), 256) + .add(Aspect.getAspect("sano"), 1024), + getModItem(WarpTheory.ID, "item.warptheory.amulet", 1, 0, missing), + new ItemStack[] { getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 1, missing), + getModItem(Thaumcraft.ID, "blockStoneDevice", 1, 12, missing), + getModItem(ThaumicExploration.ID, "everfullUrn", 1, 0, missing), + getModItem(Thaumcraft.ID, "ItemGolemCore", 1, 0, missing), + getModItem(OpenBlocks.ID, "sprinkler", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 1L), + getModItem(OpenBlocks.ID, "xpshower", 1, 0, missing), + getModItem(Thaumcraft.ID, "ItemEldritchObject", 1L, 3), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Ichorium, 1L) }); + TCHelper.setResearchAspects( + "warptheory.portableshower", + new AspectList().add(Aspect.getAspect("custom1"), 5).add(Aspect.getAspect("custom3"), 5) + .add(Aspect.getAspect("potentia"), 32).add(Aspect.getAspect("praecantatio"), 20) + .add(Aspect.getAspect("aqua"), 32).add(Aspect.getAspect("aer"), 32)); + TCHelper.setResearchComplexity("warptheory.portableshower", 4); TCHelper.refreshResearchPages("warptheory.paper"); TCHelper.refreshResearchPages("warptheory.something"); TCHelper.refreshResearchPages("warptheory.amulet"); + TCHelper.refreshResearchPages("warptheory.portableshower"); } } From 06250e17fa3621f0ecbbe906ef012c1796f8a30e Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 23 Nov 2024 16:22:40 +0100 Subject: [PATCH 6/7] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index f80032822..29b87a7f0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.73:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.74:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") From 3c3451b4e2ac515759147e88b91f47aa8e399d22 Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:35:07 -0300 Subject: [PATCH 7/7] Fixed amount in Good Circuit Recipe (#1092) Co-authored-by: Martin Robertz --- .../dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java index 88cd9b655..e0dbe583c 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java @@ -604,7 +604,7 @@ public void solderingMaterials() { GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Phenolic_Good.get(1L), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemPartCircuit", 1L, 0), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemPartCircuit", 2L, 0), ItemList.Circuit_Parts_Diode.get(2L), GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 2)) .itemOutputs(ItemList.Circuit_Good.get(1L)).fluidInputs(tMat.getMolten(144L * tMultiplier / 2L))