$ Cleaned up the entire project.

> Much neat, very nices.

7 files changed, 1877 insertions, 1205 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
index e2af820c16..d6031edb23 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
@@ -10,82 +10,72 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
 public class CustomGtTextures {
-    public enum ItemIcons implements IIconContainer, Runnable {
-        VOID // The Empty Texture
-        , RENDERING_ERROR, WRENCH, MORTAR, CROWBAR,
-        JACKHAMMER, WIRE_CUTTER, KNIFE, BUTCHERYKNIFE,
-        SICKLE, SCOOP, GRAFTER, PLUNGER, ROLLING_PIN,
-        HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW,
-        HANDLE_SCREWDRIVER, HANDLE_BUZZSAW,
-        HANDLE_ELECTRIC_SCREWDRIVER, HANDLE_SOLDERING,
-        POWER_UNIT_LV, POWER_UNIT_MV, POWER_UNIT_HV,
-        DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2,
-        DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5,
-        DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8,
-        ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3,
-        ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7,
-        ENERGY_BAR_8,
-        
-        SKOOKUMCHOOCHER, TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;      
-
-        public static final ITexture[] ERROR_RENDERING = new ITexture[]{new GT_RenderedTexture(RENDERING_ERROR)};
-
-        protected IIcon mIcon, mOverlay;
-
-        private ItemIcons() {
-            GregTech_API.sGTItemIconload.add(this);
-        }
-
-        @Override
-        public IIcon getIcon() {
-            return mIcon;
-        }
-
-        @Override
-        public IIcon getOverlayIcon() {
-            return mOverlay;
-        }
-
-        @Override
-        public ResourceLocation getTextureFile() {
-            return TextureMap.locationItemsTexture;
-        }
-
-        @Override
-        public void run() {
-            mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this);
-            mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this + "_OVERLAY");
-        }
-
-        public static class CustomIcon implements IIconContainer, Runnable {
-            protected IIcon mIcon, mOverlay;
-            protected String mIconName;
-
-            public CustomIcon(String aIconName) {
-                mIconName = aIconName;
-                GregTech_API.sGTItemIconload.add(this);
-            }
-
-            @Override
-            public IIcon getIcon() {
-                return mIcon;
-            }
-
-            @Override
-            public IIcon getOverlayIcon() {
-                return mOverlay;
-            }
-
-            @Override
-            public void run() {
-                mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + mIconName);
-                mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + mIconName + "_OVERLAY");
-            }
-
-            @Override
-            public ResourceLocation getTextureFile() {
-                return TextureMap.locationItemsTexture;
-            }
-        }
-    }
+	public enum ItemIcons implements IIconContainer, Runnable {
+		VOID // The Empty Texture
+		, RENDERING_ERROR, WRENCH, MORTAR, CROWBAR, JACKHAMMER, WIRE_CUTTER, KNIFE, BUTCHERYKNIFE, SICKLE, SCOOP, GRAFTER, PLUNGER, ROLLING_PIN, HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW, HANDLE_SCREWDRIVER, HANDLE_BUZZSAW, HANDLE_ELECTRIC_SCREWDRIVER, HANDLE_SOLDERING, POWER_UNIT_LV, POWER_UNIT_MV, POWER_UNIT_HV, DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8, ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8,
+
+		SKOOKUMCHOOCHER, TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;
+
+		public static class CustomIcon implements IIconContainer, Runnable {
+			protected IIcon		mIcon, mOverlay;
+			protected String	mIconName;
+
+			public CustomIcon(final String aIconName) {
+				this.mIconName = aIconName;
+				GregTech_API.sGTItemIconload.add(this);
+			}
+
+			@Override
+			public IIcon getIcon() {
+				return this.mIcon;
+			}
+
+			@Override
+			public IIcon getOverlayIcon() {
+				return this.mOverlay;
+			}
+
+			@Override
+			public ResourceLocation getTextureFile() {
+				return TextureMap.locationItemsTexture;
+			}
+
+			@Override
+			public void run() {
+				this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + this.mIconName);
+				this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + this.mIconName + "_OVERLAY");
+			}
+		}
+
+		public static final ITexture[]	ERROR_RENDERING	= new ITexture[] {
+				new GT_RenderedTexture(RENDERING_ERROR)
+		};
+
+		protected IIcon					mIcon, mOverlay;
+
+		private ItemIcons() {
+			GregTech_API.sGTItemIconload.add(this);
+		}
+
+		@Override
+		public IIcon getIcon() {
+			return this.mIcon;
+		}
+
+		@Override
+		public IIcon getOverlayIcon() {
+			return this.mOverlay;
+		}
+
+		@Override
+		public ResourceLocation getTextureFile() {
+			return TextureMap.locationItemsTexture;
+		}
+
+		@Override
+		public void run() {
+			this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this);
+			this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this + "_OVERLAY");
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index ee5200a23f..52c34bf4f1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.xmod.gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.W;
-
+import gregtech.api.enums.GT_Values;
 import gregtech.api.util.*;
 import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer;
 import net.minecraft.block.Block;
@@ -15,250 +14,272 @@ import net.minecraftforge.fluids.Fluid;
 public enum GregtechItemList implements GregtechItemContainer {
 
 	Energy_Buffer_CREATIVE,
-	
-	//Energy Buffers
+
+	// Energy Buffers
 	Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV, Energy_Buffer_1by1_MV, Energy_Buffer_1by1_HV, Energy_Buffer_1by1_EV, Energy_Buffer_1by1_IV, Energy_Buffer_1by1_LuV, Energy_Buffer_1by1_ZPM, Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX,
-	
-	//Cobble Generators
+
+	// Cobble Generators
 	Cobble_Generator_ULV, Cobble_Generator_LV, Cobble_Generator_MV, Cobble_Generator_HV, Cobble_Generator_EV, Cobble_Generator_IV, Cobble_Generator_LuV, Cobble_Generator_ZPM, Cobble_Generator_UV, Cobble_Generator_MAX,
-	
-	//The max Steam condenser
-	Condensor_MAX, 
-	
-	//Player owned Safes
+
+	// The max Steam condenser
+	Condensor_MAX,
+
+	// Player owned Safes
 	GT_Safe_ULV, GT_Safe_LV, GT_Safe_MV, GT_Safe_HV, GT_Safe_EV, GT_Safe_IV, GT_Safe_LuV, GT_Safe_ZPM, GT_Safe_UV, GT_Safe_MAX,
-	
-	//Rocket Engines
+
+	// Rocket Engines
 	Rocket_Engine_EV, Rocket_Engine_IV, Rocket_Engine_LuV,
-	
-	//IronBlastFurnace Machine_Bronze_BlastFurnace
+
+	// IronBlastFurnace Machine_Bronze_BlastFurnace
 	Machine_Iron_BlastFurnace, Casing_IronPlatedBricks,
-	
-	//Machine Casings
-	Casing_Shielding, 
-	
-	//Large Centrifuge
+
+	// Machine Casings
+	Casing_Shielding,
+
+	// Large Centrifuge
 	Industrial_Centrifuge, Casing_Centrifuge1,
-	
-	//Coke Oven
-	Industrial_CokeOven, Casing_CokeOven, Casing_CokeOven_Coil1, Casing_CokeOven_Coil2, 
-	
-	//Bending Maching // Plate Press // Press
-	Casing_MaterialPress, Industrial_PlatePress, 
-	
-	//Gregtech Machine Parts
-	Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_MAX, 
-	Electric_Pump_LuV, Electric_Pump_ZPM, Electric_Pump_UV, Electric_Pump_MAX,
-	Conveyor_Module_LuV, Conveyor_Module_ZPM, Conveyor_Module_UV, Conveyor_Module_MAX, 
-	Electric_Piston_LuV, Electric_Piston_ZPM, Electric_Piston_UV, Electric_Piston_MAX,
-	Robot_Arm_LuV, Robot_Arm_ZPM, Robot_Arm_UV, Robot_Arm_MAX, 
-	Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, Field_Generator_MAX, 
-	Emitter_LuV, Emitter_ZPM, Emitter_UV, Emitter_MAX, 
-	Sensor_LuV, Sensor_ZPM, Sensor_UV, Sensor_MAX, 
-	
-	//Circuits
-	Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced,	
-	Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, 
-	Circuit_IV, Circuit_LuV, Circuit_ZPM,
-	//Circuit Parts
-	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, 
-	Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM,
-	Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
-	Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM, 
-	
-	//Unused Machine Casings
-	Casing_MacerationStack, Casing_MatterGen, Casing_MatterFab, Casing_U7, 
-	//Unused Machine Coils
+
+	// Coke Oven
+	Industrial_CokeOven, Casing_CokeOven, Casing_CokeOven_Coil1, Casing_CokeOven_Coil2,
+
+	// Bending Maching // Plate Press // Press
+	Casing_MaterialPress, Industrial_PlatePress,
+
+	// Gregtech Machine Parts
+	Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_MAX, Electric_Pump_LuV, Electric_Pump_ZPM, Electric_Pump_UV, Electric_Pump_MAX, Conveyor_Module_LuV, Conveyor_Module_ZPM, Conveyor_Module_UV, Conveyor_Module_MAX, Electric_Piston_LuV, Electric_Piston_ZPM, Electric_Piston_UV, Electric_Piston_MAX, Robot_Arm_LuV, Robot_Arm_ZPM, Robot_Arm_UV, Robot_Arm_MAX, Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, Field_Generator_MAX, Emitter_LuV, Emitter_ZPM, Emitter_UV, Emitter_MAX, Sensor_LuV, Sensor_ZPM, Sensor_UV, Sensor_MAX,
+
+	// Circuits
+	Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced, Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, Circuit_IV, Circuit_LuV, Circuit_ZPM,
+	// Circuit Parts
+	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM, Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM,
+
+	// Unused Machine Casings
+	Casing_MacerationStack, Casing_MatterGen, Casing_MatterFab, Casing_U7,
+	// Unused Machine Coils
 	Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_BlastSmelter, Casing_BlastSmelter,
-	
-	//Windmill Shaft Shape for Extruder
-	Shape_Extruder_WindmillShaft, 
-	
-	//Batteries
+
+	// Windmill Shaft Shape for Extruder
+	Shape_Extruder_WindmillShaft,
+
+	// Batteries
 	Battery_RE_EV_Sodium, Battery_RE_EV_Cadmium, Battery_RE_EV_Lithium,
-	
-	//Industrial Electrolyzer
-	Casing_Electrolyzer, Industrial_Electrolyzer, 
-	
-	//Industrial Maceration Stack
-	Casing_WireFactory, Industrial_MacerationStack, 
-	
-	//Industrial Wire Factory
-	Industrial_WireFactory, 
-	
-	Industrial_MassFab, 
-	
-	//Solar Generators
-	GT_Solar_ULV, GT_Solar_LV, GT_Solar_MV,
-	GT_Solar_HV, GT_Solar_EV, GT_Solar_IV,
-	GT_Solar_LuV, GT_Solar_ZPM, GT_Solar_UV, GT_Solar_MAX, 
-	
-	
-	
-	//Cooked Raisin Toast for ImQ009
-	Food_Baked_Raisin_Bread, 
-	
-	//For sintering TODO
-	Industrial_AlloyBlastSmelter, 
-	
-	//Block that enables uplink to a superconductor network
-	SuperConductorInputNode, 
-	
-	//The two tiers of reactor casings
-	Casing_Reactor_I, Casing_Reactor_II, 
-	
-	//Power sub-station for mass storage. 3 hatches for input and output, whatever voltages you desire.
-	PowerSubStation, 
-	
-	//Chemical Dehydrators for nuclear fuels
+
+	// Industrial Electrolyzer
+	Casing_Electrolyzer, Industrial_Electrolyzer,
+
+	// Industrial Maceration Stack
+	Casing_WireFactory, Industrial_MacerationStack,
+
+	// Industrial Wire Factory
+	Industrial_WireFactory,
+
+	Industrial_MassFab,
+
+	// Solar Generators
+	GT_Solar_ULV, GT_Solar_LV, GT_Solar_MV, GT_Solar_HV, GT_Solar_EV, GT_Solar_IV, GT_Solar_LuV, GT_Solar_ZPM, GT_Solar_UV, GT_Solar_MAX,
+
+	// Cooked Raisin Toast for ImQ009
+	Food_Baked_Raisin_Bread,
+
+	// For sintering TODO
+	Industrial_AlloyBlastSmelter,
+
+	// Block that enables uplink to a superconductor network
+	SuperConductorInputNode,
+
+	// The two tiers of reactor casings
+	Casing_Reactor_I, Casing_Reactor_II,
+
+	// Power sub-station for mass storage. 3 hatches for input and output,
+	// whatever voltages you desire.
+	PowerSubStation,
+
+	// Chemical Dehydrators for nuclear fuels
 	GT_Dehydrator_EV, GT_Dehydrator_IV, GT_Dehydrator_LuV, GT_Dehydrator_ZPM,
-	
-	//Fluid Storage Tanks
-	GT_FluidTank_ULV, GT_FluidTank_LV, GT_FluidTank_MV, GT_FluidTank_HV, GT_FluidTank_EV,
-	GT_FluidTank_IV, GT_FluidTank_LuV, GT_FluidTank_ZPM, GT_FluidTank_UV, GT_FluidTank_MAX, 
-	
-	//Fluid Cells to regulate flows.
-	Fluid_Cell_1L, Fluid_Cell_16L, Fluid_Cell_36L, Fluid_Cell_144L, 
-	
-	//Multitank
-	Industrial_MultiTank, Industrial_MultiTankDense, Casing_MultitankExterior, 
-	
-	//Gt4 Workbenches
-	GT4_Workbench_Bronze, GT4_Workbench_Advanced, 
-	
-	//Geothermal Engines
-	Geothermal_Engine_EV, Geothermal_Engine_IV, Geothermal_Engine_LuV, 
-	
-	//Tesseracts
-	GT4_Tesseract_Generator, GT4_Tesseract_Terminal, 
-	
-	//Casings Tier 2 [17-32]
-	Casing_StructuralGlass, 
-	Casing_PlaceHolder1, Casing_PlaceHolder2, Casing_PlaceHolder3,
-	Casing_PlaceHolder4, Casing_PlaceHolder5, Casing_PlaceHolder6,
-	Casing_PlaceHolder7, Casing_PlaceHolder8, Casing_PlaceHolder9,
-	Casing_PlaceHolder10, Casing_PlaceHolder11, Casing_PlaceHolder12,
-	Casing_PlaceHolder13, Casing_PlaceHolder14, Casing_PlaceHolder15, 
-	
-	//LFTR
-	ThoriumReactor,
-	;
-
-	public static final GregtechItemList[]
-			DYE_ONLY_ITEMS = {
-		Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV };
-	private ItemStack mStack;
-	private boolean mHasNotBeenSet = true;
-
-	public static Fluid sOilExtraHeavy, sOilHeavy, sOilMedium, sOilLight, sNaturalGas;
+
+	// Fluid Storage Tanks
+	GT_FluidTank_ULV, GT_FluidTank_LV, GT_FluidTank_MV, GT_FluidTank_HV, GT_FluidTank_EV, GT_FluidTank_IV, GT_FluidTank_LuV, GT_FluidTank_ZPM, GT_FluidTank_UV, GT_FluidTank_MAX,
+
+	// Fluid Cells to regulate flows.
+	Fluid_Cell_1L, Fluid_Cell_16L, Fluid_Cell_36L, Fluid_Cell_144L,
+
+	// Multitank
+	Industrial_MultiTank, Industrial_MultiTankDense, Casing_MultitankExterior,
+
+	// Gt4 Workbenches
+	GT4_Workbench_Bronze, GT4_Workbench_Advanced,
+
+	// Geothermal Engines
+	Geothermal_Engine_EV, Geothermal_Engine_IV, Geothermal_Engine_LuV,
+
+	// Tesseracts
+	GT4_Tesseract_Generator, GT4_Tesseract_Terminal,
+
+	// Casings Tier 2 [17-32]
+	Casing_StructuralGlass, Casing_PlaceHolder1, Casing_PlaceHolder2, Casing_PlaceHolder3, Casing_PlaceHolder4, Casing_PlaceHolder5, Casing_PlaceHolder6, Casing_PlaceHolder7, Casing_PlaceHolder8, Casing_PlaceHolder9, Casing_PlaceHolder10, Casing_PlaceHolder11, Casing_PlaceHolder12, Casing_PlaceHolder13, Casing_PlaceHolder14, Casing_PlaceHolder15,
+
+	// LFTR
+	ThoriumReactor,;
+
+	public static final GregtechItemList[]	DYE_ONLY_ITEMS	= {
+			Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV
+	};
+	public static Fluid						sOilExtraHeavy, sOilHeavy, sOilMedium, sOilLight, sNaturalGas;
+	private ItemStack						mStack;
+
+	private boolean							mHasNotBeenSet	= true;
 
 	@Override
-	public GregtechItemList set(Item aItem) {
-		mHasNotBeenSet = false;
-		if (aItem == null) return this;
-		ItemStack aStack = new ItemStack(aItem, 1, 0);
-		mStack = GT_Utility.copyAmount(1, aStack);
-		return this;
+	public ItemStack get(final long aAmount, final Object... aReplacements) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return GT_Utility.copyAmount(aAmount, aReplacements);
+		}
+		return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(this.mStack));
 	}
 
 	@Override
-	public GregtechItemList set(ItemStack aStack) {
-		mHasNotBeenSet = false;
-		mStack = GT_Utility.copyAmount(1, aStack);
-		return this;
+	public ItemStack getAlmostBroken(final long aAmount, final Object... aReplacements) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return GT_Utility.copyAmount(aAmount, aReplacements);
+		}
+		return GT_Utility.copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1,
+				GT_OreDictUnificator.get(this.mStack));
 	}
 
 	@Override
-	public Item getItem() {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return null;
-		return mStack.getItem();
+	public Block getBlock() {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		return GT_Utility.getBlockFromStack(this.getItem());
 	}
 
 	@Override
-	public Block getBlock() {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		return GT_Utility.getBlockFromStack(getItem());
+	public Item getItem() {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return null;
+		}
+		return this.mStack.getItem();
 	}
 
 	@Override
-	public final boolean hasBeenSet() {
-		return !mHasNotBeenSet;
+	public ItemStack getUndamaged(final long aAmount, final Object... aReplacements) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return GT_Utility.copyAmount(aAmount, aReplacements);
+		}
+		return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(this.mStack));
 	}
 
 	@Override
