diff options
| author | bombcar <github@bombcar.com> | 2021-11-22 08:46:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 08:46:30 -0600 |
| commit | db511ee36c4179283d3738ad27cdd232c1885888 (patch) | |
| tree | 6a4420be1342199617ff2ea1614cd4b2abb7e187 /src/Java/gtPlusPlus/core | |
| parent | 1949ecd687822eb674afffe243c13b6a408c50fc (diff) | |
| parent | fb4fecbf3f8858988e33279f35a49517d079eee4 (diff) | |
| download | GT5-Unofficial-db511ee36c4179283d3738ad27cdd232c1885888.tar.gz GT5-Unofficial-db511ee36c4179283d3738ad27cdd232c1885888.tar.bz2 GT5-Unofficial-db511ee36c4179283d3738ad27cdd232c1885888.zip | |
Merge branch 'GTNewHorizons:master' into master
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index fc0627a0cc..4fda17ee8a 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -118,7 +118,7 @@ public class COMPAT_HANDLER { Gregtech4Content.run(); GregtechIndustrialFuelRefinery.run(); GregtechTreeFarmerTE.run(); - //GregtechIndustrialTreeFarm.run(); + GregtechIndustrialTreeFarm.run(); GregtechIndustrialSifter.run(); GregtechSimpleWasher.run(); GregtechRTG.run(); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 1efa09c096..0a4e760a17 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1116,22 +1116,22 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){ //Industrial Tree Farmer - /*RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1);*/ + RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(Casing_Amount); //Industrial Tree Farm Controller if (!GTNH) { - /*RecipeUtils.addShapedGregtechRecipe( + RecipeUtils.addShapedGregtechRecipe( "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", "cableGt02Steel", "pipeMediumSteel", "cableGt02Steel", "plateEglinSteel", CI.machineCasing_MV, "plateEglinSteel", - RECIPE_TreeFarmController);*/ + RECIPE_TreeFarmController); } else { - /*RecipeUtils.addShapedGregtechRecipe( + RecipeUtils.addShapedGregtechRecipe( "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", "cableGt02Silver", "pipeMediumStainlessSteel", "cableGt02Silver", "plateEglinSteel", CI.machineCasing_HV, "plateEglinSteel", - RECIPE_TreeFarmController);*/ + RECIPE_TreeFarmController); } //Industrial Tree Farm Frame RecipeUtils.addShapedGregtechRecipe( |