diff options
| author | â€huajijam <strhuaji@gmail.com> | 2019-04-30 22:52:55 +0800 |
|---|---|---|
| committer | â€huajijam <strhuaji@gmail.com> | 2019-04-30 22:52:55 +0800 |
| commit | e18a5f0e793ac8cf256d17b44910ecc0b7fdb094 (patch) | |
| tree | 2cb080a99d07318a7f86c4afe2bfbb551de2766c /src/Java/gtPlusPlus/core/recipe | |
| parent | 913bb1c0a34045b1aa11901f49107322b1c03b57 (diff) | |
| parent | 47d2b68b66fb9958b57c3ff81f1e73e8f6afd91b (diff) | |
| download | GT5-Unofficial-e18a5f0e793ac8cf256d17b44910ecc0b7fdb094.tar.gz GT5-Unofficial-e18a5f0e793ac8cf256d17b44910ecc0b7fdb094.tar.bz2 GT5-Unofficial-e18a5f0e793ac8cf256d17b44910ecc0b7fdb094.zip | |
Automatic synchronization
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/common/CI.java | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index e9c1da024c..bfd50e0ce1 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -931,6 +931,7 @@ public class RECIPES_Machines { } if (CORE.ConfigSwitches.enableMachine_Pollution && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ + RecipeUtils.addShapedGregtechRecipe( "plateCarbon", "plateCarbon", "plateCarbon", "dustCarbon", "dustCarbon", "dustCarbon", @@ -961,7 +962,7 @@ public class RECIPES_Machines { RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[6], ItemList.Casing_Grate.get(1), CI.component_Plate[6], CI.component_Plate[6], aTieredFluidRegulator, CI.component_Plate[6], - CI.getTieredCircuit(5), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(5), + CI.getTieredCircuit(4), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(4), GregtechItemList.Hatch_Air_Intake.get(1)); //ULV diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index ca334fe0d3..dffb438e4a 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -484,10 +484,13 @@ public class CI { public static void init() { //Set Explosives try { - ItemList PowerderBarrel = gtPlusPlus.core.util.Utils.getValueOfItemList("Block_Powderbarrel", null); + ItemList PowerderBarrel = Utils.getValueOfItemList("Block_Powderbarrel", null); if (PowerderBarrel != null){ explosivePowderKeg = PowerderBarrel.get(1).copy(); } + else { + explosivePowderKeg = ItemUtils.getSimpleStack(Items.gunpowder).copy(); + } } catch (java.lang.IllegalArgumentException Y) { explosivePowderKeg = ItemUtils.getSimpleStack(Items.gunpowder).copy(); } |