-	public boolean isStackEqual(Object aStack) {
-		return isStackEqual(aStack, false, false);
+	public ItemStack getWildcard(final long aAmount, final Object... aReplacements) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return GT_Utility.copyAmount(aAmount, aReplacements);
+		}
+		return GT_Utility.copyAmountAndMetaData(aAmount, GT_Values.W, GT_OreDictUnificator.get(this.mStack));
 	}
 
 	@Override
-	public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) {
-		if (GT_Utility.isStackInvalid(aStack)) return false;
-		return GT_Utility.areUnificationsEqual((ItemStack)aStack, aWildcard?getWildcard(1):get(1), aIgnoreNBT);
+	public ItemStack getWithCharge(final long aAmount, final int aEnergy, final Object... aReplacements) {
+		final ItemStack rStack = this.get(1, aReplacements);
+		if (GT_Utility.isStackInvalid(rStack)) {
+			return null;
+		}
+		GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
+		return GT_Utility.copyAmount(aAmount, rStack);
 	}
 
 	@Override
-	public ItemStack get(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack));
+	public ItemStack getWithDamage(final long aAmount, final long aMetaValue, final Object... aReplacements) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return GT_Utility.copyAmount(aAmount, aReplacements);
+		}
+		return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(this.mStack));
 	}
 
 	@Override
-	public ItemStack getWildcard(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(mStack));
+	public ItemStack getWithName(final long aAmount, final String aDisplayName, final Object... aReplacements) {
+		final ItemStack rStack = this.get(1, aReplacements);
+		if (GT_Utility.isStackInvalid(rStack)) {
+			return null;
+		}
+		rStack.setStackDisplayName(aDisplayName);
+		return GT_Utility.copyAmount(aAmount, rStack);
 	}
 
 	@Override
-	public ItemStack getUndamaged(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(mStack));
+	public final boolean hasBeenSet() {
+		return !this.mHasNotBeenSet;
 	}
 
 	@Override
-	public ItemStack getAlmostBroken(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage()-1, GT_OreDictUnificator.get(mStack));
+	public boolean isStackEqual(final Object aStack) {
+		return this.isStackEqual(aStack, false, false);
 	}
 
 	@Override
-	public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements) {
-		ItemStack rStack = get(1, aReplacements);
-		if (GT_Utility.isStackInvalid(rStack)) return null;
-		rStack.setStackDisplayName(aDisplayName);
-		return GT_Utility.copyAmount(aAmount, rStack);
+	public boolean isStackEqual(final Object aStack, final boolean aWildcard, final boolean aIgnoreNBT) {
+		if (GT_Utility.isStackInvalid(aStack)) {
+			return false;
+		}
+		return GT_Utility.areUnificationsEqual((ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1),
+				aIgnoreNBT);
 	}
 
 	@Override
-	public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements) {
-		ItemStack rStack = get(1, aReplacements);
-		if (GT_Utility.isStackInvalid(rStack)) return null;
-		GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
-		return GT_Utility.copyAmount(aAmount, rStack);
+	public GregtechItemList registerOre(final Object... aOreNames) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		for (final Object tOreName : aOreNames) {
+			GT_OreDictUnificator.registerOre(tOreName, this.get(1));
+		}
+		return this;
 	}
 
 	@Override
-	public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(mStack));
+	public GregtechItemList registerWildcardAsOre(final Object... aOreNames) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		for (final Object tOreName : aOreNames) {
+			GT_OreDictUnificator.registerOre(tOreName, this.getWildcard(1));
+		}
+		return this;
 	}
 
 	@Override
-	public GregtechItemList registerOre(Object... aOreNames) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, get(1));
+	public GregtechItemList set(final Item aItem) {
+		this.mHasNotBeenSet = false;
+		if (aItem == null) {
+			return this;
+		}
+		final ItemStack aStack = new ItemStack(aItem, 1, 0);
+		this.mStack = GT_Utility.copyAmount(1, aStack);
 		return this;
 	}
 
 	@Override
-	public GregtechItemList registerWildcardAsOre(Object... aOreNames) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, getWildcard(1));
+	public GregtechItemList set(final ItemStack aStack) {
+		this.mHasNotBeenSet = false;
+		this.mStack = GT_Utility.copyAmount(1, aStack);
 		return this;
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
index dcb075349d..d573144fca 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
@@ -12,28 +12,24 @@ package gtPlusPlus.xmod.gregtech.api.enums;
 * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal
 * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb
 * Infinite (Cheaty)
-* 
+*
 Circuits
-	Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced,	
-	Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, 
+	Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced,
+	Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick,
 	Circuit_IV, Circuit_LuV, Circuit_ZPM,
 Circuit Parts
-	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, 
+	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM,
 	Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM,
 	Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
 	Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM;
 */
 public enum GregtechOreDictNames {
-	buffer_core, itemGregConduit, Circuit_IV, Circuit_LuV, Circuit_ZPM,
-	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, 
-	Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM,
-	Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
-	Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM;
+	buffer_core, itemGregConduit, Circuit_IV, Circuit_LuV, Circuit_ZPM, Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM, Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM;
 
 	public String unlocalisedName;
 
 	private void ModObject() {
-		unlocalisedName = name();
+		this.unlocalisedName = this.name();
 	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 1c8ae2bc3c..3530b3d084 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -1,10 +1,5 @@
 package gtPlusPlus.xmod.gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.B;
-import static gregtech.api.enums.GT_Values.D2;
-import static gregtech.api.enums.GT_Values.M;
-import static gtPlusPlus.core.util.Utils.getTcAspectStack;
-
 import java.util.*;
 
 import gregtech.api.enums.*;
@@ -14,6 +9,7 @@ import gregtech.api.objects.GT_FluidStack;
 import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.*;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
 import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData;
 import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack;
@@ -23,722 +19,1177 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 public enum GregtechOrePrefixes {
-	/* Electric Components.
+	/*
+	 * Electric Components.
 	 *
-	 * usual Materials for this are:
-	 * Primitive (Tier 1)
-	 * Basic (Tier 2) as used by UE as well : IC2 Circuit and RE-Battery
-	 * Good (Tier 3)
-	 * Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium Battery
-	 * Data (Tier 5) : Data Storage Circuit
-	 * Elite (Tier 6) as used by UE as well : Energy Crystal and Data Control Circuit
-	 * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal
-	 * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb
-	 * Infinite (Cheaty)
-	 */
-	ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 16, 12), // A hot Ingot, which has to be cooled down by a Vacuum Freezer.
-	ingot("Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64, 11), // A regular Ingot. Introduced by Eloraam
-	dustTiny("Tiny Dusts", "Tiny Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M / 9, 64, 0), // 1/9th of a Dust.
-	dustSmall("Small Dusts", "Small Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M / 4, 64, 1), // 1/4th of a Dust.
-	dustImpure("Impure Dusts", "Impure Pile of ", " Dust", true, true, false, false, false, false, false, true, false, true, B[3], M * 1, 64, 3), // Dust with impurities. 1 Unit of Main Material and 1/9 - 1/4 Unit of secondary Material
-	dustRefined("Refined Dusts", "Refined Pile of ", " Dust", true, true, false, false, false, false, false, true, false, true, B[3], M * 1, 64, 2),
-	dustPure("Purified Dusts", "Purified Pile of ", " Dust", true, true, false, false, false, false, false, true, false, true, B[3], M * 1, 64, 4),
-	dust("Dusts", "", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M * 1, 64, 2), // Pure Dust worth of one Ingot or Gem. Introduced by Alblaka.
-	nugget("Nuggets", "", " Nugget", true, true, false, false, false, false, false, true, false, false, B[1], M / 9, 64, 9), // A Nugget. Introduced by Eloraam
-	plate("Plates", "", " Plate", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M * 1, 64, 17), // Regular Plate made of one Ingot/Dust. Introduced by Calclavia
-	block("Storage Blocks", "Block of ", "", true, true, false, false, false, true, true, false, false, false, 0, M * 9, 64, 71), // Storage Block consisting out of 9 Ingots/Gems/Dusts. Introduced by CovertJaguar
-	gem("Gemstones", "", "", true, true, true, false, false, false, true, true, false, false, B[2], M * 1, 64, 8), // A regular Gem worth one Dust. Introduced by Eloraam
-	gemChipped("Chipped Gemstones", "Chipped ", "", true, true, true, false, false, false, true, true, false, false, B[2], M / 4, 64, 59), // A regular Gem worth one small Dust. Introduced by TerraFirmaCraft
-	gemFlawed("Flawed Gemstones", "Flawed ", "", true, true, true, false, false, false, true, true, false, false, B[2], M / 2, 64, 60), // A regular Gem worth two small Dusts. Introduced by TerraFirmaCraft
-	gemFlawless("Flawless Gemstones", "Flawless ", "", true, true, true, false, false, false, true, true, false, false, B[2], M * 2, 32, 61), // A regular Gem worth two Dusts. Introduced by TerraFirmaCraft
-	gemExquisite("Exquisite Gemstones", "Exquisite ", "", true, true, true, false, false, false, true, true, false, false, B[2], M * 4, 16, 62), // A regular Gem worth four Dusts. Introduced by TerraFirmaCraft
-	stick("Sticks/Rods", "", " Rod", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M / 2, 64, 23), // Stick made of half an Ingot. Introduced by Eloraam
-	type2("16x Wires", "16x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 8, 64, -1),
-	
-	 toolSkookumChoocher("Skookum Choocher", "", " Skookum Choocher", true, true, false, false, false, false, true, true, false, false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots.
-
-	
-
-	batterySingleuse("Single Use Batteries", "", "", false, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1),
-	battery("Reusable Batteries", "", "", false, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced by Calclavia
-	circuit("Circuits", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced by Calclavia
-	chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced by Buildcraft
-	computer("Computers", "", "", true, true, false, false, true, false, false, false, false, false, 0, -1, 64, -1); // A whole Computer. "computerMaster" = ComputerCube
-
-	public static volatile int VERSION = 508;
-
-    static {
-    	
-        ingotHot.mHeatDamage = 3.0F;
-        
-    }
-
-	public final ArrayList<ItemStack> mPrefixedItems = new ArrayList<ItemStack>();
-	public final short mTextureIndex;
-	public final String mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost;
-	public final boolean mIsUsedForOreProcessing, mIsEnchantable, mIsUnificatable, mIsMaterialBased, mIsSelfReferencing, mIsContainer, mDontUnificateActively, mIsUsedForBlocks, mAllowNormalRecycling, mGenerateDefaultItem;
-	public final List<TC_AspectStack> mAspects = new ArrayList<TC_AspectStack>();
-	public final Collection<GregtechOrePrefixes> mFamiliarPrefixes = new HashSet<GregtechOrePrefixes>();
-	/**
-	 * Used to determine the amount of Material this Prefix contains.
-	 * Multiply or Divide GregTech_API.MATERIAL_UNIT to get the Amounts in comparision to one Ingot.
-	 * 0 = Null
-	 * Negative = Undefined Amount
+	 * usual Materials for this are: Primitive (Tier 1) Basic (Tier 2) as used
+	 * by UE as well : IC2 Circuit and RE-Battery Good (Tier 3) Advanced (Tier
+	 * 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium
+	 * Battery Data (Tier 5) : Data Storage Circuit Elite (Tier 6) as used by UE
+	 * as well : Energy Crystal and Data Control Circuit Master (Tier 7) :
+	 * Energy Flow Circuit and Lapotron Crystal Ultimate (Tier 8) : Data Orb and
+	 * Lapotronic Energy Orb Infinite (Cheaty)
 	 */
-	public final long mMaterialAmount;
-	private final Collection<Materials> mNotGeneratedItems = new HashSet<Materials>(), mIgnoredMaterials = new HashSet<Materials>(), mGeneratedItems = new HashSet<Materials>();
-	private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessing = new ArrayList<Interface_OreRecipeRegistrator>();
-	private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessingFake = new ArrayList<Interface_OreRecipeRegistrator>();
-	public ItemStack mContainerItem = null;
-	public ICondition<ISubTagContainer> mCondition = null;
-	public byte mDefaultStackSize = 64;
-	public GregtechMaterialStack mSecondaryMaterial = null;
-	public GregtechOrePrefixes mPrefixInto = this;
-	public float mHeatDamage = 0.0F; // Negative for Frost Damage
-	/**
-	 * Yes this Value can be changed to add Bits for the MetaGenerated-Item-Check.
-	 */
-	public int mMaterialGenerationBits = 0;
-	private GregtechOrePrefixes(String aRegularLocalName, String aLocalizedMaterialPre, String aLocalizedMaterialPost, boolean aIsUnificatable, boolean aIsMaterialBased, boolean aIsSelfReferencing, boolean aIsContainer, boolean aDontUnificateActively, boolean aIsUsedForBlocks, boolean aAllowNormalRecycling, boolean aGenerateDefaultItem, boolean aIsEnchantable, boolean aIsUsedForOreProcessing, int aMaterialGenerationBits, long aMaterialAmount, int aDefaultStackSize, int aTextureindex) {
-		mIsUnificatable = aIsUnificatable;
-		mIsMaterialBased = aIsMaterialBased;
-		mIsSelfReferencing = aIsSelfReferencing;
-		mIsContainer = aIsContainer;
-		mDontUnificateActively = aDontUnificateActively;
-		mIsUsedForBlocks = aIsUsedForBlocks;
-		mAllowNormalRecycling = aAllowNormalRecycling;
-		mGenerateDefaultItem = aGenerateDefaultItem;
-		mIsEnchantable = aIsEnchantable;
-		mIsUsedForOreProcessing = aIsUsedForOreProcessing;
-		mMaterialGenerationBits = aMaterialGenerationBits;
-		mMaterialAmount = aMaterialAmount;
-		mRegularLocalName = aRegularLocalName;
-		mLocalizedMaterialPre = aLocalizedMaterialPre;
-		mLocalizedMaterialPost = aLocalizedMaterialPost;
-		mDefaultStackSize = (byte) aDefaultStackSize;
-		mTextureIndex = (short) aTextureindex;
-
-		
-		//TODO - Utilise some form of way to check if it's gt 5.9 if so, use string switch.
-		if (name().startsWith("ore")) {
-			getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("wire") || name().startsWith("cable")) {
-			getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("dust")) {
-			getTcAspectStack(TC_Aspects.PERDITIO.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("crushed")) {
-			getTcAspectStack(TC_Aspects.PERFODIO.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("ingot") || name().startsWith("nugget")) {
-			getTcAspectStack(TC_Aspects.METALLUM.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("armor")) {
-			getTcAspectStack(TC_Aspects.TUTAMEN.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("stone")) {
-			getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("pipe")) {
-			getTcAspectStack(TC_Aspects.ITER.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("gear")) {
-			getTcAspectStack(TC_Aspects.MOTUS.name(), 1).addToAspectList(mAspects);
-			getTcAspectStack(TC_Aspects.MACHINA.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("frame") || name().startsWith("plate")) {
-			getTcAspectStack(TC_Aspects.FABRICO.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("tool")) {
-			getTcAspectStack(TC_Aspects.INSTRUMENTUM.name(), 2).addToAspectList(mAspects);
-		} else if (name().startsWith("gem") || name().startsWith("crystal") || name().startsWith("lens")) {
-			getTcAspectStack(TC_Aspects.VITREUS.name(), 1).addToAspectList(mAspects);
-		} else if (name().startsWith("crate")) {
-			getTcAspectStack(TC_Aspects.ITER.name(), 2).addToAspectList(mAspects);
-		} else if (name().startsWith("circuit")) {		
-			getTcAspectStack("COGNITIO", 1);			
-		} else if (name().startsWith("computer")) {
-				getTcAspectStack("COGNITIO", 4).addToAspectList(mAspects);
-		} else if (name().startsWith("battery")) {
-			getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(mAspects);
-		}
-	}
-
-	public static GregtechOrePrefixes getOrePrefix(String aOre) {
-		for (GregtechOrePrefixes tPrefix : values())
-			if (aOre.startsWith(tPrefix.toString())) {                
-				return tPrefix;
-			}
-		return null;
-	}
-
-	public static String stripPrefix(String aOre) {
-		for (GregtechOrePrefixes tPrefix : values()) {
-			if (aOre.startsWith(tPrefix.toString())) {
-				return aOre.replaceFirst(tPrefix.toString(), "");
-			}
-		}
-		return aOre;
-	}
-
-	public static String replacePrefix(String aOre, GregtechOrePrefixes aPrefix) {
-		for (GregtechOrePrefixes tPrefix : values()) {
-			if (aOre.startsWith(tPrefix.toString())) {
-				return aOre.replaceFirst(tPrefix.toString(), aPrefix.toString());
-			}
-		}
-		return "";
-	}
-
-	public static GregtechOrePrefixes getPrefix(String aPrefixName) {
-		return getPrefix(aPrefixName, null);
-	}
-
-	public static GregtechOrePrefixes getPrefix(String aPrefixName, GregtechOrePrefixes aReplacement) {
-		Object tObject = GT_Utility.getFieldContent(GregtechOrePrefixes.class, aPrefixName, false, false);
-		if (tObject != null && tObject instanceof GregtechOrePrefixes) return (GregtechOrePrefixes) tObject;
-		return aReplacement;
-	}
-
-	public static Materials getMaterial(String aOre) {
-		return Materials.get(stripPrefix(aOre));
-	}
-
-	public static Materials getMaterial(String aOre, GregtechOrePrefixes aPrefix) {
-		return Materials.get(aOre.replaceFirst(aPrefix.toString(), ""));
-	}
-
-	public static Materials getRealMaterial(String aOre, GregtechOrePrefixes aPrefix) {
-		return Materials.getRealMaterial(aOre.replaceFirst(aPrefix.toString(), ""));
-	}
-
-	public static boolean isInstanceOf(String aName, GregtechOrePrefixes aPrefix) {
-		return aName == null ? false : aName.startsWith(aPrefix.toString());
-	}
-
-	public boolean add(ItemStack aStack) {
-		if (aStack == null) return false;
-		if (!contains(aStack)) mPrefixedItems.add(aStack);
-		while (mPrefixedItems.contains(null)) mPrefixedItems.remove(null);
-		return true;
-	}
-
-
-	public boolean contains(ItemStack aStack) {
-		if (aStack == null) return false;
-		for (ItemStack tStack : mPrefixedItems)
-			if (GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) return true;
-		return false;
-	}
-
-	public boolean doGenerateItem(Materials aMaterial) {
-		return aMaterial != null && aMaterial != Materials._NULL && ((aMaterial.mTypes & mMaterialGenerationBits) != 0 || mGeneratedItems.contains(aMaterial)) && !mNotGeneratedItems.contains(aMaterial) && (mCondition == null || mCondition.isTrue(aMaterial));
-	}
-
-	public boolean ignoreMaterials(Materials... aMaterials) {
-		for (Materials tMaterial : aMaterials) if (tMaterial != null) mIgnoredMaterials.add(tMaterial);
-		return true;
-	}
-
-	public boolean isIgnored(GT_Materials aMaterial) {
-		if (aMaterial != null && (!aMaterial.mUnificatable || aMaterial != aMaterial.mMaterialInto)) return true;
-		return mIgnoredMaterials.contains(aMaterial);
-	}
-
-	public boolean addFamiliarPrefix(GregtechOrePrefixes aPrefix) {
-		if (aPrefix == null || mFamiliarPrefixes.contains(aPrefix) || aPrefix == this) return false;
-		return mFamiliarPrefixes.add(aPrefix);
-	}
-
-	public boolean add(Interface_OreRecipeRegistrator aRegistrator) {
-		if (aRegistrator == null) return false;
-		return mOreProcessing.add(aRegistrator);
-	}
-
-	public void processOre(GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
-		if (aMaterial != null && (aMaterial != GT_Materials._NULL || mIsSelfReferencing || !mIsMaterialBased) && GT_Utility.isStackValid(aStack))
-			for (Interface_OreRecipeRegistrator tRegistrator : mOreProcessing) {
-				if (D2)
-					GT_Log.ore.println("Processing '" + aOreDictName + "' with the Prefix '" + name() + "' and the Material '" + aMaterial.name() + "' at " + GT_Utility.getClassName(tRegistrator));
-				tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack));
-			}
-	}
-	
-	//TODO
-	 public void processOre(Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
-	        if (aMaterial != null && (aMaterial != Materials._NULL || mIsSelfReferencing || !mIsMaterialBased) && GT_Utility.isStackValid(aStack))
-	            for (Interface_OreRecipeRegistrator tRegistrator : mOreProcessingFake) {
-	                if (D2)
-	                    GT_Log.ore.println("Processing '" + aOreDictName + "' with the Prefix '" + name() + "' and the Material '" + aMaterial.name() + "' at " + GT_Utility.getClassName(tRegistrator));
-	                tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack));
-	            }
-	    }
-
-	public Object get(Object aMaterial) {
-		if (aMaterial instanceof GT_Materials) return new GregtechItemData(this, (GT_Materials) aMaterial);
-		return name() + aMaterial;
-	}
-
-	public String getDefaultLocalNameForItem(Materials aMaterial) {
-
-
-		// Use Standard Localization
-		return mLocalizedMaterialPre + aMaterial.mDefaultLocalName + mLocalizedMaterialPost;
-	}
+	ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false,
+			GT_Values.B[1], GT_Values.M * 1, 16, 12), // A hot Ingot, which has
+														// to be cooled down by
+														// a Vacuum Freezer.
+	ingot("Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, GT_Values.B[1],
+			GT_Values.M * 1, 64, 11), // A regular Ingot. Introduced by Eloraam
+	dustTiny("Tiny Dusts", "Tiny Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false,
+			GT_Values.B[0] | GT_Values.B[1] | GT_Values.B[2] | GT_Values.B[3], GT_Values.M / 9, 64, 0), // 1/9th
+																										// of
+																										// a
+																										// Dust.
+	dustSmall("Small Dusts", "Small Pile of ", " Dust", true, true, false, false, false, false, false, true, false,
+			false, GT_Values.B[0] | GT_Values.B[1] | GT_Values.B[2] | GT_Values.B[3], GT_Values.M / 4, 64, 1), // 1/4th
+																												// of
+																												// a
+																												// Dust.
+	dustImpure("Impure Dusts", "Impure Pile of ", " Dust", true, true, false, false, false, false, false, true, false,
+			true, GT_Values.B[3], GT_Values.M * 1, 64, 3), // Dust with
+															// impurities. 1
+															// Unit of Main
+															// Material and 1/9
+															// - 1/4 Unit of
+															// secondary
+															// Material
+	dustRefined("Refined Dusts", "Refined Pile of ", " Dust", true, true, false, false, false, false, false, true,
+			false, true, GT_Values.B[3], GT_Values.M * 1, 64, 2), dustPure("Purified Dusts", "Purified Pile of ",
+					" Dust", true, true, false, false, false, false, false, true, false, true, GT_Values.B[3],
+					GT_Values.M * 1, 64,
+					4), dust("Dusts", "", " Dust", true, true, false, false, false, false, false, true, false, false,
+							GT_Values.B[0] | GT_Values.B[1] | GT_Values.B[2] | GT_Values.B[3], GT_Values.M * 1, 64, 2), // Pure
+																														// Dust
+																														// worth
+																														// of
+																														// one
+																														// Ingot
+																														// or
+																														// Gem.
+																														// Introduced
+																														// by
+																														// Alblaka.
+	nugget("Nuggets", "", " Nugget", true, true, false, false, false, false, false, true, false, false, GT_Values.B[1],
+			GT_Values.M / 9, 64, 9), // A Nugget. Introduced by Eloraam
+	plate("Plates", "", " Plate", true, true, false, false, false, false, true, true, false, false,
+			GT_Values.B[1] | GT_Values.B[2], GT_Values.M * 1, 64, 17), // Regular
+																		// Plate
+																		// made
+																		// of
+																		// one
+																		// Ingot/Dust.
+																		// Introduced
+																		// by
+																		// Calclavia
+	block("Storage Blocks", "Block of ", "", true, true, false, false, false, true, true, false, false, false, 0,
+			GT_Values.M * 9, 64, 71), // Storage Block consisting out of 9
+										// Ingots/Gems/Dusts. Introduced by
+										// CovertJaguar
+	gem("Gemstones", "", "", true, true, true, false, false, false, true, true, false, false, GT_Values.B[2],
+			GT_Values.M * 1, 64, 8), // A regular Gem worth one Dust. Introduced
+										// by Eloraam
+	gemChipped("Chipped Gemstones", "Chipped ", "", true, true, true, false, false, false, true, true, false, false,
+			GT_Values.B[2], GT_Values.M / 4, 64, 59), // A regular Gem worth one
+														// small Dust.
+														// Introduced by
+														// TerraFirmaCraft
+	gemFlawed("Flawed Gemstones", "Flawed ", "", true, true, true, false, false, false, true, true, false, false,
+			GT_Values.B[2], GT_Values.M / 2, 64, 60), // A regular Gem worth two
+														// small Dusts.
+														// Introduced by
+														// TerraFirmaCraft
+	gemFlawless("Flawless Gemstones", "Flawless ", "", true, true, true, false, false, false, true, true, false, false,
+			GT_Values.B[2], GT_Values.M * 2, 32, 61), // A regular Gem worth two
+														// Dusts. Introduced by
+														// TerraFirmaCraft
+	gemExquisite("Exquisite Gemstones", "Exquisite ", "", true, true, true, false, false, false, true, true, false,
+			false, GT_Values.B[2], GT_Values.M * 4, 16, 62), // A regular Gem
+																// worth four
+																// Dusts.
+																// Introduced by
+																// TerraFirmaCraft
+	stick("Sticks/Rods", "", " Rod", true, true, false, false, false, false, true, true, false, false,
+			GT_Values.B[1] | GT_Values.B[2], GT_Values.M / 2, 64, 23), // Stick
+																		// made
+																		// of
+																		// half
+																		// an
+																		// Ingot.
+																		// Introduced
+																		// by
+																		// Eloraam
+	type2("16x Wires", "16x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0,
+			GT_Values.M * 8, 64, -1),
+
+	toolSkookumChoocher("Skookum Choocher", "", " Skookum Choocher", true, true, false, false, false, false, true, true,
+			false, false, GT_Values.B[6], GT_Values.M * 6, 16, 37), // consisting
+																	// out of 6
+																	// Ingots.
+
+	batterySingleuse("Single Use Batteries", "", "", false, true, false, false, false, false, false, false, false,
+			false, 0, -1, 64, -1), battery("Reusable Batteries", "", "", false, true, false, false, false, false, false,
+					false, false, false, 0, -1, 64, -1), // Introduced by
+															// Calclavia
+	circuit("Circuits", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced
+																													// by
+																													// Calclavia
+	chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced
+																													// by
+																													// Buildcraft
+	computer("Computers", "", "", true, true, false, false, true, false, false, false, false, false, 0, -1, 64, -1); // A
+																														// whole
+																														// Computer.
+																														// "computerMaster"
+																														// =
+																														// ComputerCube
 
 	public enum GT_Materials implements IColorModulationContainer, ISubTagContainer {
 
-
-
 		/**
-		 * This is the Default Material returned in case no Material has been found or a NullPointer has been inserted at a location where it shouldn't happen.
+		 * This is the Default Material returned in case no Material has been
+		 * found or a NullPointer has been inserted at a location where it
+		 * shouldn't happen.
 		 * <p/>
-		 * Mainly for preventing NullPointer Exceptions and providing Default Values.
+		 * Mainly for preventing NullPointer Exceptions and providing Default
+		 * Values.
 		 *
 		 * Unknown Material Components. Dead End Section.
-		 * 
-		 * Alkalus Range 730-799 & 970-998
-		 * (aMetaItemSubID, TextureSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, R, G, B, Alpha, aLocalName, 
-		 * aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor
-		 *	this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, true);
+		 *
+		 * Alkalus Range 730-799 & 970-998 (aMetaItemSubID, TextureSet,
+		 * aToolSpeed, aToolDurability, aToolQuality, aTypes, R, G, B, Alpha,
+		 * aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp,
+		 * aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier,
+		 * aDensityDivider, aColor this(aMetaItemSubID, aIconSet, aToolSpeed,
+		 * aToolDurability, aToolQuality, true);
 		 *
 		 */
-		_NULL(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "NULL", 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, Element._NULL, Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS.name(), 1))),
-
-
-		//Lapis(526, TextureSet.SET_LAPIS, 1.0F, 0, 1, 1 | 4 | 8, 70, 70, 220, 0, "Lapis", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlue, 2, Arrays.asList(new MaterialStack(Materials.Lazurite, 12), new MaterialStack(Materials.Sodalite, 2), new MaterialStack(Materials.Pyrite, 1), new MaterialStack(Materials.Calcite, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.SENSUS, 1))),
-		Pyrotheum(20, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 255, 128, 0, 0, "Pyrotheum", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeYellow, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1)), Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TC_Aspects.IGNIS, 1))),
-		Cryotheum(21, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 102, 178, 255, 0, "Cryotheum", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Blizz, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Snow, 1), new MaterialStack(Materials.Niter, 1)), Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TC_Aspects.GELUM, 1))),
+		_NULL(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "NULL", 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, Element._NULL, Arrays.asList(Utils.getTcAspectStack(TC_Aspects.VACUOS.name(), 1))),
+
+		// Lapis(526, TextureSet.SET_LAPIS, 1.0F, 0, 1, 1 | 4 | 8, 70, 70, 220,
+		// 0, "Lapis", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlue, 2,
+		// Arrays.asList(new MaterialStack(Materials.Lazurite, 12), new
+		// MaterialStack(Materials.Sodalite, 2), new
+		// MaterialStack(Materials.Pyrite, 1), new
+		// MaterialStack(Materials.Calcite, 1)),
+		// Arrays.asList(getTcAspectStack(TC_Aspects.SENSUS, 1))),
+		Pyrotheum(20, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 255, 128, 0, 0, "Pyrotheum", 0, 0, -1, 0, false,
+				false, 2, 3, 1, Dyes.dyeYellow, 2,
+				Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1),
+						new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1)),
+				Arrays.asList(Utils.getTcAspectStack("PRAECANTATIO", 2),
+						Utils.getTcAspectStack(TC_Aspects.IGNIS, 1))), Cryotheum(21, TextureSet.SET_FLUID, 1.0F, 0, 1,
+								2 | 16 | 32, 102, 178, 255, 0, "Cryotheum", 0, 0, -1, 0, false, false, 2, 3, 1,
+								Dyes.dyeLightBlue, 2,
+								Arrays.asList(new MaterialStack(Materials.Blizz, 1),
+										new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Snow, 1),
+										new MaterialStack(Materials.Niter, 1)),
+								Arrays.asList(Utils.getTcAspectStack("PRAECANTATIO", 2),
+										Utils.getTcAspectStack(TC_Aspects.GELUM, 1))),
 
 		/**
 		 * Circuitry, Batteries and other Technical things
 		 */
