+ Added a config option to adjust the Turbine Rotor removal cut-off point.

+ Added some new Bags/Packs for various things. An Automatic Lunchbox, a Tool Box and a Magicians Satchel.
+ Added full compound of Eglin Steel to ABS. Closes #392.
- Removed all Multi-Tools.
$ Rewrote and Fixed the recipe system. All recipes are queued regardless of when called, then created during the end of the POST_INIT load phase. Fixes too many bugs to list. (Few more to do before tomorrow)
$ Fixed COFH Hard requirement. Closes #398.
% Adjusted the internal map type of the AutoMap. Should improve performance, if only in single digit cpu cycles.

> To-Do) Fix Recipes pertaining to compound materials made from using fluids. State may be detected wrong after recipe system changes.

3 files changed, 36 insertions, 31 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 675b04c14f..2c41789d9e 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -134,7 +134,7 @@ public final class ELEMENT {
 	
 	
 	//Custom Isotopes
-	public final Material LITHIUM7 = new Material("Lithium 7", MaterialState.LIQUID, TextureSet.SET_SHINY, Materials.Lithium.mRGBa, Materials.Lithium.mMeltingPoint, Materials.Lithium.mBlastFurnaceTemp, Materials.Lithium.getProtons(), Materials.Lithium.getNeutrons(), Materials.Lithium.mBlastFurnaceRequired, StringUtils.superscript("7Li"), 0, false);//Not a GT Inherited Material
+	public final Material LITHIUM7 = new Material("Lithium 7", MaterialState.SOLID, TextureSet.SET_SHINY, Materials.Lithium.mRGBa, Materials.Lithium.mMeltingPoint, Materials.Lithium.mBlastFurnaceTemp, Materials.Lithium.getProtons(), Materials.Lithium.getNeutrons(), Materials.Lithium.mBlastFurnaceRequired, StringUtils.superscript("7Li"), 0, false);//Not a GT Inherited Material
 	public final Material URANIUM232 = new Material("Uranium 232", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{88, 220, 103, 0}, 1132, 4131, 92, 140, false, StringUtils.superscript("232U"), 4);//Not a GT Inherited Material
 	public final Material URANIUM233 = new Material("Uranium 233", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, StringUtils.superscript("233U"), 2);//Not a GT Inherited Material
 	public final Material THORIUM232 = new Material("Thorium 232", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, StringUtils.superscript("232Th"), 1, false);//Not a GT Inherited Material
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index c863da8064..5819374f4d 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -722,36 +722,49 @@ public class Material {
 	}
 
 	public final ItemStack getComponentByPrefix(OrePrefixes aPrefix, int stacksize) {
+		String aKey = aPrefix.name();
 		Map<String, ItemStack> g =  mComponentMap.get(this.unlocalizedName);
 		if (g == null) {
 			Map<String, ItemStack> aMap = new HashMap<String, ItemStack>();
 			mComponentMap.put(unlocalizedName, aMap);
 			g = aMap;
 		}		
-		ItemStack i = g.get(aPrefix.name());
+		ItemStack i = g.get(aKey);
 		if (i != null) {
 			return ItemUtils.getSimpleStack(i, stacksize);
 		}		
 		else {
-			ItemStack u = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(aPrefix.name()+this.unlocalizedName, stacksize);
-			String aKey = aPrefix.name();
-			if (u != null) {
-				g.put(aKey, u);
-				mComponentMap.put(unlocalizedName, g);				
-				return u;
-			}
-			else {
-				return ItemUtils.getSimpleStack(ModItems.AAA_Broken);
+			// Try get a GT Material
+			Materials Erf = MaterialUtils.getMaterial(this.unlocalizedName);
+			if (Erf != null && Erf != Materials._NULL) {
+				ItemStack Erg = ItemUtils.getOrePrefixStack(aPrefix, Erf, stacksize);
+				if (Erg != null) {
+					Logger.MATERIALS("Found \"" + aKey + this.unlocalizedName + "\" using backup GT Materials option.");
+					g.put(aKey, Erg);
+					mComponentMap.put(unlocalizedName, g);
+					return Erg;
+				}
+			} else {
+				ItemStack u = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(aKey + this.unlocalizedName, stacksize);
+				if (u != null) {
+					g.put(aKey, u);
+					mComponentMap.put(unlocalizedName, g);
+					return u;
+				}
 			}
+			//Logger.MATERIALS("Unabled to find \"" + aKey + this.unlocalizedName + "\"");
+			return ItemUtils.getErrorStack(stacksize);
 		}
+		
 	}
 
 	final public Block getBlock(){
-		return Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+this.unlocalizedName, 1).getItem());
+		return Block.getBlockFromItem(getBlock(1).getItem());
 	}
 
 	public final ItemStack getBlock(final int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+this.unlocalizedName, stacksize);
+		ItemStack i = getComponentByPrefix(OrePrefixes.block, stacksize);
+		return i != null ? i : ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+this.unlocalizedName, stacksize);
 	}
 
 	public final ItemStack getDust(final int stacksize){
@@ -858,22 +871,23 @@ public class Material {
 		return Blocks.stone;
 	}
 	public final ItemStack getCrushed(final int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("crushed"+this.unlocalizedName, stacksize);
+		return getComponentByPrefix(OrePrefixes.crushed, stacksize);
 	}
 	public final ItemStack getCrushedPurified(final int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("crushedPurified"+this.unlocalizedName, stacksize);
+		return getComponentByPrefix(OrePrefixes.crushedPurified, stacksize);
 	}
 	public final ItemStack getCrushedCentrifuged(final int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("crushedCentrifuged"+this.unlocalizedName, stacksize);
+		return getComponentByPrefix(OrePrefixes.crushedCentrifuged, stacksize);
 	}
 	public final ItemStack getDustPurified(final int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPure"+this.unlocalizedName, stacksize);
+		return getComponentByPrefix(OrePrefixes.dustPure, stacksize);
 	}
 	public final ItemStack getDustImpure(final int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustImpure"+this.unlocalizedName, stacksize);
+		return getComponentByPrefix(OrePrefixes.dustImpure, stacksize);
 	}
-	public final boolean hasSolidForm() {
-		if (this.getDust(1) != null || this.getBlock(1) != null || this.getSmallDust(1) != null || this.getTinyDust(1) != null) {
+	
+	public final boolean hasSolidForm() {		
+		if (ItemUtils.checkForInvalidItems(new ItemStack[] {getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1)})) {
 			return true;
 		}
 		return false;
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 4ed8f4ceb3..44c02bc70d 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -233,16 +233,7 @@ public class MaterialGenerator {
 
 	public static void generateNuclearMaterial(final Material matInfo, final boolean generatePlates){
 		try {
-			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 sRadiation = 0;
-			if (matInfo.vRadiationLevel != 0){
-				sRadiation = matInfo.vRadiationLevel;
-			}
-
+			
 			tempBlock = new BlockBaseModular(matInfo,BlockTypes.STANDARD);
 			temp = new BaseItemDust(matInfo);
 			temp = new BaseItemIngot(matInfo);
@@ -322,7 +313,7 @@ public class MaterialGenerator {
 			temp = new BaseItemPurifiedDust(matInfo);
 
 			Logger.MATERIALS("Generated all ore components for "+matInfo.getLocalizedName()+", now generating processing recipes.");
-			RecipeGen_Ore.generateRecipes(matInfo);
+			new RecipeGen_Ore(matInfo);
 
 		} catch (final Throwable t){
 			Logger.MATERIALS("[Error] "+(matInfo != null ? matInfo.getLocalizedName() : "Null Material")+" failed to generate.");