aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-11-19 14:32:49 +0100
committerGitHub <noreply@github.com>2021-11-19 14:32:49 +0100
commitd4e972645c58ee1d86d074b255e078849dd6917a (patch)
treec949fc6b9582e1e9a0c7953232e065ce7ba9ecc6 /src/Java/gtPlusPlus/core
parent3cc1fcf988a51a84c8a0d22e1875c83843abf9a2 (diff)
parent24bf6a796bcd9c9bba74fc4ec7db6db11cb05df6 (diff)
downloadGT5-Unofficial-d4e972645c58ee1d86d074b255e078849dd6917a.tar.gz
GT5-Unofficial-d4e972645c58ee1d86d074b255e078849dd6917a.tar.bz2
GT5-Unofficial-d4e972645c58ee1d86d074b255e078849dd6917a.zip
Merge pull request #41 from GTNewHorizons/structurelib-interation
add back LFTR and refinery
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java4
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java16
2 files changed, 10 insertions, 10 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index e45abdaa36..fc0627a0cc 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -93,7 +93,7 @@ public class COMPAT_HANDLER {
new RECIPES_Extruder();
GregtechGeneratorsULV.run();
GregtechEnergyBuffer.run();
- //GregtechLFTR.run();
+ GregtechLFTR.run();
GregtechSteamCondenser.run();
GregtechSafeBlock.run();
//GregtechSuperConductionPoint.run();
@@ -116,7 +116,7 @@ public class COMPAT_HANDLER {
//GregtechIndustrialMultiTank.run();
GregtechGeothermalThermalGenerator.run();
Gregtech4Content.run();
- //GregtechIndustrialFuelRefinery.run();
+ GregtechIndustrialFuelRefinery.run();
GregtechTreeFarmerTE.run();
//GregtechIndustrialTreeFarm.run();
GregtechIndustrialSifter.run();
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index e9c23f9f7d..1efa09c096 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -95,7 +95,7 @@ public class RECIPES_Machines {
public static ItemStack RECIPE_ThermalBoilerCasing;
//Thorium Reactor
- /*public static ItemStack RECIPE_LFTRController;*/
+ public static ItemStack RECIPE_LFTRController;
public static ItemStack RECIPE_LFTROuterCasing;
public static ItemStack RECIPE_LFTRInnerCasing;
@@ -1374,23 +1374,23 @@ public class RECIPES_Machines {
if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor){
//Thorium Reactor
- /*RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);*/
+ RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);
RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); //Zeron
RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); //Hastelloy
ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
if(!GTNH) {
- /*RecipeUtils.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
controlCircuit, "cableGt12NaquadahAlloy", controlCircuit,
"plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN",
"plateThorium232", CI.machineHull_UV, "plateThorium232",
- RECIPE_LFTRController);*/
+ RECIPE_LFTRController);
} else {
- /*RecipeUtils.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
controlCircuit, "cableGt12NaquadahAlloy", controlCircuit,
"plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN",
"plateThorium232", CI.machineHull_LuV, "plateThorium232",
- RECIPE_LFTRController);*/
+ RECIPE_LFTRController);
}
RecipeUtils.addShapedGregtechRecipe(
"plateDoubleZeron100", CI.craftingToolScrewdriver, "plateDoubleZeron100",
@@ -1411,11 +1411,11 @@ public class RECIPES_Machines {
//Fission Fuel Plant
- /*RecipeUtils.addShapedGregtechRecipe(
+ RecipeUtils.addShapedGregtechRecipe(
CI.getTieredCircuit(5), CI.craftingToolSolderingIron, CI.getTieredCircuit(5),
"plateDenseTungstenSteel", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDenseTungstenSteel",
"gearGtStellite", CI.machineHull_LuV, "gearGtStellite",
- GregtechItemList.Industrial_FuelRefinery.get(1));*/
+ GregtechItemList.Industrial_FuelRefinery.get(1));
ItemStack mInnerTank;