-		Symbiotic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "IV Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 4), getTcAspectStack(TC_Aspects.MACHINA, 4))),
-		Neutronic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "LuV Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 6), getTcAspectStack(TC_Aspects.MACHINA, 6))),
-		Quantum(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "ZPM Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8), getTcAspectStack(TC_Aspects.MACHINA, 8))),
-
-		Superconductor(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 190, 240, 190, 0, "Superconductor", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGreen, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8))),
-		
-		Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2  | 16 | 32 | 64 | 128, 68, 75, 66, 0, "Staballoy", 0, 0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Titanium, 1), new MaterialStack(Materials.Uranium, 9)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
-		Bedrockium(31, TextureSet.SET_FINE, 8.0F, 8196, 3, 1 | 2 | 16 | 32 | 64 | 128, 39, 39, 39, 0, "Bedrockium", 0, 0, -1, 0, false, false, 1, 5, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Carbon, 63), new MaterialStack(Materials.Carbon, 56)),   Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS, 8), getTcAspectStack(TC_Aspects.TUTAMEN, 3))),
-		BloodSteel(32, TextureSet.SET_METALLIC, 11.0F, 768, 4, 1 | 2 | 16 | 32 | 64 | 128, 142, 28, 0, 0, "Blood Steel", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Steel, 3)), Arrays.asList(getTcAspectStack(TC_Aspects.VICTUS, 8), getTcAspectStack(TC_Aspects.IGNIS, 3))),
-		Void(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack, Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TC_Aspects.VACUOS, 7))),
-		ConductiveIron(34, TextureSet.SET_METALLIC, 5.0F, 256, 2, 1 | 2, 164, 109, 100, 0, "Conductive Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 6), new MaterialStack(Materials.Redstone, 2)), Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 2), getTcAspectStack(TC_Aspects.METALLUM, 2))),
-		ElectricalSteel(35, TextureSet.SET_METALLIC, 7.0F, 768, 3, 1 | 2 | 64 | 128, 194, 194, 194, 0, "Electrical Steel", 0, 0, 1811, 1000, true, false, 3, 1, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Iron, 3), new MaterialStack(Materials.Coal, 2), new MaterialStack(Materials.Silicon, 2)),   Arrays.asList(getTcAspectStack(TC_Aspects.MAGNETO, 2), getTcAspectStack(TC_Aspects.ELECTRUM, 5))),
-		EnergeticAlloy(36, TextureSet.SET_SHINY, 5.0F, 512, 3, 1 | 2 | 64 | 128, 252, 152, 45, 0, "Energetic Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange, 2, Arrays.asList(new MaterialStack(Materials.Gold, 3), new MaterialStack(Materials.Glowstone, 2), new MaterialStack(Materials.Redstone, 2)),  Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 4), getTcAspectStack(TC_Aspects.LUX, 3))),
-		VibrantAlloy(37, TextureSet.SET_SHINY, 7.0F, 1280, 4, 1 | 2 | 64 | 128, 204, 242, 142, 0, "Vibrant Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeLime, 2, Arrays.asList(new MaterialStack(Materials.EnergeticAlloy, 1), new MaterialStack(Materials.EnderPearl, 3)), Arrays.asList(getTcAspectStack(TC_Aspects.MACHINA, 5), getTcAspectStack(TC_Aspects.TELUM, 4))),
-		PulsatingIron(38, TextureSet.SET_SHINY, 5.0F, 256, 2, 1 | 2 | 64 | 128, 50, 91, 21, 0, "Pulsating Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.EnderPearl, 2)), Arrays.asList(getTcAspectStack(TC_Aspects.ALIENIS, 3), getTcAspectStack(TC_Aspects.METALLUM, 3))),
-		/* TODO*/ RedstoneAlloy(39, TextureSet.SET_METALLIC, 1.0F, 256, 2, 1|2|16|32|64, 178,34,34, 0, "Redstone Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.Redstone, 4))),
-
-		//Needs more Use, I think. 
-		Tantalloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 166, 0, "Tantalloy-60", 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
-		Tantalloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 122, 135, 196, 0, "Tantalloy-61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
-
-		Potin(42, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 201,151,129, 0, "Potin", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
-		Inconel792(43, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 108, 240, 118, 0, "Inconel-792", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
-		Inconel690(44, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 118, 220, 138, 0, "Inconel-690", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
-		MaragingSteel300(45, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 150, 150, 150, 0, "Maraging Steel 300", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
-		MaragingSteel350(46, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 160, 160, 160, 0, "Maraging Steel 350", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
-		HastelloyX(47, TextureSet.SET_SHINY, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 255, 193, 37, 0, "Hastelloy-X", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
-
-
-		
-		//Radioactive Materials
-		HydrofluoricAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 200, 200, 200, 0, "Hydrofluoric Acid", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))),
-		UraniumHexaFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium Hexafluoride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLime, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))),
-		UraniumTetraFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium Tetrafluoride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLime, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))),
-		ThoriumTetraFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 15, 120, 15, 0, "Thorium Tetrafluoride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), 
-		
-		SulfurousAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 110, 220, 30, 0, "Sulfurous Acid", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))),
-		SulfurDioxide(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 150, 200, 50, 0, "Sulfur Dioxide", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))),
-		HydrogenChloride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 150, 240, 90, 0, "Hydrogen Chloride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))),
-		SulfuricApatite(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Sulfuric Apatite Solution", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), 
-		
-		SulfuricLithium(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Sulfuric Lithium Solution", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), 
-		LithiumHydroxide(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Lithium Hydroxide", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), 
-		 
+		Symbiotic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "IV Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(Utils.getTcAspectStack(TC_Aspects.ELECTRUM, 4), Utils.getTcAspectStack(TC_Aspects.MACHINA, 4))), Neutronic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "LuV Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(Utils.getTcAspectStack(TC_Aspects.ELECTRUM, 6), Utils.getTcAspectStack(TC_Aspects.MACHINA, 6))), Quantum(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "ZPM Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(Utils.getTcAspectStack(TC_Aspects.ELECTRUM, 8), Utils.getTcAspectStack(TC_Aspects.MACHINA, 8))),
+
+		Superconductor(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 190, 240, 190, 0, "Superconductor", 0, 0, -1, 0, false,
+				false, 1, 1, 1, Dyes.dyeGreen, Arrays.asList(Utils.getTcAspectStack(TC_Aspects.ELECTRUM, 8))),
+
+		Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 66, 0, "Staballoy", 0,
+				0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2,
+				Arrays.asList(new MaterialStack(Materials.Titanium, 1), new MaterialStack(Materials.Uranium, 9)),
+				Arrays.asList(Utils.getTcAspectStack(TC_Aspects.METALLUM, 8),
+						Utils.getTcAspectStack(TC_Aspects.STRONTIO, 3))), Bedrockium(31, TextureSet.SET_FINE, 8.0F,
+								8196, 3, 1 | 2 | 16 | 32 | 64 | 128, 39, 39, 39, 0, "Bedrockium", 0, 0, -1, 0, false,
+								false, 1, 5, 1, Dyes.dyeLightGray, 2,
+								Arrays.asList(new MaterialStack(Materials.Carbon, 63),
+										new MaterialStack(Materials.Carbon, 56)),
+								Arrays.asList(Utils.getTcAspectStack(TC_Aspects.VACUOS, 8),
+										Utils.getTcAspectStack(TC_Aspects.TUTAMEN, 3))), BloodSteel(32,
+												TextureSet.SET_METALLIC, 11.0F, 768, 4, 1 | 2 | 16 | 32 | 64 | 128, 142,
+												28, 0, 0, "Blood Steel", 0, 0, -1, 0, false, false, 1, 1, 1,
+												Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Steel, 3)),
+												Arrays.asList(Utils.getTcAspectStack(TC_Aspects.VICTUS, 8),
+														Utils.getTcAspectStack(TC_Aspects.IGNIS, 3))), Void(33,
+																TextureSet.SET_METALLIC, 6.0F, 1280, 3,
+																1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal",
+																0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack,
+																Arrays.asList(Utils.getTcAspectStack("PRAECANTATIO", 5),
+																		Utils.getTcAspectStack(TC_Aspects.VACUOS,
+																				7))), ConductiveIron(34,
+																						TextureSet.SET_METALLIC, 5.0F,
+																						256, 2, 1 | 2, 164, 109, 100, 0,
+																						"Conductive Iron", 0, 0, -1, 0,
+																						false, false, 3, 1, 1,
+																						Dyes.dyeRed, 2,
+																						Arrays.asList(new MaterialStack(
+																								Materials.Iron, 6),
+																								new MaterialStack(
+																										Materials.Redstone,
+																										2)),
+																						Arrays.asList(
+																								Utils.getTcAspectStack(
+																										TC_Aspects.POTENTIA,
+																										2),
+																								Utils.getTcAspectStack(
+																										TC_Aspects.METALLUM,
+																										2))), ElectricalSteel(
+																												35,
+																												TextureSet.SET_METALLIC,
+																												7.0F,
+																												768, 3,
+																												1 | 2 | 64
+																														| 128,
+																												194,
+																												194,
+																												194, 0,
+																												"Electrical Steel",
+																												0, 0,
+																												1811,
+																												1000,
+																												true,
+																												false,
+																												3, 1, 1,
+																												Dyes.dyeLightGray,
+																												2,
+																												Arrays.asList(
+																														new MaterialStack(
+																																Materials.Iron,
+																																3),
+																														new MaterialStack(
+																																Materials.Coal,
+																																2),
+																														new MaterialStack(
+																																Materials.Silicon,
+																																2)),
+																												Arrays.asList(
+																														Utils.getTcAspectStack(
+																																TC_Aspects.MAGNETO,
+																																2),
+																														Utils.getTcAspectStack(
+																																TC_Aspects.ELECTRUM,
+																																5))), EnergeticAlloy(
+																																		36,
+																																		TextureSet.SET_SHINY,
+																																		5.0F,
+																																		512,
+																																		3,
+																																		1 | 2 | 64
+																																				| 128,
+																																		252,
+																																		152,
+																																		45,
+																																		0,
+																																		"Energetic Alloy",
+																																		0,
+																																		0,
+																																		-1,
+																																		0,
+																																		false,
+																																		false,
+																																		3,
+																																		1,
+																																		1,
+																																		Dyes.dyeOrange,
+																																		2,
+																																		Arrays.asList(
+																																				new MaterialStack(
+																																						Materials.Gold,
+																																						3),
+																																				new MaterialStack(
+																																						Materials.Glowstone,
+																																						2),
+																																				new MaterialStack(
+																																						Materials.Redstone,
+																																						2)),
+																																		Arrays.asList(
+																																				Utils.getTcAspectStack(
+																																						TC_Aspects.POTENTIA,
+																																						4),
+																																				Utils.getTcAspectStack(
+																																						TC_Aspects.LUX,
+																																						3))), VibrantAlloy(
+																																								37,
+																																								TextureSet.SET_SHINY,
+																																								7.0F,
+																																								1280,
+																																								4,
+																																								1 | 2 | 64
+																																										| 128,
+																																								204,
+																																								242,
+																																								142,
+																																								0,
+																																								"Vibrant Alloy",
+																																								0,
+																																								0,
+																																								-1,
+																																								0,
+																																								false,
+																																								false,
+																																								3,
+																																								1,
+																																								1,
+																																								Dyes.dyeLime,
+																																								2,
+																																								Arrays.asList(
+																																										new MaterialStack(
+																																												Materials.EnergeticAlloy,
+																																												1),
+																																										new MaterialStack(
+																																												Materials.EnderPearl,
+																																												3)),
+																																								Arrays.asList(
+																																										Utils.getTcAspectStack(
+																																												TC_Aspects.MACHINA,
+																																												5),
+																																										Utils.getTcAspectStack(
+																																												TC_Aspects.TELUM,
+																																												4))), PulsatingIron(
+																																														38,
+																																														TextureSet.SET_SHINY,
+																																														5.0F,
+																																														256,
+																																														2,
+																																														1 | 2 | 64
+																																																| 128,
+																																														50,
+																																														91,
+																																														21,
+																																														0,
+																																														"Pulsating Iron",
+																																														0,
+																																														0,
+																																														-1,
+																																														0,
+																																														false,
+																																														false,
+																																														3,
+																																														1,
+																																														1,
+																																														Dyes.dyeGreen,
+																																														2,
+																																														Arrays.asList(
+																																																new MaterialStack(
+																																																		Materials.Iron,
+																																																		2),
+																																																new MaterialStack(
+																																																		Materials.EnderPearl,
+																																																		2)),
+																																														Arrays.asList(
+																																																Utils.getTcAspectStack(
+																																																		TC_Aspects.ALIENIS,
+																																																		3),
+																																																Utils.getTcAspectStack(
+																																																		TC_Aspects.METALLUM,
+																																																		3))), /* TODO */ RedstoneAlloy(
+																																																				39,
+																																																				TextureSet.SET_METALLIC,
+																																																				1.0F,
+																																																				256,
+																																																				2,
+																																																				1 | 2 | 16
+																																																						| 32
+																																																						| 64,
+																																																				178,
+																																																				34,
+																																																				34,
+																																																				0,
+																																																				"Redstone Alloy",
+																																																				0,
+																																																				0,
+																																																				-1,
+																																																				0,
+																																																				false,
+																																																				false,
+																																																				3,
+																																																				1,
+																																																				1,
+																																																				Dyes.dyeRed,
+																																																				2,
+																																																				Arrays.asList(
+																																																						new MaterialStack(
+																																																								Materials.Iron,
+																																																								2),
+																																																						new MaterialStack(
+																																																								Materials.Redstone,
+																																																								4))),
+
+		// Needs more Use, I think.
+		Tantalloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 166, 0, "Tantalloy-60",
+				0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
+				Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)),
+				Arrays.asList(Utils.getTcAspectStack(TC_Aspects.METALLUM, 8),
+						Utils.getTcAspectStack(TC_Aspects.STRONTIO, 3))), Tantalloy61(41, TextureSet.SET_DULL, 7.0F,
+								5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 122, 135, 196, 0, "Tantalloy-61", 0, 0, 3015, 2150,
+								true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
+								Arrays.asList(new MaterialStack(Materials.Tungsten, 1),
+										new MaterialStack(Materials.Tantalum, 9),
+										new MaterialStack(Materials.Titanium, 1)),
+								Arrays.asList(Utils.getTcAspectStack(TC_Aspects.METALLUM, 8),
+										Utils.getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+
+		Potin(42, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 201, 151, 129, 0, "Potin", 0, 0,
+				3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
+				Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9),
+						new MaterialStack(Materials.Titanium, 1)),
+				Arrays.asList(Utils.getTcAspectStack(TC_Aspects.METALLUM, 8),
+						Utils.getTcAspectStack(TC_Aspects.STRONTIO, 3))), Inconel792(43, TextureSet.SET_METALLIC, 7.0F,
+								5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 108, 240, 118, 0, "Inconel-792", 0, 0, 3015, 2150,
+								true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
+								Arrays.asList(new MaterialStack(Materials.Tungsten, 1),
+										new MaterialStack(Materials.Tantalum, 9),
+										new MaterialStack(Materials.Titanium, 1)),
+								Arrays.asList(Utils.getTcAspectStack(TC_Aspects.METALLUM, 8),
+										Utils.getTcAspectStack(TC_Aspects.STRONTIO, 3))), Inconel690(44,
+												TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 118,
+												220, 138, 0, "Inconel-690", 0, 0, 3015, 2150, true, false, 1, 2, 1,
+												Dyes.dyeLightBlue, 2,
+												Arrays.asList(new MaterialStack(Materials.Tungsten, 1),
+														new MaterialStack(Materials.Tantalum, 9),
+														new MaterialStack(Materials.Titanium, 1)),
+												Arrays.asList(Utils.getTcAspectStack(TC_Aspects.METALLUM, 8), Utils
+														.getTcAspectStack(TC_Aspects.STRONTIO, 3))), MaragingSteel300(
+																45, TextureSet.SET_METALLIC, 7.0F, 5120, 2,
+																1 | 2 | 16 | 32 | 64 | 128, 150, 150, 150, 0,
+																"Maraging Steel 300", 0, 0, 3015, 2150, true, false, 1,
+																2, 1, Dyes.dyeLightBlue, 2,
+																Arrays.asList(new MaterialStack(Materials.Tungsten, 1),
+																		new MaterialStack(Materials.Tantalum, 9),
+																		new MaterialStack(Materials.Titanium, 1)),
+																Arrays.asList(
+																		Utils.getTcAspectStack(TC_Aspects.METALLUM, 8),
+																		Utils.getTcAspectStack(TC_Aspects.STRONTIO,
+																				3))), MaragingSteel350(46,
+																						TextureSet.SET_METALLIC, 7.0F,
+																						5120, 2,
+																						1 | 2 | 16 | 32 | 64 | 128, 160,
+																						160, 160, 0,
+																						"Maraging Steel 350", 0, 0,
+																						3015, 2150, true, false, 1, 2,
+																						1, Dyes.dyeLightBlue, 2,
+																						Arrays.asList(new MaterialStack(
+																								Materials.Tungsten, 1),
+																								new MaterialStack(
+																										Materials.Tantalum,
+																										9),
+																								new MaterialStack(
+																										Materials.Titanium,
+																										1)),
+																						Arrays.asList(
+																								Utils.getTcAspectStack(
+																										TC_Aspects.METALLUM,
+																										8),
+																								Utils.getTcAspectStack(
+																										TC_Aspects.STRONTIO,
+																										3))), HastelloyX(
+																												47,
+																												TextureSet.SET_SHINY,
+																												7.0F,
+																												5120, 2,
+																												1 | 2 | 16
+																														| 32
+																														| 64
+																														| 128,
+																												255,
+																												193, 37,
+																												0,
+																												"Hastelloy-X",
+																												0, 0,
+																												3015,
+																												2150,
+																												true,
+																												false,
+																												1, 2, 1,
+																												Dyes.dyeLightBlue,
+																												2,
+																												Arrays.asList(
+																														new MaterialStack(
+																																Materials.Tungsten,
+																																1),
+																														new MaterialStack(
+																																Materials.Tantalum,
+																																9),
+																														new MaterialStack(
+																																Materials.Titanium,
+																																1)),
+																												Arrays.asList(
+																														Utils.getTcAspectStack(
+																																TC_Aspects.METALLUM,
+																																8),
+																														Utils.getTcAspectStack(
+																																TC_Aspects.STRONTIO,
+																																3))),
+
+		// Radioactive Materials
+		HydrofluoricAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 200, 200, 200, 0, "Hydrofluoric Acid", 0, 0,
+				-1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2,
+				Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1),
+						new MaterialStack(Materials.Blaze, 1),
+						new MaterialStack(Materials.Sulfur, 1))), UraniumHexaFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0,
+								1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium Hexafluoride", 0, 0, -1, 0, false, false, 2, 3,
+								1, Dyes.dyeLime, 2,
+								Arrays.asList(new MaterialStack(Materials.Coal, 1),
+										new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1),
+										new MaterialStack(Materials.Sulfur, 1))), UraniumTetraFluoride(-1,
+												TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0,
+												"Uranium Tetrafluoride", 0, 0, -1, 0, false, false, 2, 3, 1,
+												Dyes.dyeLime, 2,
+												Arrays.asList(new MaterialStack(Materials.Coal, 1),
+														new MaterialStack(Materials.Redstone, 1),
+														new MaterialStack(Materials.Blaze, 1),
+														new MaterialStack(Materials.Sulfur, 1))), ThoriumTetraFluoride(
+																-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 15,
+																120, 15, 0, "Thorium Tetrafluoride", 0, 0, -1, 0, false,
+																false, 2, 3, 1, Dyes.dyeGreen, 2,
+																Arrays.asList(new MaterialStack(Materials.Coal, 1),
+																		new MaterialStack(Materials.Redstone, 1),
+																		new MaterialStack(Materials.Blaze, 1),
+																		new MaterialStack(Materials.Sulfur, 1))),
+
+		SulfurousAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 110, 220, 30, 0, "Sulfurous Acid", 0, 0, -1, 0,
+				false, false, 2, 3, 1, Dyes.dyeWhite, 2,
+				Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1),
+						new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), SulfurDioxide(
+								-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 150, 200, 50, 0, "Sulfur Dioxide", 0,
+								0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2,
+								Arrays.asList(new MaterialStack(Materials.Coal, 1),
+										new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1),
+										new MaterialStack(Materials.Sulfur, 1))), HydrogenChloride(-1,
+												TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 150, 240, 90, 0,
+												"Hydrogen Chloride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite,
+												2,
+												Arrays.asList(new MaterialStack(Materials.Coal, 1),
+														new MaterialStack(Materials.Redstone, 1),
+														new MaterialStack(Materials.Blaze, 1),
+														new MaterialStack(Materials.Sulfur, 1))), SulfuricApatite(-1,
+																TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105,
+																105, 0, "Sulfuric Apatite Solution", 0, 0, -1, 0, false,
+																false, 2, 3, 1, Dyes.dyeWhite, 2,
+																Arrays.asList(new MaterialStack(Materials.Coal, 1),
+																		new MaterialStack(Materials.Redstone, 1),
+																		new MaterialStack(Materials.Blaze, 1),
+																		new MaterialStack(Materials.Sulfur, 1))),
+
+		SulfuricLithium(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Sulfuric Lithium Solution",
+				0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2,
+				Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1),
+						new MaterialStack(Materials.Blaze, 1),
+						new MaterialStack(Materials.Sulfur, 1))), LithiumHydroxide(-1, TextureSet.SET_FLUID, 1.0F, 0, 1,
+								2 | 16 | 32, 0, 105, 105, 0, "Lithium Hydroxide", 0, 0, -1, 0, false, false, 2, 3, 1,
+								Dyes.dyeWhite, 2,
+								Arrays.asList(new MaterialStack(Materials.Coal, 1),
+										new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1),
+										new MaterialStack(Materials.Sulfur, 1))),
+
 		;
