+ Added new Radioactive ore.

+ Added Custom Nuclear Texture Set.
% More material work.
$ Fixed issue allowing Multiblocks to have > 1 Control Core Hatch.
$ Fixed Broken Ore texture for ENRICHED TextureSet.
$ Fixed a few fluid recipes broken in the refactor.

19 files changed, 1171 insertions, 603 deletions

diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
index 34da346ff2..6014388cda 100644
--- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
+++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -29,10 +29,10 @@ public class BasicBlock extends BlockContainer {
 			this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
 		}
 
-		this.setCreativeTab(AddToCreativeTab.tabBlock);
-		this.setHardness(2.0F);
+		this.setCreativeTab(AddToCreativeTab.tabBlock);		
 		this.setResistance(6.0F);
 		this.setLightLevel(0.0F);
+		this.setHardness(1.0f*harvestLevel);
 		this.setHarvestLevel("pickaxe", harvestLevel);
 		this.setStepSound(soundTypeMetal);
 	}
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
index 634dc4c022..b089688193 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -32,14 +32,14 @@ public class BlockBaseModular extends BasicBlock {
 	
 	public BlockBaseModular(final Material material, final BlockTypes blockType, final int colour) {
 		this(material.getUnlocalizedName(), material.getLocalizedName(), net.minecraft.block.material.Material.iron,
-				blockType, colour, Math.min(Math.max(material.vTier, 1), 5));
+				blockType, colour, Math.min(Math.max(material.vTier, 1), 6));
 		blockMaterial = material;
 	}
 
 	protected BlockBaseModular(final String unlocalizedName, final String blockMaterial,
 			final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, final int colour,
 			final int miningLevel) {
-		super(unlocalizedName, vanillaMaterial);
+		super(blockType, unlocalizedName, vanillaMaterial, miningLevel);	
 		this.setHarvestLevel(blockType.getHarvestTool(), miningLevel);
 		this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture());
 		this.blockColour = colour;
@@ -130,8 +130,8 @@ public class BlockBaseModular extends BasicBlock {
 			}		
 			metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType);	
 			int tier = this.blockMaterial.vTier;
