diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-01 17:46:01 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-01 17:46:01 +1000 |
| commit | 5a10d342d00d79a9538d6ccd287d9db9a122af44 (patch) | |
| tree | 78ca81e4be3729593a075585dab4da79198dbf8f /src/Java/gtPlusPlus/core | |
| parent | a9b57eb8dd0dcc4152eda6de65ec4c84ca9d9e5a (diff) | |
| parent | 214a67650acf7d50e98e9e1141d48a43c746a137 (diff) | |
| download | GT5-Unofficial-5a10d342d00d79a9538d6ccd287d9db9a122af44.tar.gz GT5-Unofficial-5a10d342d00d79a9538d6ccd287d9db9a122af44.tar.bz2 GT5-Unofficial-5a10d342d00d79a9538d6ccd287d9db9a122af44.zip | |
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index d2907cca17..653094cdda 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -15,6 +15,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import static gtPlusPlus.core.lib.CORE.GTNH; + public class RECIPES_Machines { //Outputs @@ -763,11 +765,20 @@ public class RECIPES_Machines { RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); RECIPE_TreeFarmFrame = GregtechItemList.TreeFarmer_Structural.get(Casing_Amount); //Industrial Tree Farm Controller - RecipeUtils.addShapedGregtechRecipe( - "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", - "cableGt02Steel", "pipeMediumSteel", "cableGt02Steel", - "plateEglinSteel", CI.machineCasing_MV, "plateEglinSteel", - RECIPE_TreeFarmController); + if (!CORE.GTNH) { + RecipeUtils.addShapedGregtechRecipe( + "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", + "cableGt02Steel", "pipeMediumSteel", "cableGt02Steel", + "plateEglinSteel", CI.machineCasing_MV, "plateEglinSteel", + RECIPE_TreeFarmController); + } + if (CORE.GTNH) { + RecipeUtils.addShapedGregtechRecipe( + "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", + "cableGt02Silver", "pipeMediumStainlessSteel", "cableGt02Silver", + "plateEglinSteel", CI.machineCasing_HV, "plateEglinSteel", + RECIPE_TreeFarmController); + } //Industrial Tree Farm Frame RecipeUtils.addShapedGregtechRecipe( ItemUtils.getSimpleStack(Blocks.dirt), ItemUtils.getSimpleStack(Blocks.dirt), ItemUtils.getSimpleStack(Blocks.dirt), |