-		
-		
-		
-		
+
 		/**
 		 * List of all Materials.
 		 */
-		public static final Collection<GT_Materials> VALUES = new HashSet<GT_Materials>(Arrays.asList(values()));
-
+		public static final Collection<GT_Materials> VALUES = new HashSet<GT_Materials>(
+				Arrays.asList(GT_Materials.values()));
 
 		static {
-			/*Primitive.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
-    		Basic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
-    		Good.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
-    		Advanced.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
-    		Data.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
-    		Elite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
-    		Master.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
-    		Ultimate.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
-    		Superconductor.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
-    		Infinite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);*/
+			/*
+			 * Primitive.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+			 * Basic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+			 * Good.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+			 * Advanced.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+			 * Data.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+			 * Elite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+			 * Master.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+			 * Ultimate.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+			 * Superconductor.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+			 * Infinite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+			 */
 			Symbiotic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
 			Neutronic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
 			Quantum.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
 		}
 
-
+		public static volatile int VERSION = 508;
+		public static GT_Materials get(final String aMaterialName) {
+			final Object tObject = GT_Utility.getFieldContent(GT_Materials.class, aMaterialName, false, false);
+			if (tObject != null && tObject instanceof Materials) {
+				return (GT_Materials) tObject;
+			}
+			return _NULL;
+		}
+		public static GT_Materials getRealMaterial(final String aMaterialName) {
+			return GT_Materials.get(aMaterialName).mMaterialInto;
+		}
 		/**
-		 * This Array can be changed dynamically by a Tick Handler in order to get a glowing Effect on all GT Meta Items out of this Material.
+		 * Called in preInit with the Config to set Values.
+		 *
+		 * @param aConfiguration
 		 */
