aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-08-24 20:25:04 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-08-24 20:25:04 +1000
commit7778a680a63a9a6f77978b0dcc300517509ae245 (patch)
treeb0a9a56604566854e065916c9357066019e07093 /src/Java
parentdea1cb084b7a1d58dbf418d7f57ba7024c73aa65 (diff)
downloadGT5-Unofficial-7778a680a63a9a6f77978b0dcc300517509ae245.tar.gz
GT5-Unofficial-7778a680a63a9a6f77978b0dcc300517509ae245.tar.bz2
GT5-Unofficial-7778a680a63a9a6f77978b0dcc300517509ae245.zip
% Redid compositions of Hastelloy X/N/W/C276.
$ Fixed the FFPP controller having a bad recipe.
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java24
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java2
2 files changed, 16 insertions, 10 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 09111b2408..d0bdd0b1e1 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -302,8 +302,9 @@ public final class ALLOY {
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
new MaterialStack(ELEMENT.getInstance().IRON, 06),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 2),
new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 24),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 6),
new MaterialStack(ELEMENT.getInstance().NICKEL, 62)
});
@@ -319,9 +320,11 @@ public final class ALLOY {
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
new MaterialStack(ELEMENT.getInstance().IRON, 18),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 9),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 2),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 8),
new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 51)
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 48)
});
public static final Material HASTELLOY_N = new Material(
@@ -335,10 +338,11 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 10),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8),
new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 10),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 64)
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 8),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 60)
});
public static final Material HASTELLOY_C276 = new Material(
@@ -352,10 +356,12 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ELEMENT.getInstance().COBALT, 02),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 2),
new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 16),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 66)
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 2),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 2),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 14),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 64)
});
public static final Material INCOLOY_020 = new Material(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index f12d75175a..97a5520bbb 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -919,7 +919,7 @@ public class RECIPES_Machines {
//Fission Fuel Plant
RecipeUtils.addShapedGregtechRecipe(
CI.getTieredCircuit(5), CI.craftingToolSolderingIron, CI.getTieredCircuit(5),
- "plate", GregtechItemList.Gregtech_Computer_Cube.get(1), "",
+ "plateDenseTungstenSteel", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDenseTungstenSteel",
"gearStellite", CI.machineHull_LuV, "gearStellite",
GregtechItemList.Industrial_FuelRefinery.get(1));