diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 5 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index a874177520..f6c949df13 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -18,7 +18,6 @@ import gtPlusPlus.core.item.base.misc.BaseItemMisc; import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes; import gtPlusPlus.core.item.base.plates.BaseItemPlate; import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble; -import gtPlusPlus.core.item.effects.RarityRare; import gtPlusPlus.core.item.effects.RarityUncommon; import gtPlusPlus.core.item.general.*; import gtPlusPlus.core.item.init.ItemsFoods; @@ -31,7 +30,6 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.*; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.material.nuclear.NUCLIDE; -import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.fluid.FluidUtils; @@ -371,7 +369,8 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.INCONEL_792); - //Maraging Steel + //Steels + MaterialGenerator.generate(ALLOY.EGLIN_STEEL); MaterialGenerator.generate(ALLOY.MARAGING250); MaterialGenerator.generate(ALLOY.MARAGING300); MaterialGenerator.generate(ALLOY.MARAGING350); diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index f28f2871a8..eb86f995d3 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java @@ -264,14 +264,21 @@ public class BaseItemDust extends Item{ Utils.LOG_INFO("Found "+input2.getDisplayName()); } }*/ + + int timeTaken = 250*this.mTier*20; + + if (this.mTier <= 4){ + timeTaken = 50*this.mTier*20; + } + GT_Values.RA.addBlastRecipe( input1, input2, GT_Values.NF, GT_Values.NF, output1, output2, - 250*this.mTier*20, - this.mTier*64, + timeTaken, + this.mTier*60, tempRequired); |