-			String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier < 3 ? "block1" : tier < 6 ? "block6" : "block5");			
-			this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/"+ "METALLIC" +"/" + aType);
+			String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier <= 4 ? "block1" : "block5");			
+			this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/"+ metType +"/" + aType);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 526f2b245c..4d7478dbdd 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -30,12 +30,13 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 	private final Material blockMaterial;
 
 	public BlockBaseOre(final Material material, final BlockTypes blockType, final int colour) {
-		super(blockType, Utils.sanitizeString(material.getUnlocalizedName()), net.minecraft.block.material.Material.rock);
+		super(blockType, Utils.sanitizeString(material.getUnlocalizedName()), net.minecraft.block.material.Material.rock, Math.min(Math.max(material.vTier, 1), 6));
+		int aMaterialTierForMining = Math.min(Math.max(material.vTier, 1), 6);
 		this.blockMaterial = material;
-		this.setHardness(2.0f);
+		this.setHardness(1.0f*aMaterialTierForMining);
 		this.setResistance(6.0F);
 		this.setLightLevel(0.0F);
-		this.setHarvestLevel("pickaxe", Math.min(Math.max(material.vTier, 1), 5));
+		this.setHarvestLevel("pickaxe", aMaterialTierForMining);
 		this.setStepSound(soundTypeStone);		
 		this.setBlockName("Ore"+Utils.sanitizeString(Utils.sanitizeString(material.getUnlocalizedName())));
 		this.setBlockTextureName("stone");
diff --git a/src/Java/gtPlusPlus/core/client/CustomTextureSet.java b/src/Java/gtPlusPlus/core/client/CustomTextureSet.java
index d7bbecd6c7..400503b2fa 100644
--- a/src/Java/gtPlusPlus/core/client/CustomTextureSet.java
+++ b/src/Java/gtPlusPlus/core/client/CustomTextureSet.java
@@ -8,7 +8,8 @@ public class CustomTextureSet extends TextureSet {
 		
 		REFINED(),
 		GEM_A(),
-		ENRICHED();
+		ENRICHED(),
+		NUCLEAR;
 
 		private final CustomTextureSet A;
 		
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 0e21e9b154..c86c10bb53 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -280,6 +280,8 @@ public final class ModItems {
 
 	public static ItemStack itemHotTitaniumIngot;
 
+	public static Fluid fluidZrF4;
+
 	static {
 		Logger.INFO("Items!");
 		//Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is called upon.
@@ -621,7 +623,7 @@ public final class ModItems {
 		//Zirconium Tetrafluoride
 		GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
 		GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));
-		FluidUtils.generateFluidNoPrefix("ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[]{170, 170, 140, 100}); //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
+		fluidZrF4 = FluidUtils.generateFluidNoPrefix("ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[]{170, 170, 140, 100}); //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
 
 		//Coolant Salt
 		//NaBF4 - NaF - 621C
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index ea0a2bb5eb..b07815fa60 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -97,14 +97,14 @@ public class BaseItemComponent extends Item{
 			return false;
 		}		
 		//Register Component
-		Map<String, BaseItemComponent> aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName());
+		Map<String, ItemStack> aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName());
 		if (aMap == null) {
-			aMap = new HashMap<String, BaseItemComponent>();
+			aMap = new HashMap<String, ItemStack>();
 		}
 		String aKey = componentType.getGtOrePrefix().name();
-		BaseItemComponent x = aMap.get(aKey);
+		ItemStack x = aMap.get(aKey);
 		if (x == null) {
-			aMap.put(aKey, this);
+			aMap.put(aKey, ItemUtils.getSimpleStack(this));
 			Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap);
 			return true;
 		}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 56d2aabdba..517e3f7c1f 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -18,12 +18,12 @@ import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
 
-public class ItemBlockGtBlock extends ItemBlock{
+public class ItemBlockGtBlock extends ItemBlock {
 
 	protected final int blockColour;
-	protected final int sRadiation;
+	private int sRadiation;
 
-	private final Material mMaterial;
+	private Material mMaterial;
 
 	private final Block thisBlock;
 	private boolean isOre = false;
@@ -32,46 +32,23 @@ public class ItemBlockGtBlock extends ItemBlock{
 	public ItemBlockGtBlock(final Block block) {
 		super(block);
 		this.thisBlock = block;
-		if (block instanceof BlockBaseOre){
+		if (block instanceof BlockBaseOre) {
 			this.isOre = true;
-		}
-		else if (block instanceof BlockBaseModular) {
+		} else if (block instanceof BlockBaseModular) {
 			this.isModular = true;
 		}
-		else {
-
-		}
-		if (!isModular && !isOre) {
-			mMaterial = null;
-		}
-		else {
-			if (isOre) {
-				mMaterial = ((BlockBaseOre) block).getMaterialEx();
-			}
-			else {
-				mMaterial = ((BlockBaseModular) block).getMaterialEx();				
-			}
-		}		
-
 		final BlockBaseModular baseBlock = (BlockBaseModular) block;
 		if (isModular) {
 			this.blockColour = baseBlock.getRenderColor(0);
-		}
-		else if (isOre) {
+		} else if (isOre) {
 			this.blockColour = block.getBlockColor();
-		}
-		else {
+		} else {
 			this.blockColour = block.getBlockColor();
 		}
-		if (this.mMaterial != null) {
-			this.sRadiation = mMaterial.vRadiationLevel;
-		}
-		else {
-			this.sRadiation = 0;
-		}
-
-
-		//GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""), ItemUtils.getSimpleStack(this));
+		// GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block",
+		// "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block",
+		// "").replace("-", "").replace("_", "").replace(" ", ""),
+		// ItemUtils.getSimpleStack(this));
 	}
 
 	public int getRenderColor(final int aMeta) {
@@ -80,45 +57,66 @@ public class ItemBlockGtBlock extends ItemBlock{
 
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		
-		if (this.mMaterial != null){
-			list.add(this.mMaterial.vChemicalFormula);			
-		}
-		
-		if (this.sRadiation > 0){
-			list.add(CORE.GT_Tooltip_Radioactive);
+
+		if (this.mMaterial != null) {
+			list.add(this.mMaterial.vChemicalFormula);
+			if (this.mMaterial.vRadiationLevel > 0) {
+				list.add(CORE.GT_Tooltip_Radioactive);
+			}
+		} else {
+			list.add("Material is Null.");
 		}
-		
+
 		if (KeyboardUtils.isCtrlKeyDown()) {
 			Block b = Block.getBlockFromItem(stack.getItem());
 			if (b != null) {
-				
+
 				String aTool = b.getHarvestTool(stack.getItemDamage());
 				int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage());
-				list.add("Mining Level: "+Math.min(Math.max(aMiningLevel1, 0), 5));	
-				
+				list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
+
 				if (this.mMaterial != null) {
-					list.add("Ore contains:    ");	
+					list.add("Ore contains:    ");
 					if (mMaterial.getComposites().isEmpty()) {
-						list.add("- "+mMaterial.getLocalizedName());						
-					}
-					else {
+						list.add("- " + mMaterial.getLocalizedName());
+					} else {
 						for (MaterialStack m : mMaterial.getComposites()) {
-							list.add("- "+m.getStackMaterial().getLocalizedName()+" x"+m.getPartsPerOneHundred());					
+							list.add("- " + m.getStackMaterial().getLocalizedName() + " x" + m.getPartsPerOneHundred());
 						}
 					}
 				}
 			}
-		}
-		else {
-			list.add(EnumChatFormatting.DARK_GRAY+"Hold Ctrl to show additional info.");				
+		} else {
+			list.add(EnumChatFormatting.DARK_GRAY + "Hold Ctrl to show additional info.");
 		}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
 	@Override
-	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) {
-		EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.sRadiation, world, entityHolding);
+	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
+			final boolean p_77663_5_) {
+
+		if (!isModular && !isOre) {
+			mMaterial = null;
+		} else {
+			if (this.mMaterial == null) {
+				Block b = Block.getBlockFromItem(iStack.getItem());
+				if (isOre) {
+					mMaterial = ((BlockBaseOre) b).getMaterialEx();
+				} else {
+					mMaterial = ((BlockBaseModular) b).getMaterialEx();
+				}
+				if (mMaterial != null) {
+					this.sRadiation = mMaterial.vRadiationLevel;
+				} else {
+					this.sRadiation = 0;
+				}
+			}
+			if (this.sRadiation > 0) {
+				EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.sRadiation, world, entityHolding);
+			}
+		}
+
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
index 791d861414..e4079521d4 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
@@ -57,12 +57,7 @@ public class ItemBlockOre extends ItemBlock{
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 
-		if (!mInitOres_Everglades || mMapOreBlockItemToDimName.size() == 0 || (aPlayer != null ? aPlayer.worldObj.getWorldTime() % 200 == 0 : false)) {
-
-			//mMapOreBlockItemToDimName.clear();
-			mDimsForThisOre.clear();
-
-
+		if (!mInitOres_Everglades) {
 			for (WorldGen_GT_Ore_Layer f : gtPlusPlus.everglades.gen.gt.WorldGen_Ores.validOreveins.values()) {
 				Material[]  m2 = new Material[] {f.mPrimary, f.mSecondary, f.mBetween, f.mSporadic};
 				for (Material m1 : m2) {
@@ -70,8 +65,9 @@ public class ItemBlockOre extends ItemBlock{
 					if (aMap == null) {
 						aMap = new AutoMap<String>();
 					}
-					if (!aMap.containsValue("Everglades")) {
-						aMap.put("Everglades");	
+					String aDimName = "Everglades";
+					if (!aMap.containsValue(aDimName)) {
+						aMap.put(aDimName);	
 					}							
 					mMapOreBlockItemToDimName.put(m1.getUnlocalizedName().toLowerCase(), aMap);
 				}				
@@ -120,21 +116,21 @@ public class ItemBlockOre extends ItemBlock{
 			}
 
 			if (mDimsForThisOre.isEmpty()) {
-				AutoMap A = mMapOreBlockItemToDimName.get(this.mThisMaterial.getUnlocalizedName().toLowerCase());
+				AutoMap<String> A = mMapOreBlockItemToDimName.get(this.mThisMaterial.getUnlocalizedName().toLowerCase());
 				if (A != null) {
 					mDimsForThisOre = A;
-				}
-				else {
-					mDimsForThisOre.put("Unknown");
-				}			
+				}		
 			}
-			
+
+			list.add("Found:    ");
 			if (!mDimsForThisOre.isEmpty()) {
-				list.add("Found:    ");
 				for (String m : mDimsForThisOre) {
 					list.add("- "+m);					
 				}			
 			}
+			else {
+				list.add("- Unknown");				
+			}
 
 		}
 		else {
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 53f778455c..f52856b824 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -212,7 +212,7 @@ public final class ALLOY {
 	public static final Material MARAGING250 = new Material(
 			"Maraging Steel 250", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{140, 140, 140, 0}, //Material Colour
+			null, //Material Colour
 			2413, //Melting Point in C
 			4555,
 			-1,
@@ -230,7 +230,7 @@ public final class ALLOY {
 	public static final Material MARAGING300 = new Material(
 			"Maraging Steel 300", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{150, 150, 150, 0}, //Material Colour
+			null, //Material Colour
 			2413, //Melting Point in C
 			4555,
 			-1,
@@ -248,7 +248,7 @@ public final class ALLOY {
 	public static final Material MARAGING350 = new Material(
 			"Maraging Steel 350", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{160, 160, 160, 0}, //Material Colour
+			null, //Material Colour
 			2413, //Melting Point in C
 			4555,
 			-1,
@@ -266,7 +266,7 @@ public final class ALLOY {
 	public static final Material STELLITE = new Material(
 			"Stellite", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{129, 75, 120, 0}, //Material Colour
+			null, //Material Colour
 			4310, //Melting Point in C
 			6250,
 			-1,
@@ -283,7 +283,7 @@ public final class ALLOY {
 	public static final Material TALONITE = new Material(
 			"Talonite", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{228, 75, 120, 0}, //Material Colour
+			null, //Material Colour
 			3454, //Melting Point in C
 			5500,
 			-1,
@@ -300,7 +300,7 @@ public final class ALLOY {
 	public static final Material HASTELLOY_W = new Material(
 			"Hastelloy-W", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{218, 165, 32, 0}, //Material Colour
+			null, //Material Colour
 			3350, //Melting Point in C
 			5755,
 			-1,
@@ -318,7 +318,7 @@ public final class ALLOY {
 	public static final Material HASTELLOY_X = new Material(
 			"Hastelloy-X", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{255, 193, 37, 0}, //Material Colour
+			null, //Material Colour
 			3350, //Melting Point in C
 			5755,
 			-1,
@@ -337,7 +337,7 @@ public final class ALLOY {
 	public static final Material HASTELLOY_N = new Material(
 			"Hastelloy-N", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{236, 213, 48, 0}, //Material Colour
+			null, //Material Colour
 			4350, //Melting Point in C
 			6875,
 			-1,
@@ -355,7 +355,7 @@ public final class ALLOY {
 	public static final Material HASTELLOY_C276 = new Material(
 			"Hastelloy-C276", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{238, 180, 34, 0}, //Material Colour
+			null, //Material Colour
 			4350, //Melting Point in C
 			6520,
 			-1,
@@ -374,7 +374,7 @@ public final class ALLOY {
 	public static final Material INCOLOY_020 = new Material(
 			"Incoloy-020", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{101, 81, 71, 0}, //Material Colour
+			null, //Material Colour
 			3425, //Melting Point in C
 			5420,
 			-1,
@@ -391,7 +391,7 @@ public final class ALLOY {
 	public static final Material INCOLOY_DS = new Material(
 			"Incoloy-DS", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{71, 101, 81, 0}, //Material Colour
+			null, //Material Colour
 			3425, //Melting Point in C
 			5420,
 			-1,
@@ -408,7 +408,7 @@ public final class ALLOY {
 	public static final Material INCOLOY_MA956 = new Material(
 			"Incoloy-MA956", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{81, 71, 101, 0}, //Material Colour
+			null, //Material Colour
 			4425, //Melting Point in C
 			6875,
 			-1,
@@ -523,7 +523,7 @@ public final class ALLOY {
 	public static final Material EGLIN_STEEL_BASE = new Material(
 			"Eglin Steel Base Compound", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{139,69,19, 0}, //Material Colour
+			null, //Material Colour
 			-1, //Melting Point in C
 			-1, //Boiling Point in C
 			-1,
@@ -579,7 +579,7 @@ public final class ALLOY {
 	public static final Material TRINIUM_TITANIUM = new Material(
 			"Trinium Titanium Alloy", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{239,210,200, 0}, //Material Colour
+			null, //Material Colour
 			3750, //Melting Point in C
 			7210, //Boiling Point in C
 			-1,
@@ -592,7 +592,7 @@ public final class ALLOY {
 	public static final Material TRINIUM_NAQUADAH = new Material(
 			"Trinium Naquadah Alloy", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{255, 243, 117, 0}, //Material Colour
+			null, //Material Colour
 			4200, //Melting Point in C
 			7400, //Boiling Point in C
 			-1,
@@ -605,7 +605,7 @@ public final class ALLOY {
 	public static final Material TRINIUM_NAQUADAH_CARBON = new Material(
 			"Trinium Naquadah Carbonite", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{255, 233, 0, 0}, //Material Colour
+			null, //Material Colour
 			6500, //Melting Point in C
 			9000, //Boiling Point in C
 			-1,
@@ -645,7 +645,7 @@ public final class ALLOY {
 	public static final Material LAFIUM = new Material(
 			"Lafium Compound", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{75,180,255, 0}, //Material Colour
+			null, //Material Colour
 			6750, //Melting Point in C
 			9865, //Boiling Point in C
 			-1,
@@ -667,7 +667,7 @@ public final class ALLOY {
 	public static final Material CINOBITE = new Material(
 			"Cinobite A243", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{255,75,45, 0}, //Material Colour
+			null, //Material Colour
 			7350, //Melting Point in C
 			12565, //Boiling Point in C
 			-1,
@@ -689,7 +689,7 @@ public final class ALLOY {
 	public static final Material PIKYONIUM = new Material(
 			"Pikyonium 64B", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{110,255,20, 0}, //Material Colour
+			null, //Material Colour
 			7850, //Melting Point in C
 			11765, //Boiling Point in C
 			-1,
@@ -711,7 +711,7 @@ public final class ALLOY {
 	public static final Material ABYSSAL = new Material(
 			"Abyssal Alloy", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{85,0,85, 0}, //Material Colour
+			null, //Material Colour
 			9650, //Melting Point in C
 			13765, //Boiling Point in C
 			-1,
@@ -733,7 +733,7 @@ public final class ALLOY {
 	public static final Material QUANTUM = new Material(
 			"Quantum", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{128, 128, 255, 50}, //Material Colour
+			null, //Material Colour
 			9500, //Melting Point in C
 			25000, //Boiling Point in C
 			150, //Protons
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 5ff593da3f..675b04c14f 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.material;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.data.StringUtils;
@@ -53,7 +54,7 @@ public final class ELEMENT {
 	public final Material ZIRCONIUM = new Material("Zirconium", MaterialState.SOLID, new short[]{255, 250, 205}, 1855, 4377, 40, 51, false, "Zr", 0);//Not a GT Inherited Material
 	public final Material NIOBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Niobium);
 	public final Material MOLYBDENUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Molybdenum);
-	public final Material TECHNETIUM = new Material("Technetium", MaterialState.SOLID, new short[]{220, 220, 220}, 2200, 4877, 43, 55, false, "Tc", 2);//Not a GT Inherited Material
+	public final Material TECHNETIUM = new Material("Technetium", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 220, 220}, 2200, 4877, 43, 55, false, "Tc", 2);//Not a GT Inherited Material
 	public final Material RUTHENIUM  = new Material("Ruthenium", MaterialState.SOLID, new short[]{220, 220, 220}, 2250, 3900, 44, 57, false, "Ru", 0);//Not a GT Inherited Material
 	public final Material RHODIUM = new Material("Rhodium", MaterialState.SOLID, new short[]{220, 220, 220}, 1966, 3727, 45, 58, false, "Rh", 0);//Not a GT Inherited Material
 	public final Material PALLADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Palladium);
@@ -96,34 +97,34 @@ public final class ELEMENT {
 	public final Material THALLIUM = new Material("Thallium", MaterialState.SOLID, new short[]{175, 175, 175}, 304, 1457, 81, 123, false, "Tl", 0);//Not a GT Inherited Material
 	public final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead);
 	public final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth);
-	public final Material POLONIUM = new Material("Polonium", MaterialState.SOLID, new short[]{180, 170, 180}, 254, 962, 84, 125, false, "Po", 1);//Not a GT Inherited Material
-	public final Material ASTATINE = new Material("Astatine", MaterialState.SOLID, new short[]{170, 180, 170}, 302, 337, 85, 125, false, "At", 1);//Not a GT Inherited Material
+	public final Material POLONIUM = new Material("Polonium", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{180, 170, 180}, 254, 962, 84, 125, false, "Po", 1);//Not a GT Inherited Material
+	public final Material ASTATINE = new Material("Astatine", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{170, 180, 170}, 302, 337, 85, 125, false, "At", 1);//Not a GT Inherited Material
 	public final Material RADON = MaterialUtils.generateMaterialFromGtENUM(Materials.Radon);
-	public final Material FRANCIUM = new Material("Francium", MaterialState.SOLID, new short[]{170, 160, 170}, 27, 677, 87, 136, false, "Fr", 1);//Not a GT Inherited Material
-	public final Material RADIUM = new Material("Radium", MaterialState.SOLID, new short[]{165, 165, 165}, 700, 1737, 88, 138, false, "Ra", 1);//Not a GT Inherited Material
-	public final Material ACTINIUM = new Material("Actinium", MaterialState.SOLID, new short[]{150, 165, 165}, 1050, 3200, 89, 138, false, "Ac", 1);//Not a GT Inherited Material
+	public final Material FRANCIUM = new Material("Francium", MaterialState.SOLID,  TextureSets.NUCLEAR.get(), new short[]{170, 160, 170}, 27, 677, 87, 136, false, "Fr", 1);//Not a GT Inherited Material
+	public final Material RADIUM = new Material("Radium", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{165, 165, 165}, 700, 1737, 88, 138, false, "Ra", 1);//Not a GT Inherited Material
+	public final Material ACTINIUM = new Material("Actinium", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{150, 165, 165}, 1050, 3200, 89, 138, false, "Ac", 1);//Not a GT Inherited Material
 	public final Material THORIUM = new Material("Thorium", MaterialState.SOLID, Materials.Thorium.mRGBa, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, StringUtils.superscript("Th"), 1);
-	public final Material PROTACTINIUM = new Material("Protactinium", MaterialState.SOLID, new short[]{190, 150, 170}, 1568, 4027, 91, 140, false, "Pa", 1);//Not a GT Inherited Material
+	public final Material PROTACTINIUM = new Material("Protactinium", MaterialState.SOLID,  TextureSets.NUCLEAR.get(), new short[]{190, 150, 170}, 1568, 4027, 91, 140, false, "Pa", 1);//Not a GT Inherited Material
 	public final Material URANIUM238 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium);
 	public final Material URANIUM235 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium235);
-	public final Material NEPTUNIUM = new Material("Neptunium", MaterialState.SOLID, new short[]{200, 220, 205}, 640, 3902, 93, 144, false, "Np", 2);//Not a GT Inherited Material
+	public final Material NEPTUNIUM = new Material("Neptunium", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{200, 220, 205}, 640, 3902, 93, 144, false, "Np", 2);//Not a GT Inherited Material
 	public final Material PLUTONIUM244 = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium);
 	public final Material PLUTONIUM241 = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium241);
 	public final Material AMERICIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Americium); //Americium
-	public final Material CURIUM = new Material("Curium", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{175, 85, 110}, 1340, 3110, 96, 151, false, "Cm", 3);//Not a GT Inherited Material
-	public final Material BERKELIUM = new Material("Berkelium", MaterialState.SOLID, new short[]{110, 250, 85}, 985, 710, 97, 150, false, "Bk", 4);//Not a GT Inherited Material
-	public final Material CALIFORNIUM = new Material("Californium", MaterialState.SOLID, new short[]{85, 110, 205}, 899, 1472, 98, 153, false, "Cf", 4);//Not a GT Inherited Material
-	public final Material EINSTEINIUM = new Material("Einsteinium", MaterialState.SOLID, new short[]{255, 85, 110}, 860, 3500, 99, 153, false, "Es", 5);//Not a GT Inherited Material //Boiling Point is made up
-	public final Material FERMIUM = new Material("Fermium", MaterialState.LIQUID, new short[]{75, 90, 25}, 1527, 3850, 100, 157, false, "Fm", 5);//Not a GT Inherited Material //Boiling Point is made up
+	public final Material CURIUM = new Material("Curium", MaterialState.SOLID,  TextureSets.NUCLEAR.get(), new short[]{175, 85, 110}, 1340, 3110, 96, 151, false, "Cm", 3);//Not a GT Inherited Material
+	public final Material BERKELIUM = new Material("Berkelium", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{110, 250, 85}, 985, 710, 97, 150, false, "Bk", 4);//Not a GT Inherited Material
+	public final Material CALIFORNIUM = new Material("Californium", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{85, 110, 205}, 899, 1472, 98, 153, false, "Cf", 4);//Not a GT Inherited Material
+	public final Material EINSTEINIUM = new Material("Einsteinium", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{255, 85, 110}, 860, 3500, 99, 153, false, "Es", 5);//Not a GT Inherited Material //Boiling Point is made up
+	public final Material FERMIUM = new Material("Fermium", MaterialState.LIQUID, TextureSets.NUCLEAR.get(), new short[]{75, 90, 25}, 1527, 3850, 100, 157, false, "Fm", 5);//Not a GT Inherited Material //Boiling Point is made up
 
 	//Misc
-	public final Material AER = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedAir);
-	public final Material IGNIS = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire);
-	public final Material TERRA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEarth);
-	public final Material AQUA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedWater);
+	public final Material AER = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedAir, TextureSets.GEM_A.get());
+	public final Material IGNIS = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire, TextureSets.GEM_A.get());
+	public final Material TERRA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEarth, TextureSets.GEM_A.get());
+	public final Material AQUA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedWater, TextureSets.GEM_A.get());
 	
 	//Fictional	
-	public final Material YELLORIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yellorium, new short[] {255, 242, 10});
+	public final Material YELLORIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yellorium, new short[] {255, 242, 10}, TextureSets.NUCLEAR.get());
 	public final Material NAQUADAH = MaterialUtils.generateMaterialFromGtENUM(Materials.Naquadah);
 	public final Material NAQUADAH_ENRICHED = MaterialUtils.generateMaterialFromGtENUM(Materials.NaquadahEnriched);
 	public final Material NAQUADRIA = MaterialUtils.generateMaterialFromGtENUM(Materials.Naquadria);
@@ -134,15 +135,15 @@ public final class ELEMENT {
 	
 	//Custom Isotopes
 	public final Material LITHIUM7 = new Material("Lithium 7", MaterialState.LIQUID, TextureSet.SET_SHINY, Materials.Lithium.mRGBa, Materials.Lithium.mMeltingPoint, Materials.Lithium.mBlastFurnaceTemp, Materials.Lithium.getProtons(), Materials.Lithium.getNeutrons(), Materials.Lithium.mBlastFurnaceRequired, StringUtils.superscript("7Li"), 0, false);//Not a GT Inherited Material
-	public final Material URANIUM232 = new Material("Uranium 232", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{88, 220, 103, 0}, 1132, 4131, 92, 140, false, StringUtils.superscript("232U"), 4);//Not a GT Inherited Material
-	public final Material URANIUM233 = new Material("Uranium 233", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, StringUtils.superscript("233U"), 2);//Not a GT Inherited Material
-	public final Material THORIUM232 = new Material("Thorium 232", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, StringUtils.superscript("232Th"), 1, false);//Not a GT Inherited Material
-	public final Material PLUTONIUM239 = new Material("Plutonium-239", MaterialState.SOLID, Materials.Plutonium.mIconSet, Materials.Plutonium.mDurability, Materials.Plutonium.mRGBa, Materials.Plutonium.mMeltingPoint, Materials.Plutonium.mBlastFurnaceTemp, 94, 145, false, StringUtils.superscript("239Pu"), 4, true);//Not a GT Inherited Material
+	public final Material URANIUM232 = new Material("Uranium 232", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{88, 220, 103, 0}, 1132, 4131, 92, 140, false, StringUtils.superscript("232U"), 4);//Not a GT Inherited Material
+	public final Material URANIUM233 = new Material("Uranium 233", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, StringUtils.superscript("233U"), 2);//Not a GT Inherited Material
+	public final Material THORIUM232 = new Material("Thorium 232", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, StringUtils.superscript("232Th