+ Added Eglin Steel.

+ Added Recipes for the Industrial Sieve & Casings.
% Tweaked Blast Furnace EU cost for all materials.

5 files changed, 53 insertions, 7 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);
 
 
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 550a23b4c5..027cacbc29 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -522,7 +522,22 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
 			});	//Material Stacks with Percentage of required elements.
 
-
+	public static final Material EGLIN_STEEL = new Material(
+			"Eglin Steel", //Material Name
+			MaterialState.SOLID, //State
+			new short[]{139,69,19, 0}, //Material Colour
+			1048, //Melting Point in C
+			1973, //Boiling Point in C
+			((ALLOY.STEEL.getProtons()*20)+(ELEMENT.getInstance().NICKEL.getProtons()*5)+(ELEMENT.getInstance().SILICON.getProtons()*1)+(ELEMENT.getInstance().ALUMINIUM.getProtons()*4))/30, //Protons
+			((ALLOY.STEEL.getNeutrons()*20)+(ELEMENT.getInstance().NICKEL.getNeutrons()*5)+(ELEMENT.getInstance().SILICON.getNeutrons()*1)+(ELEMENT.getInstance().ALUMINIUM.getNeutrons()*4))/30, //Neutrons
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ALLOY.STEEL, 20),
+					new MaterialStack(ELEMENT.getInstance().SILICON, 1),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 5),
+					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
+			});
 
 
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 617850105b..dc23420add 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -532,7 +532,8 @@ public class RECIPES_GREGTECH {
 		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60);
 		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144*3), null, 3000, 500);
 		//GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 720), FluidUtils.getFluidStack("molten.uraniumhexafluoride", 288), null, 5000, 2000);
-	}
+		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 20), ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), null, null, ItemUtils.getItemStackOfAmountFromOreDict("dustEglinSteel", 30), 1200, 60);
+		}
 
 	private static void chemicalReactorRecipes(){
 		GT_Values.RA.addChemicalRecipe(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index cadea514bc..91abea8363 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -60,6 +60,10 @@ public class RECIPES_Machines {
 	static ItemStack RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1);
 	static ItemStack RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1);
 	static ItemStack RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1);
+	//Industrial Sieve
+	static ItemStack RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1);
+	static ItemStack RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1);
+	static ItemStack RECIPE_IndustrialSieveGrate = GregtechItemList.Casing_SifterGrate.get(1);
 
 
 	//Buffer Cores
@@ -781,6 +785,26 @@ public class RECIPES_Machines {
 					"frameGtStellite", machineCasing_UV, "frameGtStellite",
 					"plateQuantum", "plateQuantum", "plateQuantum",
 					RECIPE_IndustrialMatterFabCoil);
+			
+			
+			//Industrial Sieve
+			RecipeUtils.addShapedGregtechRecipe(
+					"plateEglinSteel", circuitTier2, "plateEglinSteel",
+					cableTier3, machineCasing_MV, cableTier3,
+					"plateEglinSteel", circuitTier2, "plateEglinSteel",
+					RECIPE_IndustrialSieveController);
+			//Industrial Sieve Casing
+			RecipeUtils.addShapedGregtechRecipe(
+					"plateEglinSteel", "plateEglinSteel", "plateEglinSteel",
+					"plateEglinSteel", "frameGtTumbaga", "plateEglinSteel",
+					"plateEglinSteel", "plateEglinSteel", "plateEglinSteel",
+					RECIPE_IndustrialSieveFrame);
+			//Industrial Sieve Grate
+			RecipeUtils.addShapedGregtechRecipe(
+					"frameGtEglinSteel", "wireFineSteel", "frameGtEglinSteel",
+					"wireFineSteel", "wireFineSteel", "wireFineSteel",
+					"frameGtEglinSteel", "wireFineSteel", "frameGtEglinSteel",
+					RECIPE_IndustrialSieveGrate);
 
 		}