diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java | 1 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java index 853abe3edf..879f932165 100644 --- a/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java +++ b/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java @@ -21,7 +21,6 @@ import net.minecraft.world.World; public class BlockCompressedObsidian extends BlockObsidian { - @SideOnly(Side.CLIENT) private final IIcon textureArray[] = new IIcon[6]; public BlockCompressedObsidian() { diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 2bc794de16..60fa118b1d 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -247,13 +247,13 @@ public class RECIPES_Machines { GregtechItemList.Gregtech_Computer_Cube.get(1)); RecipeUtils.addShapedGregtechRecipe( - ItemList.Electric_Piston_EV, OrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV, - ItemList.Electric_Motor_EV, CI.machineCasing_EV, ItemList.Electric_Motor_EV, + CI.electricPiston_EV, OrePrefixes.circuit.get(Materials.Ultimate), CI.electricPiston_EV, + CI.electricMotor_EV, CI.machineCasing_EV, CI.electricMotor_EV, "gearGtTitanium", "cableGt02Aluminium", "gearGtTitanium", ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 793, 1)); RecipeUtils.addShapedGregtechRecipe( - ItemList.Electric_Piston_IV, OrePrefixes.circuit.get(Materials.Superconductor), ItemList.Electric_Piston_IV, - ItemList.Electric_Motor_IV, CI.machineCasing_IV, ItemList.Electric_Motor_IV, + CI.electricPiston_IV, OrePrefixes.circuit.get(Materials.Superconductor), CI.electricPiston_IV, + CI.electricMotor_IV, CI.machineCasing_IV, CI.electricMotor_IV, "gearGtTungstenSteel", "cableGt02Platinum", "gearGtTungstenSteel", ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 794, 1)); RecipeUtils.addShapedGregtechRecipe( @@ -926,8 +926,8 @@ public class RECIPES_Machines { //Thorium Reactor RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1); - RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(Casing_Amount); //Zeron - RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(Casing_Amount); //Hastelloy + RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); //Zeron + RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); //Hastelloy ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); RecipeUtils.addShapedGregtechRecipe( |