From c0daba1659c667342da1529c31896a98768a8eda Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Thu, 31 Jan 2019 03:49:33 +0000 Subject: + Added a config option for control cores. Someone should definitely test this works as expected. % Reduced cost of Hatch_Control_Core recipe. % Minor tweaks to Fish Traps. $ Fixed inventory shuffling for some Tile Entities. $ Fixed Super Jukebox, it's now mostly functional. $ Fixed constructBaseMetaTileEntity returning the wrong type of Entity for pre-existing wooden pipes, this should now get caught and thrown if the GT++ entity fails to a ClassCastException. --- src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index e2cfb3516e..16559c4fcf 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1545,17 +1545,17 @@ public class RECIPES_Machines { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { - CI.machineHull_IV, - aOutput[2], - aMat_A[3].getGear(GTNH ? 4 : 2), - aMat_B[5].getPlateDouble(GTNH ? 16 : 8), - ItemUtils.getItemStack("miscutils:item.itemBufferCore"+(GTNH ? "4" : "3"), GTNH ? 4 : 2), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 4 : 3), GTNH ? 10 : 5) + CI.machineHull_HV, + aOutput[1], + aMat_A[1].getGear(GTNH ? 4 : 2), + aMat_B[2].getPlateDouble(GTNH ? 16 : 8), + ItemUtils.getItemStack("miscutils:item.itemBufferCore"+(GTNH ? "2" : "1"), GTNH ? 4 : 2), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 3 : 2), GTNH ? 10 : 5) }, - aMat_B[4].getFluid(144 * 16), //Input Fluid + aMat_B[3].getFluid(144 * 8), //Input Fluid GregtechItemList.Hatch_Control_Core.get(1), 60 * 20 * 5, - MaterialUtils.getVoltageForTier(4)); + MaterialUtils.getVoltageForTier(3)); for (int i = 0; i < 10; i++) { -- cgit