diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2020-01-13 21:22:46 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2020-01-13 21:22:46 +0000 |
| commit | 694b7e5a189a45f6f6c8b85388380d6c1e81cc0f (patch) | |
| tree | 41835bd7a736998e5b78a2b24c2a01545b4d7ebf /src/Java/gtPlusPlus/core | |
| parent | d304d49e7e835fa601accd0740b53ae06909a71e (diff) | |
| parent | b8a2285f955e410fc6c6c611e68530f71082c084 (diff) | |
| download | GT5-Unofficial-694b7e5a189a45f6f6c8b85388380d6c1e81cc0f.tar.gz GT5-Unofficial-694b7e5a189a45f6f6c8b85388380d6c1e81cc0f.tar.bz2 GT5-Unofficial-694b7e5a189a45f6f6c8b85388380d6c1e81cc0f.zip | |
Merge branch 'master' of https://github.com/alkcorp/GTplusplus
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ALLOY.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 12 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 8bfcfe2d70..114750d2d9 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -621,7 +621,7 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.MARAGING350); MaterialGenerator.generate(ALLOY.AQUATIC_STEEL); - MaterialGenerator.generate(ALLOY.NITINOL_60); + MaterialGenerator.generate(ALLOY.NITINOL_60,true,false); //Composite Alloys MaterialGenerator.generate(ALLOY.STELLITE); diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index 95e3631aaf..4e28b4a428 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -775,7 +775,7 @@ public final class ALLOY { "Pikyonium 64B", //Material Name MaterialState.SOLID, //State new short[]{52, 103, 186, 0}, //Material Colour - 7850, //Melting Point in C + 6850, //Melting Point in C 11765, //Boiling Point in C -1, -1, diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index cd02a297a7..74c8ce4202 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -646,6 +646,18 @@ public class RECIPES_GREGTECH { new int[] {10000}, //Output Chance 20 * 120, 30720); + + //NITINOL_60 + CORE.RA.addBlastSmelterRecipe( + new ItemStack[] { + ELEMENT.getInstance().TITANIUM.getDust(3), + ELEMENT.getInstance().NICKEL.getDust(2) + }, + ALLOY.NITINOL_60.getFluid(20 * 144), + 0, + 20 * 75, + 7680); + |