-		public final short[] mRGBa = new short[]{255, 255, 255, 0}, mMoltenRGBa = new short[]{255, 255, 255, 0};
-		public final TextureSet mIconSet;
-		public final int mMetaItemSubID;
-		public final boolean mUnificatable;
-		public final GT_Materials mMaterialInto;
-		public final List<MaterialStack> mMaterialList = new ArrayList<MaterialStack>();
-		public final List<GT_Materials> mOreByProducts = new ArrayList<GT_Materials>(), mOreReRegistrations = new ArrayList<GT_Materials>();
-		public final List<TC_AspectStack> mAspects = new ArrayList<TC_AspectStack>();
-		private final ArrayList<ItemStack> mMaterialItems = new ArrayList<ItemStack>();
-		private final Collection<SubTag> mSubTags = new HashSet<SubTag>();
-		public Enchantment mEnchantmentTools = null, mEnchantmentArmors = null;
-		public byte mEnchantmentToolsLevel = 0, mEnchantmentArmorsLevel = 0;
-		public boolean mBlastFurnaceRequired = false;
-		public float mToolSpeed = 1.0F, mHeatDamage = 0.0F;
-		public String mChemicalFormula = "?", mDefaultLocalName = "null";
-		public Dyes mColor = Dyes._NULL;
-		public short mMeltingPoint = 0, mBlastFurnaceTemp = 0;
-		public int mTypes = 0, mDurability = 16, mFuelPower = 0, mFuelType = 0, mExtraData = 0, mOreValue = 0, mOreMultiplier = 1, mByProductMultiplier = 1, mSmeltingMultiplier = 1;
-		public long mDensity = M;
-		public Element mElement = null;
-		public GT_Materials mDirectSmelting = this, mOreReplacement = this, mMacerateInto = this, mSmeltInto = this, mArcSmeltInto = this, mHandleMaterial = this;
-		public byte mToolQuality = 0;
-		public Fluid mSolid = null, mFluid = null, mGas = null, mPlasma = null;
+		public static void init(final GT_Config aConfiguration) {
+			for (final GT_Materials tMaterial : GT_Materials.VALUES) {
+				final String tString = tMaterial.toString().toLowerCase();
+				tMaterial.mHeatDamage = (float) aConfiguration.get(ConfigCategories.Materials.heatdamage, tString,
+						tMaterial.mHeatDamage);
+				if (tMaterial.mBlastFurnaceRequired) {
+					tMaterial.mBlastFurnaceRequired = aConfiguration
+							.get(ConfigCategories.Materials.blastfurnacerequirements, tString, true);
+				}
+				if (tMaterial.mBlastFurnaceRequired
+						&& aConfiguration.get(ConfigCategories.Materials.blastinductionsmelter, tString,
+								tMaterial.mBlastFurnaceTemp < 1500)) {
+				}
+				// GT_ModHandler.ThermalExpansion.addSmelterBlastOre(tMaterial);
+				// tMaterial.mHandleMaterial = (tMaterial == Desh ?
+				// tMaterial.mHandleMaterial : tMaterial == Diamond || tMaterial
+				// == Thaumium ? Wood : tMaterial.contains(SubTag.BURNING) ?
+				// Blaze : tMaterial.contains(SubTag.MAGICAL) &&
+				// tMaterial.contains(SubTag.CRYSTAL) &&
+				// Loader.isModLoaded(MOD_ID_TC) ? Thaumium :
+				// tMaterial.getMass() > Element.Tc.getMass() * 2 ?
+				// TungstenSteel : tMaterial.getMass() > Element.Tc.getMass() ?
+				// Steel : Wood);
+			}
+		}
 		/**
-		 * This Fluid is used as standard Unit for Molten Materials. 1296 is a Molten Block, what means 144 is one Material Unit worth
+		 * This Array can be changed dynamically by a Tick Handler in order to
+		 * get a glowing Effect on all GT Meta Items out of this Material.
 		 */
-		public Fluid mStandardMoltenFluid = null;
-
-		private GT_Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aToolDurability, int aToolQuality, boolean aUnificatable) {
-			mUnificatable = aUnificatable;
-			mMaterialInto = this;
-			mMetaItemSubID = aMetaItemSubID;
-			mToolQuality = (byte) aToolQuality;
-			mDurability = aToolDurability;
-			mToolSpeed = aToolSpeed;
-			mIconSet = aIconSet;
+		public final short[]				mRGBa					= new short[] {
+				255, 255, 255, 0
+		}, mMoltenRGBa = new short[] {
+				255, 255, 255, 0
+		};
+		public final TextureSet				mIconSet;
+		public final int					mMetaItemSubID;
+		public final boolean				mUnificatable;
+		public final GT_Materials			mMaterialInto;
+		public final List<MaterialStack>	mMaterialList			= new ArrayList<MaterialStack>();
+		public final List<GT_Materials>		mOreByProducts			= new ArrayList<GT_Materials>(),
+				mOreReRegistrations = new ArrayList<GT_Materials>();
+		public final List<TC_AspectStack>	mAspects				= new ArrayList<TC_AspectStack>();
+		private final ArrayList<ItemStack>	mMaterialItems			= new ArrayList<ItemStack>();
+		private final Collection<SubTag>	mSubTags				= new HashSet<SubTag>();
+		public Enchantment					mEnchantmentTools		= null, mEnchantmentArmors = null;
+		public byte							mEnchantmentToolsLevel	= 0, mEnchantmentArmorsLevel = 0;
+		public boolean						mBlastFurnaceRequired	= false;
+		public float						mToolSpeed				= 1.0F, mHeatDamage = 0.0F;
+		public String						mChemicalFormula		= "?", mDefaultLocalName = "null";
+		public Dyes							mColor					= Dyes._NULL;
+		public short						mMeltingPoint			= 0, mBlastFurnaceTemp = 0;
+		public int							mTypes					= 0, mDurability = 16, mFuelPower = 0,
+				mFuelType = 0, mExtraData = 0, mOreValue = 0, mOreMultiplier = 1, mByProductMultiplier = 1,
+				mSmeltingMultiplier = 1;
+		public long							mDensity				= GT_Values.M;
+		public Element						mElement				= null;
+
+		public GT_Materials					mDirectSmelting			= this, mOreReplacement = this,
+				mMacerateInto = this, mSmeltInto = this, mArcSmeltInto = this, mHandleMaterial = this;
+
+		public byte							mToolQuality			= 0;
+
+		public Fluid						mSolid					= null, mFluid = null, mGas = null, mPlasma = null;
+
+		/**
+		 * This Fluid is used as standard Unit for Molten Materials. 1296 is a
+		 * Molten Block, what means 144 is one Material Unit worth
+		 */
+		public Fluid						mStandardMoltenFluid	= null;
+
+		private GT_Materials(final GT_Materials aMaterialInto, final boolean aReRegisterIntoThis) {
+			this.mUnificatable = false;
+			this.mDefaultLocalName = aMaterialInto.mDefaultLocalName;
+			this.mMaterialInto = aMaterialInto.mMaterialInto;
+			if (aReRegisterIntoThis) {
+				this.mMaterialInto.mOreReRegistrations.add(this);
+			}
+			this.mChemicalFormula = aMaterialInto.mChemicalFormula;
+			this.mMetaItemSubID = -1;
+			this.mIconSet = TextureSet.SET_NONE;
+		}
+
+		private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+				final int aToolDurability, final int aToolQuality, final boolean aUnificatable) {
+			this.mUnificatable = aUnificatable;
+			this.mMaterialInto = this;
+			this.mMetaItemSubID = aMetaItemSubID;
+			this.mToolQuality = (byte) aToolQuality;
+			this.mDurability = aToolDurability;
+			this.mToolSpeed = aToolSpeed;
+			this.mIconSet = aIconSet;
 			if (aMetaItemSubID >= 0) {
 				if (CORE.sMU_GeneratedMaterials[aMetaItemSubID] == null) {
 					CORE.sMU_GeneratedMaterials[aMetaItemSubID] = this;
-				} else {
+				}
+				else {
 					throw new IllegalArgumentException("The Index " + aMetaItemSubID + " is already used!");
 				}
 			}
 		}
 
-		private GT_Materials(GT_Materials aMaterialInto, boolean aReRegisterIntoThis) {
-			mUnificatable = false;
-			mDefaultLocalName = aMaterialInto.mDefaultLocalName;
-			mMaterialInto = aMaterialInto.mMaterialInto;
-			if (aReRegisterIntoThis) mMaterialInto.mOreReRegistrations.add(this);
-			mChemicalFormula = aMaterialInto.mChemicalFormula;
-			mMetaItemSubID = -1;
-			mIconSet = TextureSet.SET_NONE;
-		}
-
 		/**
-		 * @param aMetaItemSubID        the Sub-ID used in my own MetaItems. Range 0-1000. -1 for no Material
-		 * @param aTypes                which kind of Items should be generated. Bitmask as follows:
-		 *                              1 = Dusts of all kinds.
-		 *                              2 = Dusts, Ingots, Plates, Rods/Sticks, Machine Components and other Metal specific things.
-		 *                              4 = Dusts, Gems, Plates, Lenses (if transparent).
-		 *                              8 = Dusts, Impure Dusts, crushed Ores, purified Ores, centrifuged Ores etc.
-		 *                              16 = Cells
-		 *                              32 = Plasma Cells
-		 *                              64 = Tool Heads
-		 *                              128 = Gears
-		 * @param aR,                   aG, aB Color of the Material 0-255 each.
-		 * @param aA                    transparency of the Material Texture. 0 = fully visible, 255 = Invisible.
-		 * @param aLocalName            The Name used as Default for localization.
-		 * @param aFuelType             Type of Generator to get Energy from this Material.
-		 * @param aFuelPower            EU generated. Will be multiplied by 1000, also additionally multiplied by 2 for Gems.
-		 * @param aAmplificationValue   Amount of UUM amplifier gotten from this.
-		 * @param aUUMEnergy            Amount of EU needed to shape the UUM into this Material.
-		 * @param aMeltingPoint         Used to determine the smelting Costs in Furnii.
-		 * @param aBlastFurnaceTemp     Used to determine the needed Heat capactiy Costs in Blast Furnii.
-		 * @param aBlastFurnaceRequired If this requires a Blast Furnace.
-		 * @param aColor                Vanilla MC Wool Color which comes the closest to this.
+		 * @param aMetaItemSubID
+		 *            the Sub-ID used in my own MetaItems. Range 0-1000. -1 for
+		 *            no Material
+		 * @param aTypes
+		 *            which kind of Items should be generated. Bitmask as
+		 *            follows: 1 = Dusts of all kinds. 2 = Dusts, Ingots,
+		 *            Plates, Rods/Sticks, Machine Components and other Metal
+		 *            specific things. 4 = Dusts, Gems, Plates, Lenses (if
+		 *            transparent). 8 = Dusts, Impure Dusts, crushed Ores,
+		 *            purified Ores, centrifuged Ores etc. 16 = Cells 32 =
+		 *            Plasma Cells 64 = Tool Heads 128 = Gears
+		 * @param aR,
+		 *            aG, aB Color of the Material 0-255 each.
+		 * @param aA
+		 *            transparency of the Material Texture. 0 = fully visible,
+		 *            255 = Invisible.
+		 * @param aLocalName
+		 *            The Name used as Default for localization.
+		 * @param aFuelType
+		 *            Type of Generator to get Energy from this Material.
+		 * @param aFuelPower
+		 *            EU generated. Will be multiplied by 1000, also
+		 *            additionally multiplied by 2 for Gems.
+		 * @param aAmplificationValue
+		 *            Amount of UUM amplifier gotten from this.
+		 * @param aUUMEnergy
+		 *            Amount of EU needed to shape the UUM into this Material.
+		 * @param aMeltingPoint
+		 *            Used to determine the smelting Costs in Furnii.
+		 * @param aBlastFurnaceTemp
+		 *            Used to determine the needed Heat capactiy Costs in Blast
+		 *            Furnii.
+		 * @param aBlastFurnaceRequired
+		 *            If this requires a Blast Furnace.
+		 * @param aColor
+		 *            Vanilla MC Wool Color which comes the closest to this.
 		 */
-		private GT_Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aToolDurability, int aToolQuality, int aTypes, int aR, int aG, int aB, int aA, String aLocalName, int aFuelType, int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor) {
+		private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+				final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
+				final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
+				final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
+				final boolean aTransparent, final int aOreValue, final int aDensityMultiplier,
+				final int aDensityDivider, final Dyes aColor) {
 			this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, true);
-			mDefaultLocalName = aLocalName;
-			mMeltingPoint = (short) aMeltingPoint;
-			mBlastFurnaceTemp = (short) aBlastFurnaceTemp;
-			mBlastFurnaceRequired = aBlastFurnaceRequired;
-			if (aTransparent) add(SubTag.TRANSPARENT);
-			mFuelPower = aFuelPower;
-			mFuelType = aFuelType;
-			mOreValue = aOreValue;
-			mDensity = (M * aDensityMultiplier) / aDensityDivider;
-			mColor = aColor == null ? Dyes._NULL : aColor;
-			if (mColor != null) add(SubTag.HAS_COLOR);
-			mRGBa[0] = mMoltenRGBa[0] = (short) aR;
-			mRGBa[1] = mMoltenRGBa[1] = (short) aG;
-			mRGBa[2] = mMoltenRGBa[2] = (short) aB;
-			mRGBa[3] = mMoltenRGBa[3] = (short) aA;
-			mTypes = aTypes;
-			if ((mTypes & 2) != 0) add(SubTag.SMELTING_TO_FLUID);
-		}
-
-		private GT_Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aToolDurability, int aToolQuality, int aTypes, int aR, int aG, int aB, int aA, String aLocalName, int aFuelType, int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, List<TC_AspectStack> aAspects) {
-			this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, aR, aG, aB, aA, aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor);
-			mAspects.addAll(aAspects);
+			this.mDefaultLocalName = aLocalName;
+			this.mMeltingPoint = (short) aMeltingPoint;
+			this.mBlastFurnaceTemp = (short) aBlastFurnaceTemp;
+			this.mBlastFurnaceRequired = aBlastFurnaceRequired;
+			if (aTransparent) {
+				this.add(SubTag.TRANSPARENT);
+			}
+			this.mFuelPower = aFuelPower;
+			this.mFuelType = aFuelType;
+			this.mOreValue = aOreValue;
+			this.mDensity = GT_Values.M * aDensityMultiplier / aDensityDivider;
+			this.mColor = aColor == null ? Dyes._NULL : aColor;
+			if (this.mColor != null) {
+				this.add(SubTag.HAS_COLOR);
+			}
+			this.mRGBa[0] = this.mMoltenRGBa[0] = (short) aR;
+			this.mRGBa[1] = this.mMoltenRGBa[1] = (short) aG;
+			this.mRGBa[2] = this.mMoltenRGBa[2] = (short) aB;
+			this.mRGBa[3] = this.mMoltenRGBa[3] = (short) aA;
+			this.mTypes = aTypes;
+			if ((this.mTypes & 2) != 0) {
+				this.add(SubTag.SMELTING_TO_FLUID);
+			}
 		}
 
 		/**
-		 * @param aElement The Element Enum represented by this Material
+		 * @param aElement
+		 *            The Element Enum represented by this Material
 		 */
-		private GT_Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aToolDurability, int aToolQuality, int aTypes, int aR, int aG, int aB, int aA, String aLocalName, int aFuelType, int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, Element aElement, List<TC_AspectStack> aAspects) {
-			this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, aR, aG, aB, aA, aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor);
-			mElement = aElement;
-			//mElement.mLinkedMaterials.add(this);
+		private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+				final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
+				final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
+				final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
+				final boolean aTransparent, final int aOreValue, final int aDensityMultiplier,
+				final int aDensityDivider, final Dyes aColor, final Element aElement,
+				final List<TC_AspectStack> aAspects) {
+			this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, aR, aG, aB, aA,
+					aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired,
+					aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor);
+			this.mElement = aElement;
+			// mElement.mLinkedMaterials.add(this);
 			if (aElement == Element._NULL) {
-				mChemicalFormula = "Empty";
-			} else {
-				mChemicalFormula = aElement.toString();
-				mChemicalFormula = mChemicalFormula.replaceAll("_", "-");
+				this.mChemicalFormula = "Empty";
 			}
-			mAspects.addAll(aAspects);
+			else {
+				this.mChemicalFormula = aElement.toString();
+				this.mChemicalFormula = this.mChemicalFormula.replaceAll("_", "-");
+			}
+			this.mAspects.addAll(aAspects);
 		}
 
-		private GT_Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aToolDurability, int aToolQuality, int aTypes, int aR, int aG, int aB, int aA, String aLocalName, int aFuelType, int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, int aExtraData, List<MaterialStack> aMaterialList) {
-			this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, aR, aG, aB, aA, aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor, aExtraData, aMaterialList, null);
+		private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+				final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
+				final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
+				final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
+				final boolean aTransparent, final int aOreValue, final int aDensityMultiplier,
+				final int aDensityDivider, final Dyes aColor, final int aExtraData,
+				final List<MaterialStack> aMaterialList) {
+			this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, aR, aG, aB, aA,
+					aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired,
+					aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor, aExtraData, aMaterialList,
+					null);
 		}
 
-		private GT_Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aToolDurability, int aToolQuality, int aTypes, int aR, int aG, int aB, int aA, String aLocalName, int aFuelType, int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, int aExtraData, List<MaterialStack> aMaterialList, List<TC_AspectStack> aAspects) {
-			this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, aR, aG, aB, aA, aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor);
-			mExtraData = aExtraData;
-			mMaterialList.addAll(aMaterialList);
-			mChemicalFormula = "";
-			for (MaterialStack tMaterial : mMaterialList) mChemicalFormula += tMaterial.toString();
-			mChemicalFormula = mChemicalFormula.replaceAll("_", "-");
+		private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+				final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
+				final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
+				final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
+				final boolean aTransparent, final int aOreValue, final int aDensityMultiplier,
+				final int aDensityDivider, final Dyes aColor, final int aExtraData,
+				final List<MaterialStack> aMaterialList, final List<TC_AspectStack> aAspects) {
+			this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, aR, aG, aB, aA,
+					aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired,
+					aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor);
+			this.mExtraData = aExtraData;
+			this.mMaterialList.addAll(aMaterialList);
+			this.mChemicalFormula = "";
+			for (final MaterialStack tMaterial : this.mMaterialList) {
+				this.mChemicalFormula += tMaterial.toString();
+			}
+			this.mChemicalFormula = this.mChemicalFormula.replaceAll("_", "-");
 
 			int tAmountOfComponents = 0, tMeltingPoint = 0;
