diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 29 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index fefe9f8c82..4267bea316 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -923,7 +923,7 @@ public class Material { for (MaterialStack part : this.vMaterialInput){ if (part != null){ boilingPoint += part.getStackMaterial().getBoilingPointC(); - Logger.INFO("Melting Point for "+this.getLocalizedName()+" increased by "+ part.getStackMaterial().getBoilingPointC()); + Logger.INFO("Boiling Point for "+this.getLocalizedName()+" increased by "+ part.getStackMaterial().getBoilingPointC()); } else { Logger.MATERIALS(this.getLocalizedName()+" has a really invalid composition."); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index bba7175272..96cb0fcf8a 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -99,7 +99,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), }, FluidUtils.getFluidStack("molten.blackbronze", 5 * 144), 0, MathUtils.findPercentageOfInt(200 * 20, 80), - 120); + !CORE.GTNH ? 120 : 480); // Black Steel CORE.RA.addBlastSmelterRecipe( @@ -110,7 +110,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3) }, FluidUtils.getFluidStack("molten.blacksteel", 25 * 144), 0, MathUtils.findPercentageOfInt(60 * 20, 80), - 120); + !CORE.GTNH ? 120 : 480); // Red Steel CORE.RA.addBlastSmelterRecipe( @@ -122,7 +122,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 10), ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 20) }, FluidUtils.getFluidStack("molten.redsteel", 40 * 144), 0, MathUtils.findPercentageOfInt(65 * 20, 80), - 120); + !CORE.GTNH ? 120 : 480); // Blue Steel CORE.RA.addBlastSmelterRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(5), @@ -132,15 +132,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 30), ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 60) - }, FluidUtils.getFluidStack("molten.bluesteel", 125 * 144), 0, MathUtils.findPercentageOfInt(70 * 20, 80), 120); - - // TungstenSteel - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("ingotTungsten", 1), - ItemUtils.getItemStackOfAmountFromOreDict("ingotSteel", 1) }, - FluidUtils.getFluidStack("molten.tungstensteel", 2 * 144), 0, - MathUtils.findPercentageOfInt(300 * 20, 80), 120); + }, FluidUtils.getFluidStack("molten.bluesteel", 125 * 144), 0, MathUtils.findPercentageOfInt(70 * 20, 80), !CORE.GTNH ? 120 : 480); // Stainless Steel CORE.RA.addBlastSmelterRecipe( @@ -150,7 +142,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1) }, FluidUtils.getFluidStack("molten.stainlesssteel", 9 * 144), 0, - MathUtils.findPercentageOfInt(85 * 20, 80), 120); + MathUtils.findPercentageOfInt(85 * 20, 80), !CORE.GTNH ? 120 : 480); // Eglin CORE.RA.addBlastSmelterRecipe( @@ -164,7 +156,16 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 12) }, FluidUtils.getFluidStack("molten.eglinsteel", 48 * 144), 0, MathUtils.findPercentageOfInt(30 * 20, 80), 120); - if (!CORE.GTNH) { + if (!CORE.GTNH) { + + // TungstenSteel + CORE.RA.addBlastSmelterRecipe( + new ItemStack[] { ItemUtils.getGregtechCircuit(2), + ItemUtils.getItemStackOfAmountFromOreDict("ingotTungsten", 1), + ItemUtils.getItemStackOfAmountFromOreDict("ingotSteel", 1) }, + FluidUtils.getFluidStack("molten.tungstensteel", 2 * 144), 0, + MathUtils.findPercentageOfInt(75 * 20, 80), 480); + // HSS-G CORE.RA.addBlastSmelterRecipe( new ItemStack[] { ItemUtils.getGregtechCircuit(14), |