Skip to content

Commit 00fef8b

Browse files
tier940tier940
committed
Fix cfg
1 parent 14ba5ce commit 00fef8b

File tree

4 files changed

+50
-32
lines changed

4 files changed

+50
-32
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 2.4.11
2+
- Added a recipe using Fluid Solidifier to the AE2 circuit. [#332](https://github.com/GTModpackTeam/GTExpert-Core/pull/332)
3+
4+
* * *
5+
16
# 2.4.10
27
- Fix Tiered Hatch tooltip [#330](https://github.com/GTModpackTeam/GTExpert-Core/pull/330)
38

‎src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import com.github.gtexpert.core.api.GTEValues;
66

7+
@Config.LangKey(GTEValues.MODID + ".config." + GTEValues.MODID)
78
@Config(modid = GTEValues.MODID,
89
name = GTEValues.MODID + "/" + GTEValues.MODID,
910
category = "GTExpert-Core")

‎src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -400,14 +400,6 @@ public static void init() {
400400
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
401401
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
402402
.buildAndRegister();
403-
if (AEConfigHolder.moveSteelShape) {
404-
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
405-
.notConsumable(GTEMetaItems.SHAPE_MOLD_PRINTED_SILICON.getStackForm())
406-
.fluidInputs(Materials.Silicon.getFluid(144))
407-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
408-
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
409-
.buildAndRegister();
410-
}
411403

412404
// Logic Circuit
413405
RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder()
@@ -418,14 +410,6 @@ public static void init() {
418410
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
419411
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
420412
.buildAndRegister();
421-
if (AEConfigHolder.moveSteelShape) {
422-
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
423-
.notConsumable(GTEMetaItems.SHAPE_MOLD_LOGIC_PROCESSOR.getStackForm())
424-
.fluidInputs(Materials.Gold.getFluid(144))
425-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
426-
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
427-
.buildAndRegister();
428-
}
429413

430414
// Calc Circuit
431415
RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder()
@@ -436,14 +420,6 @@ public static void init() {
436420
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
437421
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
438422
.buildAndRegister();
439-
if (AEConfigHolder.moveSteelShape) {
440-
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
441-
.notConsumable(GTEMetaItems.SHAPE_MOLD_CALCULATION_PROCESSOR.getStackForm())
442-
.fluidInputs(Materials.CertusQuartz.getFluid(144))
443-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
444-
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
445-
.buildAndRegister();
446-
}
447423

448424
// Engineer Circuit
449425
RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder()
@@ -454,14 +430,6 @@ public static void init() {
454430
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
455431
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
456432
.buildAndRegister();
457-
if (AEConfigHolder.moveSteelShape) {
458-
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
459-
.notConsumable(GTEMetaItems.SHAPE_MOLD_ENGINEERING_PROCESSOR.getStackForm())
460-
.fluidInputs(Materials.Diamond.getFluid(144))
461-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
462-
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
463-
.buildAndRegister();
464-
}
465433

466434
// Logic Processor
467435
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
@@ -569,6 +537,38 @@ public static void init() {
569537
GTEMetaItems.SHAPE_EXTRUDER_ENGINEERING_PROCESSOR.getStackForm(),
570538
" x ", " S", " ",
571539
'S', GTEMetaItems.SHAPE_EXTRUDER_PRINTED_SILICON);
540+
541+
// Printed Silicon
542+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
543+
.notConsumable(GTEMetaItems.SHAPE_MOLD_PRINTED_SILICON.getStackForm())
544+
.fluidInputs(Materials.Silicon.getFluid(144))
545+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
546+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
547+
.buildAndRegister();
548+
549+
// Logic Circuit
550+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
551+
.notConsumable(GTEMetaItems.SHAPE_MOLD_LOGIC_PROCESSOR.getStackForm())
552+
.fluidInputs(Materials.Gold.getFluid(144))
553+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
554+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
555+
.buildAndRegister();
556+
557+
// Calc Circuit
558+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
559+
.notConsumable(GTEMetaItems.SHAPE_MOLD_CALCULATION_PROCESSOR.getStackForm())
560+
.fluidInputs(Materials.CertusQuartz.getFluid(144))
561+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
562+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
563+
.buildAndRegister();
564+
565+
// Engineer Circuit
566+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
567+
.notConsumable(GTEMetaItems.SHAPE_MOLD_ENGINEERING_PROCESSOR.getStackForm())
568+
.fluidInputs(Materials.Diamond.getFluid(144))
569+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
570+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
571+
.buildAndRegister();
572572
} else {
573573
// Silicon Processor Press
574574
RecipeMaps.LASER_ENGRAVER_RECIPES.recipeBuilder()

‎src/main/resources/assets/gtexpert/lang/en_us.lang‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,3 +251,15 @@ gtexpert.gui.needs_redstone=Needs Redstone signal to work
251251
gtexpert.multiblock.large_transformer.max_input_energy_per_tick_amps=Max Input: %s EU/t (%s) / %s A
252252
gtexpert.multiblock.large_transformer.max_output_energy_per_tick_amps=Max Output: %s EU/t (%s) / %s A
253253
gtexpert.multiblock.large_transformer.not_enough_input=Max Output exceeds Max Input!
254+
255+
#config
256+
gtexpert.config.gtexpert=GTExpert-Core
257+
gtexpert.config.integration.ae=Applied Energistics 2
258+
gtexpert.config.integration.aeadditions=AE Additions
259+
gtexpert.config.integration.chisel=Chisel
260+
gtexpert.config.integration.deda=Draconic Evolution & Draconic Additions
261+
gtexpert.config.integration.eio=Ender IO
262+
gtexpert.config.integration.extracpus=Extra CPUs
263+
gtexpert.config.integration.nae2=Neeve's AE2
264+
gtexpert.config.integration.tc=Thaumcraft
265+
gtexpert.config.integration.te=ThaumicEnergistics

0 commit comments

Comments
 (0)