-			for (MaterialStack tMaterial : mMaterialList) {
+			for (final MaterialStack tMaterial : this.mMaterialList) {
 				tAmountOfComponents += tMaterial.mAmount;
-				if (tMaterial.mMaterial.mMeltingPoint > 0)
+				if (tMaterial.mMaterial.mMeltingPoint > 0) {
 					tMeltingPoint += tMaterial.mMaterial.mMeltingPoint * tMaterial.mAmount;
-				if (aAspects == null)
-					for (TC_AspectStack tAspect : tMaterial.mMaterial.mAspects) tAspect.addToAspectList(mAspects);
+				}
+				if (aAspects == null) {
+					for (final TC_AspectStack tAspect : tMaterial.mMaterial.mAspects) {
+						tAspect.addToAspectList(this.mAspects);
+					}
+				}
 			}
 
-			if (mMeltingPoint < 0) mMeltingPoint = (short) (tMeltingPoint / tAmountOfComponents);
+			if (this.mMeltingPoint < 0) {
+				this.mMeltingPoint = (short) (tMeltingPoint / tAmountOfComponents);
+			}
 
 			tAmountOfComponents *= aDensityMultiplier;
 			tAmountOfComponents /= aDensityDivider;
-			if (aAspects == null) for (TC_AspectStack tAspect : mAspects)
-				tAspect.mAmount = Math.max(1, tAspect.mAmount / Math.max(1, tAmountOfComponents));
-			else mAspects.addAll(aAspects);
+			if (aAspects == null) {
+				for (final TC_AspectStack tAspect : this.mAspects) {
+					tAspect.mAmount = Math.max(1, tAspect.mAmount / Math.max(1, tAmountOfComponents));
+				}
+			}
+			else {
+				this.mAspects.addAll(aAspects);
+			}
 		}
 
-		public static GT_Materials get(String aMaterialName) {
-			Object tObject = GT_Utility.getFieldContent(GT_Materials.class, aMaterialName, false, false);
-			if (tObject != null && tObject instanceof Materials) return (GT_Materials) tObject;
-			return _NULL;
+		private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+				final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
+				final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
+				final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
+				final boolean aTransparent, final int aOreValue, final int aDensityMultiplier,
+				final int aDensityDivider, final Dyes aColor, final List<TC_AspectStack> aAspects) {
+			this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, aR, aG, aB, aA,
+					aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired,
+					aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor);
+			this.mAspects.addAll(aAspects);
 		}
 
