aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r--src/main/java/gtPlusPlus/core/item/ModItems.java2
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java30
2 files changed, 30 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index b77b46d34b..f0246e8695 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -588,7 +588,7 @@ public final class ModItems {
MaterialGenerator.generate(ALLOY.MARAGING350);
MaterialGenerator.generate(ALLOY.AQUATIC_STEEL);
- MaterialGenerator.generate(ALLOY.NITINOL_60,true,false);
+ MaterialGenerator.generate(ALLOY.NITINOL_60);
//Composite Alloys
MaterialGenerator.generate(ALLOY.STELLITE);
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 4a26a40d56..5ae06b5946 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -257,6 +257,7 @@ public class RECIPES_Machines {
chisels();
rockBreaker();
thermicFluidHeater();
+ advHeatExchanger();
gt4FarmManager();
gt4Redstone();
@@ -286,7 +287,34 @@ public class RECIPES_Machines {
CI.getPlate(5, 1), CI.circuitTier4, CI.getPlate(5, 1),
GregtechItemList.Controller_IndustrialFluidHeater.get(1));
}
-
+
+ private static void advHeatExchanger() {
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] {
+ CI.getNumberedAdvancedCircuit(18),
+ ItemList.Machine_Multi_HeatExchanger.get(1),
+ CI.getDoublePlate(6, 8),
+ CI.getScrew(6, 16),
+ CI.getCircuit(5, 8)
+ },
+ CI.tieredMaterials[5].getMolten(144 * 8),
+ GregtechItemList.XL_HeatExchanger.get(1),
+ 20 * 60,
+ MaterialUtils.getVoltageForTier(6));
+
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] {
+ CI.getNumberedAdvancedCircuit(18),
+ ItemList.Casing_StableTitanium.get(1),
+ CI.getPlate(5, 4),
+ CI.getScrew(5, 8),
+ },
+ CI.tieredMaterials[5].getMolten(144 * 2),
+ GregtechItemList.Casing_XL_HeatExchanger.get(1),
+ 20 * 5,
+ MaterialUtils.getVoltageForTier(6));
+ }
+
private static void computerCube() {
CORE.RA.addSixSlotAssemblingRecipe(