+ Added recipe for heating Titanium Ingots, required for Krypton processing.

+ Added custom GT TextureSets.
$ Lots of small fixes to Material, Material Generation & Recipe Generation.
$ Lots of small fixes to Fluids, Fluid Generation and Fluid Cell Generation.
$ Fixed Creative Tabs.
$ Possibly fixed issue where tickable items would instantly tick to 0.
$ Fixed display names of Throwable Potions.
$ Fixed NPE in removeCrudeTurbineRotors().
% Adjusted lots of textures.
% Adjusted handling of Thermal Foundation Fluids.
% Moved Furnace/EBF and Maceration recipes out of BaseItemDust.java.
% Made Tooltips of GT++ Material Blocks, Frames and ores more informational.
% Made Bromine a Fluid Material, this will remove all Bromine solid material items from the world. (Ingots, Blocks, etc.)
% Increased cost of GT++ Ores in processing.
- Broke lots of recipes.
> EBF/ABS & All Table Crafting. TBA~

31 files changed, 1386 insertions, 543 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/Java/gtPlusPlus/api/objects/data/TypeCounter.java
new file mode 100644
index 0000000000..3d562bf76e
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/data/TypeCounter.java
@@ -0,0 +1,178 @@
+package gtPlusPlus.api.objects.data;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import gtPlusPlus.api.objects.Logger;
+
+
+public class TypeCounter<V> implements Set<V> {
+
+	private Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<String, InternalTypeCounterObject<V>>();
+	private String mHighestValueKey;
+	private int mHighestValue = 0;
+	private final Class mClass;
+
+	public TypeCounter(Class o) {
+		Logger.INFO("Created new TypeCounter for "+o.getName());
+		mClass = o;
+	}
+
+	public static class InternalTypeCounterObject<Z> {
+		private final Z mObject;
+		private int mCounter = 0;
+
+		public InternalTypeCounterObject(Z o) {
+			mObject = o;
+		}
+
+		public String hash() {
+			return String.valueOf(mObject.hashCode());
+		}
+
+		public Z get() {
+			return mObject;
+		}
+
+		public void add() {
+			mCounter++;
+		}
+
+		public int count() {
+			return mCounter;
+		}
+
+	}
+
+	public boolean add(V arg0) {
+		return add(arg0, null);
+	}
+
+	public boolean add(V arg0, String aKeyName) {
+		String aKey = aKeyName != null ? aKeyName : arg0.toString();
+		InternalTypeCounterObject<V> aValue = mInternalMap.get(aKey);
+		if (aValue == null) {
+			aValue = new InternalTypeCounterObject<V>((V) arg0);
+			Logger.INFO("Adding new key to map: "+aKey);
+		}
+		aValue.add();
+		int a = aValue.count();
+		if (a > mHighestValue) {
+			mHighestValue = a;
+			mHighestValueKey = aKey;
+			Logger.INFO("New Highest Count - "+aKey+":"+a);
+		}		
+		mInternalMap.put(aKey, aValue);
+		Logger.INFO(aKey+":"+a);
+		return true;
+	}
+
+	@Override
+	public boolean addAll(Collection arg0) {
+		boolean aReturn = true;
+		for (Object o : arg0) {
+			if (mClass.isInstance(o)) {
+				V j = (V) o;
+				boolean b = add(j);
+				if (!b) {
+					aReturn = false;
+				}
+			}			
+		}
+		return aReturn;
+	}
+
+	@Override
+	public void clear() {
+		mInternalMap.clear();		
+	}
+
+	@Override
+	public boolean contains(Object arg0) {
+		return mInternalMap.containsKey(arg0.toString());
+	}
+
+	@Override
+	public boolean containsAll(Collection arg0) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return mInternalMap.isEmpty();
+	}
+
+	@Override
+	public Iterator iterator() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean remove(Object arg0) {		
+		InternalTypeCounterObject<V> aValue = mInternalMap.remove(arg0.toString());
+		if (aValue != null) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
+	@Override
+	public boolean removeAll(Collection arg0) {
+		boolean aReturn = true;
+		for (Object o : arg0) {
+			boolean a = remove(o);
+			if (!a) {
+				aReturn = false;
+			}
+		}
+		return aReturn;
+	}
+
+	@Override
+	public boolean retainAll(Collection arg0) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public int size() {
+		return this.mInternalMap.size();
+	}
+
+	@Override
+	public Object[] toArray() {
+		Object[] aArray = new Object[this.mInternalMap.size()];
+		int aPos = 0;
+		for (String k : this.mInternalMap.keySet()) {
+			if (k != null) {
+				InternalTypeCounterObject<V> aVal = this.mInternalMap.get(k);
+				aArray[aPos++] = new Pair<String, InternalTypeCounterObject<V>>(k, aVal);
+			}
+		}
+		return aArray;		
+	}
+
+	@Override
+	public V[] toArray(Object[] a) {
+		Object[] aArray = new Object[a.length];
+		int aPos = 0;
+		for (Object k : a) {
+			if (k != null) {
+				aArray[aPos++] = k;
+			}
+		}
+		return (V[]) aArray;
+	}
+
+	public V getResults() {
+		InternalTypeCounterObject<V> x = mInternalMap.get(mHighestValueKey);
+		return x.get();
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
index 101e568188..634dc4c022 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -6,7 +6,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.world.IBlockAccess;
-
+import gregtech.api.enums.TextureSet;
 import gregtech.api.util.GT_OreDictUnificator;
 
 import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock;
@@ -26,17 +26,17 @@ public class BlockBaseModular extends BasicBlock {
 	protected String thisBlockMaterial;
 	protected final String thisBlockType;
 
+	public BlockBaseModular(final Material material, final BlockTypes blockType) {
+		this(material, blockType, material.getRgbAsHex());
+	}
+	
 	public BlockBaseModular(final Material material, final BlockTypes blockType, final int colour) {
 		this(material.getUnlocalizedName(), material.getLocalizedName(), net.minecraft.block.material.Material.iron,
-				blockType, colour, 2);
-	}
-
-	public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType,
-			final int colour) {
-		this(unlocalizedName, blockMaterial, net.minecraft.block.material.Material.iron, blockType, colour, 2);
+				blockType, colour, Math.min(Math.max(material.vTier, 1), 5));
+		blockMaterial = material;
 	}
 
-	public BlockBaseModular(final String unlocalizedName, final String blockMaterial,
+	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);
@@ -57,7 +57,7 @@ public class BlockBaseModular extends BasicBlock {
 					ItemUtils.getSimpleStack(this));
 		}
 		else if (this.thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())) {
-			GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class,
+			GameRegistry.registerBlock(this, ItemBlockGtBlock.class,
 					Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
 			GT_OreDictUnificator.registerOre(
 					"frameGt" + getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "")
@@ -111,12 +111,27 @@ public class BlockBaseModular extends BasicBlock {
 		return false;
 	}
 
+	public Material getMaterialEx(){
+		return this.blockMaterial;
+	}
+
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(final IIconRegister iIcon) {
-		if (this.thisBlock != BlockTypes.ORE) {
-			this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture());
-		}
+			if (!CORE.ConfigSwitches.useGregtechTextures || this.blockMaterial == null || this.thisBlock == BlockTypes.ORE){
+				this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture());
+			}
+			String metType = "9j4852jyo3rjmh3owlhw9oe"; 
+			if (this.blockMaterial != null) {
+				TextureSet u = this.blockMaterial.getTextureSet();
+				if (u != null) {
+					metType = u.mSetName;				
+				}
+			}		
+			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);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
index ab1fd5e08a..526f2b245c 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -35,7 +35,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 		this.setHardness(2.0f);
 		this.setResistance(6.0F);
 		this.setLightLevel(0.0F);