-		public static GT_Materials getRealMaterial(String aMaterialName) {
-			return get(aMaterialName).mMaterialInto;
+		/**
+		 * Adds an ItemStack to this Material.
+		 */
+		public GT_Materials add(final ItemStack aStack) {
+			if (aStack != null && !this.contains(aStack)) {
+				this.mMaterialItems.add(aStack);
+			}
+			return this;
 		}
 
 		/**
-		 * Called in preInit with the Config to set Values.
-		 *
-		 * @param aConfiguration
+		 * Adds a SubTag to this Material
+		 */
+		@Override
+		public ISubTagContainer add(final SubTag... aTags) {
+			if (aTags != null) {
+				for (final SubTag aTag : aTags) {
+					if (aTag != null && !this.contains(aTag)) {
+						aTag.addContainerToList(this);
+						this.mSubTags.add(aTag);
+					}
+				}
+			}
+			return this;
+		}
+
+		/**
+		 * Adds a Material to the List of Byproducts when grinding this Ore. Is
+		 * used for more precise Ore grinding, so that it is possible to choose
+		 * between certain kinds of Materials.
 		 */
-		public static void init(GT_Config aConfiguration) {
-			for (GT_Materials tMaterial : VALUES) {
-				String tString = tMaterial.toString().toLowerCase();
-				tMaterial.mHeatDamage = (float) aConfiguration.get(ConfigCategories.Materials.heatdamage, tString, tMaterial.mHeatDamage);
-				if (tMaterial.mBlastFurnaceRequired)
-					tMaterial.mBlastFurnaceRequired = aConfiguration.get(ConfigCategories.Materials.blastfurnacerequirements, tString, true);
-				if (tMaterial.mBlastFurnaceRequired && aConfiguration.get(ConfigCategories.Materials.blastinductionsmelter, tString, tMaterial.mBlastFurnaceTemp < 1500)){}
-				//GT_ModHandler.ThermalExpansion.addSmelterBlastOre(tMaterial);
-				//tMaterial.mHandleMaterial = (tMaterial == Desh ? tMaterial.mHandleMaterial : tMaterial == Diamond || tMaterial == Thaumium ? Wood : tMaterial.contains(SubTag.BURNING) ? Blaze : tMaterial.contains(SubTag.MAGICAL) && tMaterial.contains(SubTag.CRYSTAL) && Loader.isModLoaded(MOD_ID_TC) ? Thaumium : tMaterial.getMass() > Element.Tc.getMass() * 2 ? TungstenSteel : tMaterial.getMass() > Element.Tc.getMass() ? Steel : Wood);
+		public GT_Materials addOreByProduct(final GT_Materials aMaterial) {
+			if (!this.mOreByProducts.contains(aMaterial.mMaterialInto)) {
+				this.mOreByProducts.add(aMaterial.mMaterialInto);
 			}
+			return this;
 		}
 
-		public boolean isRadioactive() {
-			if (mElement != null) return mElement.mHalfLifeSeconds >= 0;
-			for (MaterialStack tMaterial : mMaterialList) if (tMaterial.mMaterial.isRadioactive()) return true;
+		/**
+		 * Adds multiple Materials to the List of Byproducts when grinding this
+		 * Ore. Is used for more precise Ore grinding, so that it is possible to
+		 * choose between certain kinds of Materials.
+		 */
+		public GT_Materials addOreByProducts(final GT_Materials... aMaterials) {
+			for (final GT_Materials tMaterial : aMaterials) {
+				if (tMaterial != null) {
+					this.addOreByProduct(tMaterial);
+				}
+			}
+			return this;
+		}
+
+		/**
+		 * This is used to determine if any of the ItemStacks belongs to this
+		 * Material.
+		 */
+		public boolean contains(final ItemStack... aStacks) {
+			if (aStacks == null || aStacks.length <= 0) {
+				return false;
+			}
+			for (final ItemStack tStack : this.mMaterialItems) {
+				for (final ItemStack aStack : aStacks) {
+					if (GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) {
+						return true;
+					}
+				}
+			}
 			return false;
 		}
 
-		public long getProtons() {
-			if (mElement != null) return mElement.getProtons();
-			if (mMaterialList.size() <= 0) return Element.Tc.getProtons();
+		/**
+		 * If this Material has this exact SubTag
+		 */
+		@Override
+		public boolean contains(final SubTag aTag) {
+			return this.mSubTags.contains(aTag);
+		}
+
+		public long getDensity() {
+			return this.mDensity;
+		}
+
+		public FluidStack getFluid(final long aAmount) {
+			if (this.mFluid == null) {
+				return null;
+			}
+			return new GT_FluidStack(this.mFluid, (int) aAmount);
+		}
+
+		public FluidStack getGas(final long aAmount) {
+			if (this.mGas == null) {
+				return null;
+			}
+			return new GT_FluidStack(this.mGas, (int) aAmount);
+		}
+
+		public long getMass() {
+			if (this.mElement != null) {
+				return this.mElement.getMass();
+			}
+			if (this.mMaterialList.size() <= 0) {
+				return Element.Tc.getMass();
+			}
 			long rAmount = 0, tAmount = 0;
-			for (MaterialStack tMaterial : mMaterialList) {
+			for (final MaterialStack tMaterial : this.mMaterialList) {
 				tAmount += tMaterial.mAmount;
-				rAmount += tMaterial.mAmount * tMaterial.mMaterial.getProtons();
+				rAmount += tMaterial.mAmount * tMaterial.mMaterial.getMass();
+			}
+			return this.getDensity() * rAmount / (tAmount * GT_Values.M);
+		}
+
+		public FluidStack getMolten(final long aAmount) {
+			if (this.mStandardMoltenFluid == null) {
+				return null;
 			}
-			return (getDensity() * rAmount) / (tAmount * M);
+			return new GT_FluidStack(this.mStandardMoltenFluid, (int) aAmount);
 		}
 
 		public long getNeutrons() {
-			if (mElement != null) return mElement.getNeutrons();
-			if (mMaterialList.size() <= 0) return Element.Tc.getNeutrons();
+			if (this.mElement != null) {
+				return this.mElement.getNeutrons();
+			}
+			if (this.mMaterialList.size() <= 0) {
+				return Element.Tc.getNeutrons();
+			}
 			long rAmount = 0, tAmount = 0;
-			for (MaterialStack tMaterial : mMaterialList) {
+			for (final MaterialStack tMaterial : this.mMaterialList) {
 				tAmount += tMaterial.mAmount;
 				rAmount += tMaterial.mAmount * tMaterial.mMaterial.getNeutrons();
 			}
-			return (getDensity() * rAmount) / (tAmount * M);
+			return this.getDensity() * rAmount / (tAmount * GT_Values.M);
 		}
 
-		public long getMass() {
-			if (mElement != null) return mElement.getMass();
-			if (mMaterialList.size() <= 0) return Element.Tc.getMass();
+		public FluidStack getPlasma(final long aAmount) {
+			if (this.mPlasma == null) {
+				return null;
+			}
+			return new GT_FluidStack(this.mPlasma, (int) aAmount);
+		}
+
+		public long getProtons() {
+			if (this.mElement != null) {
+				return this.mElement.getProtons();
+			}
+			if (this.mMaterialList.size() <= 0) {
+				return Element.Tc.getProtons();
+			}
 			long rAmount = 0, tAmount = 0;
-			for (MaterialStack tMaterial : mMaterialList) {
+			for (final MaterialStack tMaterial : this.mMaterialList) {
 				tAmount += tMaterial.mAmount;
-				rAmount += tMaterial.mAmount * tMaterial.mMaterial.getMass();
+				rAmount += tMaterial.mAmount * tMaterial.mMaterial.getProtons();
 			}
-			return (getDensity() * rAmount) / (tAmount * M);
+			return this.getDensity() * rAmount / (tAmount * GT_Values.M);
 		}
 
-		public long getDensity() {
-			return mDensity;
+		@Override
+		public short[] getRGBA() {
+			return this.mRGBa;
 		}
 
-		public String getToolTip() {
-			return getToolTip(1, false);
+		public FluidStack getSolid(final long aAmount) {
+			if (this.mSolid == null) {
+				return null;
+			}
+			return new GT_FluidStack(this.mSolid, (int) aAmount);
 		}
 
-		public String getToolTip(boolean aShowQuestionMarks) {
-			return getToolTip(1, aShowQuestionMarks);
+		public String getToolTip() {
+			return this.getToolTip(1, false);
 		}
 
-		public String getToolTip(long aMultiplier) {
-			return getToolTip(aMultiplier, false);
+		public String getToolTip(final boolean aShowQuestionMarks) {
+			return this.getToolTip(1, aShowQuestionMarks);
 		}
 
-		public String getToolTip(long aMultiplier, boolean aShowQuestionMarks) {
-			if (!aShowQuestionMarks && mChemicalFormula.equals("?")) return "";
-			if (aMultiplier >= M * 2 && !mMaterialList.isEmpty()) {
-				return ((mElement != null || (mMaterialList.size() < 2 && mMaterialList.get(0).mAmount == 1)) ? mChemicalFormula : "(" + mChemicalFormula + ")") + aMultiplier;
-			}
-			return mChemicalFormula;
+		public String getToolTip(final long aMultiplier) {
+			return this.getToolTip(aMultiplier, false);
 		}
 
-		/**
-		 * Adds an ItemStack to this Material.
-		 */
-		public GT_Materials add(ItemStack aStack) {
-			if (aStack != null && !contains(aStack)) mMaterialItems.add(aStack);
-			return this;
+		public String getToolTip(final long aMultiplier, final boolean aShowQuestionMarks) {
+			if (!aShowQuestionMarks && this.mChemicalFormula.equals("?")) {
+				return "";
+			}
+			if (aMultiplier >= GT_Values.M * 2 && !this.mMaterialList.isEmpty()) {
+				return (this.mElement != null || this.mMaterialList.size() < 2 && this.mMaterialList.get(0).mAmount == 1
+						? this.mChemicalFormula : "(" + this.mChemicalFormula + ")") + aMultiplier;
+			}
+			return this.mChemicalFormula;
 		}
 
-		/**
-		 * This is used to determine if any of the ItemStacks belongs to this Material.
-		 */
-		public boolean contains(ItemStack... aStacks) {
-			if (aStacks == null || aStacks.length <= 0) return false;
-			for (ItemStack tStack : mMaterialItems)
-				for (ItemStack aStack : aStacks)
-					if (GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) return true;
+		public boolean isRadioactive() {
+			if (this.mElement != null) {
+				return this.mElement.mHalfLifeSeconds >= 0;
+			}
+			for (final MaterialStack tMaterial : this.mMaterialList) {
+				if (tMaterial.mMaterial.isRadioactive()) {
+					return true;
+				}
+			}
 			return false;
 		}
 
 		/**
 		 * This is used to determine if an ItemStack belongs to this Material.
 		 */
-		public boolean remove(ItemStack aStack) {
-			if (aStack == null) return false;
+		public boolean remove(final ItemStack aStack) {
+			if (aStack == null) {
+				return false;
+			}
 			boolean temp = false;
-			for (int i = 0; i < mMaterialItems.size(); i++)
-				if (GT_Utility.areStacksEqual(aStack, mMaterialItems.get(i))) {
-					mMaterialItems.remove(i--);
+			for (int i = 0; i < this.mMaterialItems.size(); i++) {
+				if (GT_Utility.areStacksEqual(aStack, this.mMaterialItems.get(i))) {
+					this.mMaterialItems.remove(i--);
 					temp = true;
 				}
+			}
 			return temp;
 		}
 
 		/**
-		 * Adds a SubTag to this Material
+		 * Removes a SubTag from this Material
 		 */
 		@Override
-		public ISubTagContainer add(SubTag... aTags) {
-			if (aTags != null) for (SubTag aTag : aTags)
-				if (aTag != null && !contains(aTag)) {
-					aTag.addContainerToList(this);
-					mSubTags.add(aTag);
-				}
-			return this;
+		public boolean remove(final SubTag aTag) {
+			return this.mSubTags.remove(aTag);
 		}
 
 		/**
-		 * If this Material has this exact SubTag
+		 * This Material arc smelts always into an instance of aMaterial. Used
+		 * for Wrought Iron.
 		 */
-		@Override
-		public boolean contains(SubTag aTag) {
-			return mSubTags.contains(aTag);
-		}
-
-		/**
-		 * Removes a SubTag from this Material
-		 */
-		@Override
-		public boolean remove(SubTag aTag) {
-			return mSubTags.remove(aTag);
+		public GT_Materials setArcSmeltingInto(final GT_Materials aMaterial) {
+			if (aMaterial != null) {
+				this.mArcSmeltInto = aMaterial.mMaterialInto.mArcSmeltInto;
+			}
+			return this;
 		}
 
 		/**
-		 * Sets the Heat Damage for this Material (negative = frost)
+		 * If this Ore gives multiple drops of its Byproduct Material.
 		 */
-		public GT_Materials setHeatDamage(float aHeatDamage) {
-			mHeatDamage = aHeatDamage;
+		public GT_Materials setByProductMultiplier(final int aByProductMultiplier) {
+			if (aByProductMultiplier > 0) {
+				this.mByProductMultiplier = aByProductMultiplier;
+			}
 			return this;
 		}
 
 		/**
-		 * Adds a Material to the List of Byproducts when grinding this Ore.
-		 * Is used for more precise Ore grinding, so that it is possible to choose between certain kinds of Materials.
+		 * This Ore should be smolten directly into an Ingot of this Material
+		 * instead of an Ingot of itself.
 		 */
-		public GT_Materials addOreByProduct(GT_Materials aMaterial) {
-			if (!mOreByProducts.contains(aMaterial.mMaterialInto)) mOreByProducts.add(aMaterial.mMaterialInto);
+		public GT_Materials setDirectSmelting(final GT_Materials aMaterial) {
+			if (aMaterial != null) {
+				this.mDirectSmelting = aMaterial.mMaterialInto.mDirectSmelting;
+			}
 			return this;
 		}
 
-		/**
-		 * Adds multiple Materials to the List of Byproducts when grinding this Ore.
-		 * Is used for more precise Ore grinding, so that it is possible to choose between certain kinds of Materials.
-		 */
-		public GT_Materials addOreByProducts(GT_Materials... aMaterials) {
-			for (GT_Materials tMaterial : aMaterials) if (tMaterial != null) addOreByProduct(tMaterial);
+		public GT_Materials setEnchantmentForArmors(final Enchantment aEnchantment, final int aEnchantmentLevel) {
+			this.mEnchantmentArmors = aEnchantment;
+			this.mEnchantmentArmorsLevel = (byte) aEnchantmentLevel;
 			return this;
 		}
 
-		/**
-		 * If this Ore gives multiple drops of its Main Material.
-		 * Lapis Ore for example gives about 6 drops.
-		 */
-		public GT_Materials setOreMultiplier(int aOreMultiplier) {
-			if (aOreMultiplier > 0) mOreMultiplier = aOreMultiplier;
+		public GT_Materials setEnchantmentForTools(final Enchantment aEnchantment, final int aEnchantmentLevel) {
+			this.mEnchantmentTools = aEnchantment;
+			this.mEnchantmentToolsLevel = (byte) aEnchantmentLevel;
 			return this;
 		}
 
 		/**
-		 * If this Ore gives multiple drops of its Byproduct Material.
+		 * Sets the Heat Damage for this Material (negative = frost)
 		 */
-		public GT_Materials setByProductMultiplier(int aByProductMultiplier) {
-			if (aByProductMultiplier > 0) mByProductMultiplier = aByProductMultiplier;
+		public GT_Materials setHeatDamage(final float aHeatDamage) {
+			this.mHeatDamage = aHeatDamage;
 			return this;
 		}
 
 		/**
-		 * If this Ore gives multiple drops of its Main Material.
-		 * Lapis Ore for example gives about 6 drops.
+		 * This Material macerates always into an instance of aMaterial.
 		 */
-		public GT_Materials setSmeltingMultiplier(int aSmeltingMultiplier) {
-			if (aSmeltingMultiplier > 0) mSmeltingMultiplier = aSmeltingMultiplier;
+		public GT_Materials setMaceratingInto(final GT_Materials aMaterial) {
+			if (aMaterial != null) {
+				this.mMacerateInto = aMaterial.mMaterialInto.mMacerateInto;
+			}
 			return this;
 		}
 
 		/**
-		 * This Ore should be smolten directly into an Ingot of this Material instead of an Ingot of itself.
+		 * If this Ore gives multiple drops of its Main Material. Lapis Ore for
+		 * example gives about 6 drops.
 		 */
-		public GT_Materials setDirectSmelting(GT_Materials aMaterial) {
-			if (aMaterial != null) mDirectSmelting = aMaterial.mMaterialInto.mDirectSmelting;
+		public GT_Materials setOreMultiplier(final int aOreMultiplier) {
+			if (aOreMultiplier > 0) {
+				this.mOreMultiplier = aOreMultiplier;
+			}
 			return this;
 		}
 
@@ -746,80 +1197,315 @@ public enum GregtechOrePrefixes {
 		 * This Material should be the Main Material this Ore gets ground into.
 		 * Example, Chromite giving Chrome or Tungstate giving Tungsten.
 		 */
-		public GT_Materials setOreReplacement(GT_Materials aMaterial) {
-			if (aMaterial != null) mOreReplacement = aMaterial.mMaterialInto.mOreReplacement;
+		public GT_Materials setOreReplacement(final GT_Materials aMaterial) {
+			if (aMaterial != null) {
+				this.mOreReplacement = aMaterial.mMaterialInto.mOreReplacement;
+			}
 			return this;
 		}
 
 		/**
-		 * This Material smelts always into an instance of aMaterial. Used for Magnets.
+		 * This Material smelts always into an instance of aMaterial. Used for
+		 * Magnets.
 		 */
-		public GT_Materials setSmeltingInto(GT_Materials aMaterial) {
-			if (aMaterial != null) mSmeltInto = aMaterial.mMaterialInto.mSmeltInto;
+		public GT_Materials setSmeltingInto(final GT_Materials aMaterial) {
+			if (aMaterial != null) {
+				this.mSmeltInto = aMaterial.mMaterialInto.mSmeltInto;
+			}
 			return this;
 		}
 
 		/**
-		 * This Material arc smelts always into an instance of aMaterial. Used for Wrought Iron.
+		 * If this Ore gives multiple drops of its Main Material. Lapis Ore for
+		 * example gives about 6 drops.
 		 */
-		public GT_Materials setArcSmeltingInto(GT_Materials aMaterial) {
-			if (aMaterial != null) mArcSmeltInto = aMaterial.mMaterialInto.mArcSmeltInto;
+		public GT_Materials setSmeltingMultiplier(final int aSmeltingMultiplier) {
+			if (aSmeltingMultiplier > 0) {
+				this.mSmeltingMultiplier = aSmeltingMultiplier;
+			}
 			return this;
 		}
 
-		/**
-		 * This Material macerates always into an instance of aMaterial.
-		 */
-		public GT_Materials setMaceratingInto(GT_Materials aMaterial) {
-			if (aMaterial != null) mMacerateInto = aMaterial.mMaterialInto.mMacerateInto;
-			return this;
+	}
+
+	public static volatile int VERSION = 508;
+
+	static {
+
+		ingotHot.mHeatDamage = 3.0F;
+
+	}
+	public static Materials getMaterial(final String aOre) {
+		return Materials.get(GregtechOrePrefixes.stripPrefix(aOre));
+	}
+	public static Materials getMaterial(final String aOre, final GregtechOrePrefixes aPrefix) {
+		return Materials.get(aOre.replaceFirst(aPrefix.toString(), ""));
+	}
+	public static GregtechOrePrefixes getOrePrefix(final String aOre) {
+		for (final GregtechOrePrefixes tPrefix : GregtechOrePrefixes.values()) {
+			if (aOre.startsWith(tPrefix.toString())) {
+				return tPrefix;
+			}
 		}
+		return null;
+	}
+	public static GregtechOrePrefixes getPrefix(final String aPrefixName) {
+		return GregtechOrePrefixes.getPrefix(aPrefixName, null);
+	}
+	public static GregtechOrePrefixes getPrefix(final String aPrefixName, final GregtechOrePrefixes aReplacement) {
+		final Object tObject = GT_Utility.getFieldContent(GregtechOrePrefixes.class, aPrefixName, false, false);
+		if (tObject != null && tObject instanceof GregtechOrePrefixes) {
+			return (GregtechOrePrefixes) tObject;
+		}
+		return aReplacement;
+	}
+	public static Materials getRealMaterial(final String aOre, final GregtechOrePrefixes aPrefix) {
+		return Materials.getRealMaterial(aOre.replaceFirst(aPrefix.toString(), ""));
+	}
+	public static boolean isInstanceOf(final String aName, final GregtechOrePrefixes aPrefix) {
+		return aName == null ? false : aName.startsWith(aPrefix.toString());
+	}
+	public static String replacePrefix(final String aOre, final GregtechOrePrefixes aPrefix) {
+		for (final GregtechOrePrefixes tPrefix : GregtechOrePrefixes.values()) {
+			if (aOre.startsWith(tPrefix.toString())) {
+				return aOre.replaceFirst(tPrefix.toString(), aPrefix.toString());
+			}
+		}
+		return "";
+	}
+	public static String stripPrefix(final String aOre) {
+		for (final GregtechOrePrefixes tPrefix : GregtechOrePrefixes.values()) {
+			if (aOre.startsWith(tPrefix.toString())) {
+				return aOre.replaceFirst(tPrefix.toString(), "");
+			}
+		}
+		return aOre;
+	}
+	public final ArrayList<ItemStack>						mPrefixedItems			= new ArrayList<ItemStack>();
+	public final short										mTextureIndex;
+	public final String										mRegularLocalName, mLocalizedMaterialPre,
+			mLocalizedMaterialPost;
+	public final boolean									mIsUsedForOreProcessing, mIsEnchantable, mIsUnificatable,
+			mIsMaterialBased, mIsSelfReferencing, mIsContainer, mDontUnificateActively, mIsUsedForBlocks,
+			mAllowNormalRecycling, mGenerateDefaultItem;
+	public final List<TC_AspectStack>						mAspects				= new ArrayList<TC_AspectStack>();
+	public final Collection<GregtechOrePrefixes>			mFamiliarPrefixes		= new HashSet<GregtechOrePrefixes>();
+																																		/**
+	 * Used to determine the amount of Material this Prefix contains. Multiply
+	 * or Divide GregTech_API.MATERIAL_UNIT to get the Amounts in comparision to
+	 * one Ingot. 0 = Null Negative = Undefined Amount
+	 */
+	public final long										mMaterialAmount;
 
-		public GT_Materials setEnchantmentForTools(Enchantment aEnchantment, int aEnchantmentLevel) {
-			mEnchantmentTools = aEnchantment;
-			mEnchantmentToolsLevel = (byte) aEnchantmentLevel;
-			return this;
+	private final Collection<Materials>						mNotGeneratedItems		= new HashSet<Materials>(),
+			mIgnoredMaterials = new HashSet<Materials>(), mGeneratedItems = new HashSet<Materials>();
+
+	private final ArrayList<Interface_OreRecipeRegistrator>	mOreProcessing			= new ArrayList<Interface_OreRecipeRegistrator>();
+
+	private final ArrayList<Interface_OreRecipeRegistrator>	mOreProcessingFake		= new ArrayList<Interface_OreRecipeRegistrator>();
+
+	public ItemStack										mContainerItem			= null;
+
+	public ICondition<ISubTagContainer>						mCondition				= null;
+
+	public byte												mDefaultStackSize		= 64;
+
+	public GregtechMaterialStack							mSecondaryMaterial		= null;
+
+	public GregtechOrePrefixes								mPrefixInto				= this;
+
+	public float											mHeatDamage				= 0.0F;												// Negative
+
+	// for
+																																		// Frost
+																																		// Damage
+	/**
+	 * Yes this Value can be changed to add Bits for the
+	 * MetaGenerated-Item-Check.
+	 */
+	public int												mMaterialGenerationBits	= 0;
+
+	private GregtechOrePrefixes(final String aRegularLocalName, final String aLocalizedMaterialPre,
+			final String aLocalizedMaterialPost, final boolean aIsUnificatable, final boolean aIsMaterialBased,
+			final boolean aIsSelfReferencing, final boolean aIsContainer, final boolean aDontUnificateActively,
+			final boolean aIsUsedForBlocks, final boolean aAllowNormalRecycling, final boolean aGenerateDefaultItem,
+			final boolean aIsEnchantable, final boolean aIsUsedForOreProcessing, final int aMaterialGenerationBits,
+			final long aMaterialAmount, final int aDefaultStackSize, final int aTextureindex) {
+		this.mIsUnificatable = aIsUnificatable;
+		this.mIsMaterialBased = aIsMaterialBased;
+		this.mIsSelfReferencing = aIsSelfReferencing;
+		this.mIsContainer = aIsContainer;
+		this.mDontUnificateActively = aDontUnificateActively;
+		this.mIsUsedForBlocks = aIsUsedForBlocks;
+		this.mAllowNormalRecycling = aAllowNormalRecycling;
+		this.mGenerateDefaultItem = aGenerateDefaultItem;
+		this.mIsEnchantable = aIsEnchantable;
+		this.mIsUsedForOreProcessing = aIsUsedForOreProcessing;
+		this.mMaterialGenerationBits = aMaterialGenerationBits;
+		this.mMaterialAmount = aMaterialAmount;
+		this.mRegularLocalName = aRegularLocalName;
+		this.mLocalizedMaterialPre = aLocalizedMaterialPre;
+		this.mLocalizedMaterialPost = aLocalizedMaterialPost;
+		this.mDefaultStackSize = (byte) aDefaultStackSize;
+		this.mTextureIndex = (short) aTextureindex;
+
+		// TODO - Utilise some form of way to check if it's gt 5.9 if so, use
+		// string switch.
+		if (this.name().startsWith("ore")) {
+			Utils.getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("wire") || this.name().startsWith("cable")) {
+			Utils.getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("dust")) {
+			Utils.getTcAspectStack(TC_Aspects.PERDITIO.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("crushed")) {
+			Utils.getTcAspectStack(TC_Aspects.PERFODIO.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("ingot") || this.name().startsWith("nugget")) {
+			Utils.getTcAspectStack(TC_Aspects.METALLUM.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("armor")) {
+			Utils.getTcAspectStack(TC_Aspects.TUTAMEN.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("stone")) {
+			Utils.getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("pipe")) {
+			Utils.getTcAspectStack(TC_Aspects.ITER.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("gear")) {
+			Utils.getTcAspectStack(TC_Aspects.MOTUS.name(), 1).addToAspectList(this.mAspects);
+			Utils.getTcAspectStack(TC_Aspects.MACHINA.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("frame") || this.name().startsWith("plate")) {
+			Utils.getTcAspectStack(TC_Aspects.FABRICO.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("tool")) {
+			Utils.getTcAspectStack(TC_Aspects.INSTRUMENTUM.name(), 2).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("gem") || this.name().startsWith("crystal") || this.name().startsWith("lens")) {
+			Utils.getTcAspectStack(TC_Aspects.VITREUS.name(), 1).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("crate")) {
+			Utils.getTcAspectStack(TC_Aspects.ITER.name(), 2).addToAspectList(this.mAspects);
 		}
+		else if (this.name().startsWith("circuit")) {
+			Utils.getTcAspectStack("COGNITIO", 1);
+		}
+		else if (this.name().startsWith("computer")) {
+			Utils.getTcAspectStack("COGNITIO", 4).addToAspectList(this.mAspects);
+		}
+		else if (this.name().startsWith("battery")) {
+			Utils.getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects);
+		}
+	}
 
-		public GT_Materials setEnchantmentForArmors(Enchantment aEnchantment, int aEnchantmentLevel) {
-			mEnchantmentArmors = aEnchantment;
-			mEnchantmentArmorsLevel = (byte) aEnchantmentLevel;
-			return this;
+	public boolean add(final Interface_OreRecipeRegistrator aRegistrator) {
+		if (aRegistrator == null) {
+			return false;
 		}
+		return this.mOreProcessing.add(aRegistrator);
+	}
 
-		public FluidStack getSolid(long aAmount) {
-			if (mSolid == null) return null;
-			return new GT_FluidStack(mSolid, (int) aAmount);
+	public boolean add(final ItemStack aStack) {
+		if (aStack == null) {
+			return false;
+		}
+		if (!this.contains(aStack)) {
+			this.mPrefixedItems.add(aStack);
 		}
+		while (this.mPrefixedItems.contains(null)) {
+			this.mPrefixedItems.remove(null);
+		}
+		return true;
+	}
 
-		public FluidStack getFluid(long aAmount) {
-			if (mFluid == null) return null;
-			return new GT_FluidStack(mFluid, (int) aAmount);
+	public boolean addFamiliarPrefix(final GregtechOrePrefixes aPrefix) {
+		if (aPrefix == null || this.mFamiliarPrefixes.contains(aPrefix) || aPrefix == this) {
+			return false;
 		}
+		return this.mFamiliarPrefixes.add(aPrefix);
+	}
 
-		public FluidStack getGas(long aAmount) {
-			if (mGas == null) return null;
-			return new GT_FluidStack(mGas, (int) aAmount);
+	public boolean contains(final ItemStack aStack) {
+		if (aStack == null) {
+			return false;
+		}
+		for (final ItemStack tStack : this.mPrefixedItems) {
+			if (GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) {
+				return true;
+			}
 		}
+		return false;
+	}
+
+	public boolean doGenerateItem(final Materials aMaterial) {
+		return aMaterial != null && aMaterial != Materials._NULL
+				&& ((aMaterial.mTypes & this.mMaterialGenerationBits) != 0 || this.mGeneratedItems.contains(aMaterial))
+				&& !this.mNotGeneratedItems.contains(aMaterial)
+				&& (this.mCondition == null || this.mCondition.isTrue(aMaterial));
+	}
 
-		public FluidStack getPlasma(long aAmount) {
-			if (mPlasma == null) return null;
-			return new GT_FluidStack(mPlasma, (int) aAmount);
+	public Object get(final Object aMaterial) {
+		if (aMaterial instanceof GT_Materials) {
+			return new GregtechItemData(this, (GT_Materials) aMaterial);
 		}
+		return this.name() + aMaterial;
+	}
+
+	public String getDefaultLocalNameForItem(final Materials aMaterial) {
+
+		// Use Standard Localization
+		return this.mLocalizedMaterialPre + aMaterial.mDefaultLocalName + this.mLocalizedMaterialPost;
+	}
 
-		public FluidStack getMolten(long aAmount) {
-			if (mStandardMoltenFluid == null) return null;
-			return new GT_FluidStack(mStandardMoltenFluid, (int) aAmount);
+	public boolean ignoreMaterials(final Materials... aMaterials) {
+		for (final Materials tMaterial : aMaterials) {
+			if (tMaterial != null) {
+				this.mIgnoredMaterials.add(tMaterial);
+			}
 		}
+		return true;
+	}
 
-		@Override
-		public short[] getRGBA() {
-			return mRGBa;
+	public boolean isIgnored(final GT_Materials aMaterial) {
+		if (aMaterial != null && (!aMaterial.mUnificatable || aMaterial != aMaterial.mMaterialInto)) {
+			return true;
 		}
+		return this.mIgnoredMaterials.contains(aMaterial);
+	}
 
-		public static volatile int VERSION = 508;
+	public void processOre(final GT_Materials aMaterial, final String aOreDictName, final String aModName,
+			final ItemStack aStack) {
+		if (aMaterial != null && (aMaterial != GT_Materials._NULL || this.mIsSelfReferencing || !this.mIsMaterialBased)
+				&& GT_Utility.isStackValid(aStack)) {
+			for (final Interface_OreRecipeRegistrator tRegistrator : this.mOreProcessing) {
+				if (GT_Values.D2) {
+					GT_Log.ore.println(
+							"Processing '" + aOreDictName + "' with the Prefix '" + this.name() + "' and the Material '"
+									+ aMaterial.name() + "' at " + GT_Utility.getClassName(tRegistrator));
+				}
+				tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack));
+			}
+		}
+	}
 
+	// TODO
+	public void processOre(final Materials aMaterial, final String aOreDictName, final String aModName,
+			final ItemStack aStack) {
+		if (aMaterial != null && (aMaterial != Materials._NULL || this.mIsSelfReferencing || !this.mIsMaterialBased)
+				&& GT_Utility.isStackValid(aStack)) {
+			for (final Interface_OreRecipeRegistrator tRegistrator : this.mOreProcessingFake) {
+				if (GT_Values.D2) {
+					GT_Log.ore.println(
+							"Processing '" + aOreDictName + "' with the Prefix '" + this.name() + "' and the Material '"
+									+ aMaterial.name() + "' at " + GT_Utility.getClassName(tRegistrator));
+				}
+				tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack));
+			}
+		}
 	}
 
-	
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java
index 0b8c605e42..a5fbbbd188 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java
@@ -4,141 +4,155 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
 public class GregtechTextureSet {
-    public static final GregtechTextureSet
-            SET_NONE = new GregtechTextureSet("NONE"), SET_DULL = new GregtechTextureSet("DULL"), SET_RUBY = new GregtechTextureSet("RUBY"), SET_OPAL = new GregtechTextureSet("OPAL"), SET_LEAF = new GregtechTextureSet("LEAF"), SET_WOOD = new GregtechTextureSet("WOOD"), SET_SAND = new GregtechTextureSet("SAND"), SET_FINE = new GregtechTextureSet("FINE"), SET_FIERY = new GregtechTextureSet("FIERY"), SET_FLUID = new GregtechTextureSet("FLUID"), SET_ROUGH = new GregtechTextureSet("ROUGH"), SET_PAPER = new GregtechTextureSet("PAPER"), SET_GLASS = new GregtechTextureSet("GLASS"), SET_FLINT = new GregtechTextureSet("FLINT"), SET_LAPIS = new GregtechTextureSet("LAPIS"), SET_SHINY = new GregtechTextureSet("SHINY"), SET_SHARDS = new GregtechTextureSet("SHARDS"), SET_POWDER = new GregtechTextureSet("POWDER"), SET_QUARTZ = new GregtechTextureSet("QUARTZ"), SET_EMERALD = new GregtechTextureSet("EMERALD"), SET_DIAMOND = new GregtechTextureSet("DIAMOND"), SET_LIGNITE = new GregtechTextureSet("LIGNITE"), SET_MAGNETIC = new GregtechTextureSet("MAGNETIC"), SET_METALLIC = new GregtechTextureSet("METALLIC"), SET_NETHERSTAR = new GregtechTextureSet("NETHERSTAR"), SET_GEM_VERTICAL = new GregtechTextureSet("GEM_VERTICAL"), SET_GEM_HORIZONTAL = new GregtechTextureSet("GEM_HORIZONTAL");
+	public static final GregtechTextureSet	SET_NONE	= new GregtechTextureSet("NONE"),
+			SET_DULL = new GregtechTextureSet("DULL"), SET_RUBY = new GregtechTextureSet("RUBY"),
+			SET_OPAL = new GregtechTextureSet("OPAL"), SET_LEAF = new GregtechTextureSet("LEAF"),
+			SET_WOOD = new GregtechTextureSet("WOOD"), SET_SAND = new GregtechTextureSet("SAND"),
+			SET_FINE = new GregtechTextureSet("FINE"), SET_FIERY = new GregtechTextureSet("FIERY"),
+			SET_FLUID = new GregtechTextureSet("FLUID"), SET_ROUGH = new GregtechTextureSet("ROUGH"),
+			SET_PAPER = new GregtechTextureSet("PAPER"), SET_GLASS = new GregtechTextureSet("GLASS"),
+			SET_FLINT = new GregtechTextureSet("FLINT"), SET_LAPIS = new GregtechTextureSet("LAPIS"),
+			SET_SHINY = new GregtechTextureSet("SHINY"), SET_SHARDS = new GregtechTextureSet("SHARDS"),
+			SET_POWDER = new GregtechTextureSet("POWDER"), SET_QUARTZ = new GregtechTextureSet("QUARTZ"),
+			SET_EMERALD = new GregtechTextureSet("EMERALD"), SET_DIAMOND = new GregtechTextureSet("DIAMOND"),
+			SET_LIGNITE = new GregtechTextureSet("LIGNITE"), SET_MAGNETIC = new GregtechTextureSet("MAGNETIC"),
+			SET_METALLIC = new GregtechTextureSet("METALLIC"), SET_NETHERSTAR = new GregtechTextureSet("NETHERSTAR"),
+			SET_GEM_VERTICAL = new GregtechTextureSet("GEM_VERTICAL"),
+			SET_GEM_HORIZONTAL = new GregtechTextureSet("GEM_HORIZONTAL");
 
-    public final IIconContainer[] mTextures = new IIconContainer[128];
-    public final String mSetName;
+	public final IIconContainer[]			mTextures	= new IIconContainer[128];
+	public final String						mSetName;
 
-    public GregtechTextureSet(String aSetName) {
-        mSetName = aSetName;
-        mTextures[0] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/turbineBlade");
-        mTextures[1] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/toolHeadSkookumChoocher");
-        mTextures[2] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[3] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[4] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[5] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[6] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[7] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[8] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[9] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[10] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[11] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[12] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[13] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[14] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[15] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[16] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[17] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[18] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[19] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[20] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[21] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[22] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[23] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[24] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[25] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[26] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[27] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[28] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[29] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[30] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[31] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[32] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[33] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[34] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[35] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[36] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[37] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[38] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[39] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[40] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[41] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[42] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[43] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[44] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[45] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[46] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[47] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[48] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[49] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[50] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[51] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[52] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[53] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[54] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[55] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[56] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[57] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[58] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[59] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[60] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[61] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[62] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[63] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[64] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[65] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[66] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[67] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[68] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[69] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[70] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[71] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[72] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[73] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[74] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[75] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[76] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[77] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[78] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[79] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[80] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[81] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[82] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[83] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[84] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[85] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[86] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[87] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[88] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[89] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[90] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[91] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[92] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[93] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[94] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[95] = new Textures.BlockIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[96] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[97] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[98] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[99] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[100] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[101] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[102] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[103] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[104] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[105] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[106] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[107] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[108] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[109] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[110] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[111] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[112] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[113] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[114] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[115] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[116] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[117] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[118] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[119] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[120] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[121] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[122] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[123] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[124] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[125] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[126] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[127] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-    }
+	public GregtechTextureSet(final String aSetName) {
+		this.mSetName = aSetName;
+		this.mTextures[0] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/turbineBlade");
+		this.mTextures[1] = new Textures.ItemIcons.CustomIcon(
+				"materialicons/" + this.mSetName + "/toolHeadSkookumChoocher");
+		this.mTextures[2] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[3] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[4] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[5] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[6] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[7] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[8] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[9] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[10] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[11] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[12] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[13] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[14] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[15] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[16] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[17] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[18] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[19] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[20] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[21] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[22] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[23] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[24] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[25] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[26] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[27] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[28] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[29] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[30] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[31] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[32] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[33] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[34] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[35] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[36] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[37] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[38] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[39] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[40] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[41] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[42] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[43] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[44] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[45] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[46] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[47] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[48] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[49] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[50] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[51] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[52] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[53] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[54] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[55] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[56] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[57] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[58] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[59] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[60] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[61] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[62] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[63] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[64] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[65] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[66] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[67] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[68] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[69] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[70] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[71] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[72] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[73] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[74] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[75] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[76] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[77] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[78] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[79] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[80] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[81] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[82] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[83] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[84] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[85] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[86] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[87] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[88] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[89] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[90] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[91] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[92] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[93] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[94] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[95] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[96] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[97] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[98] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[99] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[100] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[101] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[102] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[103] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[104] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[105] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[106] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[107] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[108] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[109] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[110] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[111] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[112] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[113] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[114] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[115] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[116] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[117] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[118] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[119] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[120] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[121] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[122] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[123] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[124] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[125] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[126] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+		this.mTextures[127] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
+	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
index dca5d7301c..8580fa8900 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
@@ -9,193 +9,158 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
 public class GregtechTextures {
-	public enum BlockIcons implements Interface_IconContainer, Runnable {	
+	public enum BlockIcons implements Interface_IconContainer, Runnable {
 
 		VOID,
 
-		LARGECENTRIFUGE1, LARGECENTRIFUGE2, LARGECENTRIFUGE3, 
-		LARGECENTRIFUGE4, LARGECENTRIFUGE5, LARGECENTRIFUGE6, 
-		LARGECENTRIFUGE7, LARGECENTRIFUGE8, LARGECENTRIFUGE9, 
-		LARGECENTRIFUGE_ACTIVE1, LARGECENTRIFUGE_ACTIVE2, LARGECENTRIFUGE_ACTIVE3, 
-		LARGECENTRIFUGE_ACTIVE4, LARGECENTRIFUGE_ACTIVE5, LARGECENTRIFUGE_ACTIVE6, 
-		LARGECENTRIFUGE_ACTIVE7, LARGECENTRIFUGE_ACTIVE8, LARGECENTRIFUGE_ACTIVE9;
+		LARGECENTRIFUGE1, LARGECENTRIFUGE2, LARGECENTRIFUGE3, LARGECENTRIFUGE4, LARGECENTRIFUGE5, LARGECENTRIFUGE6, LARGECENTRIFUGE7, LARGECENTRIFUGE8, LARGECENTRIFUGE9, LARGECENTRIFUGE_ACTIVE1, LARGECENTRIFUGE_ACTIVE2, LARGECENTRIFUGE_ACTIVE3, LARGECENTRIFUGE_ACTIVE4, LARGECENTRIFUGE_ACTIVE5, LARGECENTRIFUGE_ACTIVE6, LARGECENTRIFUGE_ACTIVE7, LARGECENTRIFUGE_ACTIVE8, LARGECENTRIFUGE_ACTIVE9;
+
+		public static class CustomIcon implements Interface_IconContainer, Runnable {
+			protected IIcon		mIcon;
+			protected String	mIconName;
+
+			public CustomIcon(final String aIconName) {
+				this.mIconName = aIconName;
+				Meta_GT_Proxy.GT_BlockIconload.add(this);
+			}
+
+			@Override
+			public IIcon getIcon() {
+				return this.mIcon;
+			}
+
+			@Override
+			public IIcon getOverlayIcon() {
+				return null;
+			}
+
+			@Override
+			public ResourceLocation getTextureFile() {
+				return TextureMap.locationBlocksTexture;
+			}
+
+			@Override
+			public void run() {
+				this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + this.mIconName);
+			}
+		}
 
 		public static final Interface_IconContainer[]
 
-				CENTRIFUGE = new Interface_IconContainer[]{
-			LARGECENTRIFUGE1,
-			LARGECENTRIFUGE2,
-			LARGECENTRIFUGE3,
-			LARGECENTRIFUGE4,
-			LARGECENTRIFUGE5,
-			LARGECENTRIFUGE6,
-			LARGECENTRIFUGE7,
-			LARGECENTRIFUGE8,
-			LARGECENTRIFUGE9
-		},
-		CENTRIFUGE_ACTIVE = new Interface_IconContainer[]{
-			LARGECENTRIFUGE_ACTIVE1,
-			LARGECENTRIFUGE_ACTIVE2,
-			LARGECENTRIFUGE_ACTIVE3,
-			LARGECENTRIFUGE_ACTIVE4,
-			LARGECENTRIFUGE_ACTIVE5,
-			LARGECENTRIFUGE_ACTIVE6,
-			LARGECENTRIFUGE_ACTIVE7,
-			LARGECENTRIFUGE_ACTIVE8,
-			LARGECENTRIFUGE_ACTIVE9
+														CENTRIFUGE			= new Interface_IconContainer[] {
+				LARGECENTRIFUGE1, LARGECENTRIFUGE2, LARGECENTRIFUGE3, LARGECENTRIFUGE4, LARGECENTRIFUGE5,
+				LARGECENTRIFUGE6, LARGECENTRIFUGE7, LARGECENTRIFUGE8, LARGECENTRIFUGE9
+		}, CENTRIFUGE_ACTIVE = new Interface_IconContainer[] {
+				LARGECENTRIFUGE_ACTIVE1, LARGECENTRIFUGE_ACTIVE2, LARGECENTRIFUGE_ACTIVE3, LARGECENTRIFUGE_ACTIVE4,
+				LARGECENTRIFUGE_ACTIVE5, LARGECENTRIFUGE_ACTIVE6, LARGECENTRIFUGE_ACTIVE7, LARGECENTRIFUGE_ACTIVE8,
+				LARGECENTRIFUGE_ACTIVE9
 		};
 
-		public static Interface_Texture[]   
-				GT_CASING_BLOCKS = new Interface_Texture[64];
-
-		protected IIcon mIcon;
-
-        private BlockIcons() {
-        	Meta_GT_Proxy.GT_BlockIconload.add(this);
-        }
-
-        @Override
-        public IIcon getIcon() {
-            return mIcon;
-        }
-
-        @Override
-        public IIcon getOverlayIcon() {
-            return null;
-        }
-
-        @Override
-        public void run() {
-            mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this);
-        }
-        
-        @Override
-        public ResourceLocation getTextureFile() {
-            return TextureMap.locationBlocksTexture;
-        }
-
-        public static class CustomIcon implements Interface_IconContainer, Runnable {
-            protected IIcon mIcon;
-            protected String mIconName;
-
-            public CustomIcon(String aIconName) {
-                mIconName = aIconName;
-                Meta_GT_Proxy.GT_BlockIconload.add(this);
-            }
-
-            @Override
-            public IIcon getIcon() {
-                return mIcon;
-            }
-
-            @Override
-            public IIcon getOverlayIcon() {
-                return null;
-            }
-
-            @Override
-            public void run() {
-                mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + mIconName);
-            }
-
-            @Override
-            public ResourceLocation getTextureFile() {
-                return TextureMap.locationBlocksTexture;
-            }
-        }
+		public static Interface_Texture[]				GT_CASING_BLOCKS	= new Interface_Texture[64];
+
+		protected IIcon									mIcon;
+
+		private BlockIcons() {
+			Meta_GT_Proxy.GT_BlockIconload.add(this);
+		}
+
+		@Override
+		public IIcon getIcon() {
+			return this.mIcon;
+		}
+
+		@Override
+		public IIcon getOverlayIcon() {
+			return null;
+		}
+
+		@Override
+		public ResourceLocation getTextureFile() {
+			return TextureMap.locationBlocksTexture;
+		}
+
+		@Override
+		public void run() {
+			this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this);
+		}
 	}
-	
-	
+
 	public enum ItemIcons implements Interface_IconContainer, Runnable {
-        VOID, // The Empty Texture
-        RENDERING_ERROR, //The Purple/Black Texture
-        SKOOKUMCHOOCHER, //The Skookum Tool Texture
-        TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;
-
-       /* public static final Interface_IconContainer[]
-                DURABILITY_BAR = new Interface_IconContainer[]{
-                DURABILITY_BAR_0,
-                DURABILITY_BAR_1,
-                DURABILITY_BAR_2,
-                DURABILITY_BAR_3,
-                DURABILITY_BAR_4,
-                DURABILITY_BAR_5,
-                DURABILITY_BAR_6,
-                DURABILITY_BAR_7,
-                DURABILITY_BAR_8,
-        },
-                ENERGY_BAR = new Interface_IconContainer[]{
-                        ENERGY_BAR_0,
-                        ENERGY_BAR_1,
-                        ENERGY_BAR_2,
-                        ENERGY_BAR_3,
-                        ENERGY_BAR_4,
-                        ENERGY_BAR_5,
-                        ENERGY_BAR_6,
-                        ENERGY_BAR_7,
-                        ENERGY_BAR_8,
-                };*/
-
-        //public static final Interface_Texture[] ERROR_RENDERING = new Interface_Texture[]{new GregtechRenderedTexture(RENDERING_ERROR)};
-
-        protected IIcon mIcon, mOverlay;
-
-        private ItemIcons() {
-        	Meta_GT_Proxy.GT_ItemIconload.add(this);
-        }
-
-        @Override
-        public IIcon getIcon() {
-            return mIcon;
-        }
-
-        @Override
-        public IIcon getOverlayIcon() {
-            return mOverlay;
-        }
-
-        @Override
-        public ResourceLocation getTextureFile() {
-            return TextureMap.locationItemsTexture;
-        }
-
-        @Override
-        public void run() {
-            mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + "iconsets/" + this);
-            mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + "iconsets/" + this + "_OVERLAY");
-        }
-
-        public static class CustomIcon implements Interface_IconContainer, Runnable {
-            protected IIcon mIcon, mOverlay;
-            protected String mIconName;
-
-            public CustomIcon(String aIconName) {
-                mIconName = aIconName;
-                Meta_GT_Proxy.GT_ItemIconload.add(this);
-            }
-
-            @Override
-            public IIcon getIcon() {
-                return mIcon;
-            }
-
-            @Override
-            public IIcon getOverlayIcon() {
-                return mOverlay;
-            }
-
-            @Override
-            public void run() {
-                mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + mIconName);
-                mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + mIconName + "_OVERLAY");
-            }
-
-            @Override
-            public ResourceLocation getTextureFile() {
-                return TextureMap.locationItemsTexture;
-            }
-        }
-    }
-	
-}
+		VOID, // The Empty Texture
+		RENDERING_ERROR, // The Purple/Black Texture
+		SKOOKUMCHOOCHER, // The Skookum Tool Texture
+		TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;
+
+		/*
+		 * public static final Interface_IconContainer[] DURABILITY_BAR = new
+		 * Interface_IconContainer[]{ DURABILITY_BAR_0, DURABILITY_BAR_1,
+		 * DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4,
+		 * DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7,
+		 * DURABILITY_BAR_8, }, ENERGY_BAR = new Interface_IconContainer[]{
+		 * ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4,
+		 * ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8, };
+		 */
+
+		// public static final Interface_Texture[] ERROR_RENDERING = new
+		// Interface_Texture[]{new GregtechRenderedTexture(RENDERING_ERROR)};
+
+		public static class CustomIcon implements Interface_IconContainer, Runnable {
+			protected IIcon		mIcon, mOverlay;
+			protected String	mIconName;
+
+			public CustomIcon(final String aIconName) {
+				this.mIconName = aIconName;
+				Meta_GT_Proxy.GT_ItemIconload.add(this);
+			}
+
+			@Override
+			public IIcon getIcon() {
+				return this.mIcon;
+			}
+
+			@Override
+			public IIcon getOverlayIcon() {
+				return this.mOverlay;
+			}
+
+			@Override
+			public ResourceLocation getTextureFile() {
+				return TextureMap.locationItemsTexture;
+			}
+
+			@Override
+			public void run() {
+				this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + this.mIconName);
+				this.mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + this.mIconName + "_OVERLAY");
+			}
+		}
+
+		protected IIcon mIcon, mOverlay;
+
+		private ItemIcons() {
+			Meta_GT_Proxy.GT_ItemIconload.add(this);
+		}
+
+		@Override
+		public IIcon getIcon() {
+			return this.mIcon;
+		}
+
+		@Override
+		public IIcon getOverlayIcon() {
+			return this.mOverlay;
+		}
+
+		@Override
+		public ResourceLocation getTextureFile() {
+			return TextureMap.locationItemsTexture;
+		}
+
+		@Override
+		public void run() {
+			this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this);
+			this.mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this + "_OVERLAY");
+		}
+	}
 
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
index aa0e347ca9..2471e84f54 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.gregtech.api.enums;
 
 public enum GregtechToolDictNames {
-  
-    craftingToolSkookumChoocher;
-    
+
+	craftingToolSkookumChoocher;
+
 }
\ No newline at end of file