3 files changed, 55 insertions, 10 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index d7a4bd4d3c..63ceb2e272 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -506,6 +506,23 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
 			});	//Material Stacks with Percentage of required elements.
 
+	public static final Material EGLIN_STEEL_BASE = new Material(
+			"Eglin Steel Base Compound", //Material Name
+			MaterialState.SOLID, //State
+			new short[]{139,69,19, 0}, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1,
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 5),
+					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().IRON, 23)
+			});
+	
 	public static final Material EGLIN_STEEL = new Material(
 			"Eglin Steel", //Material Name
 			MaterialState.SOLID, //State
@@ -517,10 +534,10 @@ public final class ALLOY {
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ALLOY.STEEL, 20),
+					new MaterialStack(ALLOY.EGLIN_STEEL_BASE, 10),
 					new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
-					new MaterialStack(ELEMENT.getInstance().NICKEL, 5),
 					new MaterialStack(ELEMENT.getInstance().SILICON, 4),
+					new MaterialStack(ELEMENT.getInstance().CARBON, 1)
 			});
 
 
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index b5fd2da087..c4f49706e8 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -38,7 +38,7 @@ public class Material {
 
 	private final boolean usesBlastFurnace;
 	public final boolean isRadioactive;
-	public final byte vRadioationLevel;
+	public final byte vRadiationLevel;
 
 	private final int meltingPointK;
 	private final int boilingPointK;
@@ -179,11 +179,11 @@ public class Material {
 		//Sets the Rad level
 		if (radiationLevel != 0){
 			this.isRadioactive = true;
-			this.vRadioationLevel = (byte) radiationLevel;
+			this.vRadiationLevel = (byte) radiationLevel;
 		}
 		else {
 			this.isRadioactive = false;
-			this.vRadioationLevel = (byte) radiationLevel;
+			this.vRadiationLevel = (byte) radiationLevel;
 		}
 
 		//Sets the materials 'tier'. Will probably replace this logic.
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index d4ed2c3be8..fd53a9be4d 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -33,7 +33,6 @@ public class MaterialGenerator {
 		generate(matInfo, generateEverything, true);
 	}
 
-	@SuppressWarnings("unused")
 	public static void generate(final Material matInfo, final boolean generateEverything, final boolean generateBlastSmelterRecipes){
 		final String unlocalizedName = matInfo.getUnlocalizedName();
 		final String materialName = matInfo.getLocalizedName();
@@ -47,8 +46,8 @@ public class MaterialGenerator {
 		}
 
 		int sRadiation = 0;
-		if (ItemUtils.isRadioactive(materialName)){
-			sRadiation = matInfo.vRadioationLevel;
+		if (ItemUtils.isRadioactive(materialName) || matInfo.vRadiationLevel != 0){
+			sRadiation = matInfo.vRadiationLevel;
 		}
 
 		if (matInfo.getState() == MaterialState.SOLID){
@@ -128,6 +127,35 @@ public class MaterialGenerator {
 		RecipeGen_ShapedCrafting.generateRecipes(matInfo);
 
 	}
+	
+	public static void generateDusts(final Material matInfo){
+		final String unlocalizedName = matInfo.getUnlocalizedName();
+		final String materialName = matInfo.getLocalizedName();
+		final short[] C = matInfo.getRGBA();
+		final int Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
+		int materialTier = matInfo.vTier; //TODO
+
+		if ((materialTier > 10) || (materialTier <= 0)){
+			materialTier = 2;
+		}
+
+		int sRadiation = 0;
+		if (ItemUtils.isRadioactive(materialName) || matInfo.vRadiationLevel != 0){
+			sRadiation = matInfo.vRadiationLevel;
+		}
+
+		if (matInfo.getState() == MaterialState.SOLID){
+					Item temp;
+					temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation, false);
+					temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation, false);
+					temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", materialTier, sRadiation, false);
+		}
+
+		//Add A jillion Recipes - old code
+		RecipeGen_DustGeneration.addMixerRecipe_Standalone(matInfo);
+		RecipeGen_Fluids.generateRecipes(matInfo);
+	}
+	
 	public static void generateNuclearMaterial(final Material matInfo){
 		generateNuclearMaterial(matInfo, true);
 	}
@@ -140,8 +168,8 @@ public class MaterialGenerator {
 		final int Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
 
 		int sRadiation = 0;
-		if (matInfo.vRadioationLevel != 0){
-			sRadiation = matInfo.vRadioationLevel;
+		if (matInfo.vRadiationLevel != 0){
+			sRadiation = matInfo.vRadiationLevel;
 		}
 
 		Item temp;