-		this.setHarvestLevel("pickaxe", 3);
+		this.setHarvestLevel("pickaxe", Math.min(Math.max(material.vTier, 1), 5));
 		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
new file mode 100644
index 0000000000..d7bbecd6c7
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/client/CustomTextureSet.java
@@ -0,0 +1,27 @@
+package gtPlusPlus.core.client;
+
+import gregtech.api.enums.TextureSet;
+
+public class CustomTextureSet extends TextureSet {
+
+	public static enum TextureSets {
+		
+		REFINED(),
+		GEM_A(),
+		ENRICHED();
+
+		private final CustomTextureSet A;
+		
+		private TextureSets (){
+			A = new CustomTextureSet(this.name().toUpperCase());
+		}		
+		public CustomTextureSet get() {
+			return A;
+		}
+	}
+	
+	public CustomTextureSet(String aSetName) {
+		super(aSetName);
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index c9ea0f3e5b..9e75cd4a16 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -45,12 +45,13 @@ public class CommonProxy {
 		//Should Register Gregtech Materials I've Made
 		Utils.registerEvent(this);
 		if (LoadedMods.Gregtech){
-			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
-				Logger.INFO("We're using Gregtech 5.09 Experimental.");
+			if (!CORE.GTNH) {
+				Logger.INFO("We're using Gregtech "+Utils.getGregtechVersionAsString());				
 			}
 			else {
-				Logger.INFO("We're using Gregtech 5.08 or an earlier fork.");
+				Logger.INFO("We're using GTNH's Gregtech "+Utils.getGregtechVersionAsString());				
 			}
+			
 			Logger.INFO("Setting up our own GT_Proxy.");
 			GtProxy = new Meta_GT_Proxy();
 		}
@@ -74,6 +75,8 @@ public class CommonProxy {
 		else {
 			Logger.WARNING("Development mode not set.");
 		}
+
+		AddToCreativeTab.initialiseTabs();
 		
 		//Moved from Init after Debug Loading.
 		//29/01/18 - Alkalus
@@ -83,7 +86,6 @@ public class CommonProxy {
 		ModBlocks.init();
 		CI.preInit();
 		
-		AddToCreativeTab.initialiseTabs();
 		
 		
 		COMPAT_IntermodStaging.preInit();
diff --git a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java
index 8e6d38f301..218bef46bd 100644
--- a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java
+++ b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.creative;
 
 import net.minecraft.creativetab.CreativeTabs;
-
+import gregtech.api.util.GT_CreativeTab;
 import gtPlusPlus.core.creative.tabs.*;
 import gtPlusPlus.xmod.bop.creative.MiscUtilsBOPTab;
 
@@ -16,11 +16,20 @@ public class AddToCreativeTab {
 	public static CreativeTabs tabBOP;
 
 	public static void initialiseTabs() {
-		tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab");
+		//GT_CreativeTab
+		/*tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab");
 		tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab");
 		tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab");
 		tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab");
 		tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab");
-		tabBOP = new MiscUtilsBOPTab("MiscUtilBOP");
+		tabBOP = new MiscUtilsBOPTab("MiscUtilBOP");*/
+		
+		tabBlock = new GT_CreativeTab("GTPP_BLOCKS", "GT++ Blocks");
+		tabMisc = new GT_CreativeTab("GTPP_MISC", "GT++ Misc");
+		tabTools = new GT_CreativeTab("GTPP_TOOLS", "GT++ Tools");
+		tabMachines = new GT_CreativeTab("GTPP_MACHINES", "GT++ Machines");
+		tabOther = new GT_CreativeTab("GTPP_OTHER", "GT++ Other");
+		tabBOP = new GT_CreativeTab("GTPP_OTHER_2", "GT++ Other II");
+		
 	}
 }
diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
index 3af79c7305..2851a514d0 100644
--- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
@@ -1,8 +1,10 @@
 package gtPlusPlus.core.creative.tabs;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
-
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.block.ModBlocks;
 
 public class MiscUtilCreativeTabBlock extends CreativeTabs {
@@ -13,7 +15,13 @@ public class MiscUtilCreativeTabBlock extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return Item.getItemFromBlock(ModBlocks.blockCompressedObsidian);
+		return Item.getItemFromBlock(Blocks.bedrock);
 	}
+	
+    @SideOnly(Side.CLIENT)
+	@Override
+    public int func_151243_f(){
+        return 0;
+    }
 
 }
diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java
index 9f145cf581..96c809c4da 100644
--- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.creative.tabs;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 
 import gtPlusPlus.core.item.ModItems;
@@ -14,7 +15,7 @@ public class MiscUtilCreativeTabMachines extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return ModItems.itemAlkalusDisk;
+		return Items.netherbrick;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java
index 17c56f68af..a67668bbf0 100644
--- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.creative.tabs;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 
 import gtPlusPlus.core.item.ModItems;
@@ -13,7 +14,7 @@ public class MiscUtilCreativeTabMisc extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return ModItems.AAA_Broken;
+		return Items.painting;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java
index 156086081e..afd89346c0 100644
--- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.creative.tabs;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 
 import gtPlusPlus.core.item.ModItems;
@@ -13,7 +14,7 @@ public class MiscUtilCreativeTabOther extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return ModItems.backpack_Green;
+		return Items.repeater;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java
index b68eccd0e4..ab1ab069de 100644
--- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.creative.tabs;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 
 import gtPlusPlus.core.item.ModItems;
@@ -13,7 +14,7 @@ public class MiscUtilCreativeTabTools extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return ModItems.itemStaballoyPickaxe;
+		return Items.diamond_pickaxe;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 5b8e8ab2a1..0e21e9b154 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -22,10 +22,12 @@ import gtPlusPlus.core.common.compat.COMPAT_Baubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.handler.OldCircuitHandler;
 import gtPlusPlus.core.item.base.*;
+import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
 import gtPlusPlus.core.item.base.foil.BaseItemFoil;
 import gtPlusPlus.core.item.base.foods.BaseItemFood;
 import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
 import gtPlusPlus.core.item.base.gears.BaseItemSmallGear;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD;
 import gtPlusPlus.core.item.base.misc.BaseItemMisc;
 import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes;
@@ -56,6 +58,7 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.*;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.debug.DEBUG_INIT;
@@ -275,6 +278,8 @@ public final class ModItems {
 
 	public static Item itemControlCore;
 
+	public static ItemStack itemHotTitaniumIngot;
+
 	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.
@@ -347,7 +352,7 @@ public final class ModItems {
 		itemGemShards = new ItemGemShards("itemGemShards", "Gem Shards", AddToCreativeTab.tabMisc, 32, 0, "They glitter in the light", EnumRarity.rare, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(182, 114, 18)).setTextureName(CORE.MODID + ":itemHeliumBlob");
 		itemHalfCompleteCasings = new ItemHalfCompleteCasings("itemHalfCompleteCasings", AddToCreativeTab.tabMisc, 32, 0, "This isn't quite finished yet.", EnumRarity.common, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(255, 255, 255)).setTextureName("gregtech" + ":" + "gt.metaitem.01/" + "761");
 		itemSulfuricPotion = new ItemSulfuricAcidPotion("itemSulfuricPotion", "Throwable Vial of Sulfuric Acid", "Burn your foes alive!").setTextureName(CORE.MODID + ":itemSulfuricAcidPotion");
-		itemHydrofluoricPotion = new ItemHydrofluoricAcidPotion("itemHydrofluoricPotion", "Thowable Vial of Hydrofluoric Acid", "They won't see this coming, nor anything after!").setTextureName(CORE.MODID + ":itemPotion");
+		itemHydrofluoricPotion = new ItemHydrofluoricAcidPotion("itemHydrofluoricPotion", "Throwable Vial of Hydrofluoric Acid", "They won't see this coming, nor anything after!").setTextureName(CORE.MODID + ":itemPotion");
 		//Start meta Item Generation
 		ItemsFoods.load();
 
@@ -599,7 +604,8 @@ public final class ModItems {
 
 		//FLiBe Fuel Compounds
 		dustLi2BeF4 = ItemUtils.generateSpecialUseDusts("Li2BeF4", "Li2BeF4 Fuel Compound", "Li2BeF4", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe
-		fluidFLiBeSalt = FluidUtils.generateFluid("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100});
+		//fluidFLiBeSalt = ("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}, 0);
+		fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Li2BeF4", new short[]{255, 255, 255, 100}, 0, 743, null, CI.emptyCells(1), 1000, true);
 
 		//LFTR Control Circuit
 		itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Control Circuit", AddToCreativeTab.tabMisc, 1, 0,  new String[] {"Keeps Multiblocks Stable"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
@@ -637,10 +643,10 @@ public final class ModItems {
 				temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1);
 			}
 			if (temp1 != null){
-				FluidUtils.generateFluidNonMolten("Fertiliser", "Fertiliser", 32, new short[]{45, 170, 45, 100}, temp1, temp2);
+				FluidUtils.generateFluidNonMolten("Fertiliser", "Fertiliser", 32, new short[]{45, 170, 45, 100}, temp1, temp2, true);
 			}
-			FluidUtils.generateFluidNonMolten("UN32Fertiliser", "UN-32 Fertiliser", 24, new short[]{55, 190, 55, 100}, null, null);
-			FluidUtils.generateFluidNonMolten("UN18Fertiliser", "UN-18 Fertiliser", 22, new short[]{60, 155, 60, 100}, null, null);
+			FluidUtils.generateFluidNonMolten("UN32Fertiliser", "UN-32 Fertiliser", 24, new short[]{55, 190, 55, 100}, null, null, true);
+			FluidUtils.generateFluidNonMolten("UN18Fertiliser", "UN-18 Fertiliser", 22, new short[]{60, 155, 60, 100}, null, null, true);
 
 			/*GT_Values.RA.addMixerRecipe(
 			arg0, //Item In
@@ -657,7 +663,7 @@ public final class ModItems {
 		}
 
 		//Juice
-		FluidUtils.generateFluidNonMolten("RaisinJuice", "Raisin Juice", 2, new short[]{51, 0, 51, 100}, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("fruitRaisins", 1), 50);
+		FluidUtils.generateFluidNonMolten("RaisinJuice", "Raisin Juice", 2, new short[]{51, 0, 51, 100}, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("fruitRaisins", 1), 50, true);
 
 
 		//Test items
@@ -688,10 +694,10 @@ public final class ModItems {
 
 		//Just an unusual plate needed for some black magic.		
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateClay", 1) == null){
-			itemPlateClay = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay));
+			itemPlateClay = new BaseItemPlate(NONMATERIAL.CLAY);
 		}
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleClay", 1) == null){
-			itemDoublePlateClay = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay));
+			itemDoublePlateClay = new BaseItemPlateDouble(NONMATERIAL.CLAY);
 		}
 
 		//Need this for Mutagenic Frames
@@ -701,18 +707,25 @@ public final class ModItems {
 
 		//A small gear needed for wizardry.
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null){
-			itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron));
+			itemSmallWroughtIronGear = new BaseItemSmallGear(NONMATERIAL.WROUGHT_IRON);
+		}
+		//Krypton Processing
+		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1) == null){
+			itemHotTitaniumIngot = ItemUtils.getSimpleStack(new BaseItemIngot(ELEMENT.getInstance().TITANIUM, ComponentTypes.HOTINGOT));
+		}
+		else {
+			itemHotTitaniumIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1);
 		}
+		GT_Values.RA.addBlastRecipe(ELEMENT.getInstance().TITANIUM.getIngot(1), null, itemHotTitaniumIngot, null, 10 * 20, 512, Materials.Titanium.mBlastFurnaceTemp);
 
 		//Special Sillyness
 		if (true) {
 			
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateSodium", 1) == null){
-				new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium));
+				new BaseItemPlate(ELEMENT.getInstance().SODIUM);
 			}
 			
-			Material meatRaw = MaterialUtils.generateMaterialFromGtENUM(Materials.MeatRaw);
-			meatRaw.setTextureSet(TextureSet.SET_ROUGH);
+			Material meatRaw = NONMATERIAL.MEAT;
 			// A plate of Meat.
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateMeatRaw", 1) == null){
 				itemPlateRawMeat = new BaseItemPlate(meatRaw);
@@ -721,7 +734,7 @@ public final class ModItems {
 			}
 			// A Block of Meat.
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("blockMeatRaw", 1) == null){
-				blockRawMeat  = new BlockBaseModular(meatRaw.getUnlocalizedName(), meatRaw.getLocalizedName(), BlockTypes.STANDARD, meatRaw.getRgbAsHex());
+				blockRawMeat  = new BlockBaseModular(meatRaw, BlockTypes.STANDARD);
 				ItemUtils.registerFuel(ItemUtils.getSimpleStack(blockRawMeat), 900);
 			}
 		}
@@ -734,15 +747,15 @@ public final class ModItems {
 
 		//A plate of Lithium.
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) == null){
-			itemPlateLithium = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Lithium));
+			itemPlateLithium = new BaseItemPlate(ELEMENT.getInstance().LITHIUM);
 		}
 
 		//A plate of Europium.
 		if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null) && CORE.ConfigSwitches.enableCustom_Pipes){
-			itemPlateEuropium = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Europium));
+			itemPlateEuropium = new BaseItemPlate(ELEMENT.getInstance().EUROPIUM);
 		}
 		if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) && CORE.ConfigSwitches.enableCustom_Pipes){
-			itemDoublePlateEuropium = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Europium));
+			itemDoublePlateEuropium = new BaseItemPlateDouble(ELEMENT.getInstance().EUROPIUM);
 		}
 
 		dustNeptunium238 = new DustDecayable("dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, new String[] {""+StringUtils.superscript("238Np"), "Result: Plutonium 238 ("+StringUtils.superscript("238Pu")+")"}, ELEMENT.getInstance().PLUTONIUM238.getDust(1).getItem(), 5);
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 558a0605fe..ea0a2bb5eb 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/