Merge pull request #525 from alkcorp/DevTop

+ 6 Months of work, let's get the ball rolling.

25 files changed, 1412 insertions, 728 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index de22821127..8bfcfe2d70 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -288,6 +288,10 @@ public final class ModItems {
 	public static Item itemAirFilter;
 
 	public static Item itemCoalCoke;
+	public static Item itemCactusCharcoal;
+	public static Item itemSugarCharcoal;
+	public static Item itemCactusCoke;
+	public static Item itemSugarCoke;
 
 	public static Item itemCircuitLFTR;
 
@@ -394,11 +398,8 @@ public final class ModItems {
 		//Some Simple forms of materials
 		itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
 		GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
-		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemStickyRubber", 1));
-
-
-		itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "fuelCoke", 3200, 0).setTextureName(CORE.MODID + ":itemCoalCoke");
-
+		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemStickyRubber", 1));		
+		
 		//Register Hydrogen Blobs first, so we can replace old helium blobs.
 		itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
 		//Register Old Helium Blob, this will be replaced when held by a player.
@@ -564,9 +565,9 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE);
 
 			//LFTR Fuel components
-			MaterialGenerator.generate(FLUORIDES.HYDROXIDE); //LFTR fuel component
-			MaterialGenerator.generate(FLUORIDES.AMMONIA); //LFTR fuel component
-			MaterialGenerator.generate(FLUORIDES.AMMONIUM); //LFTR fuel component
+			MaterialGenerator.generate(MISC_MATERIALS.HYDROXIDE); //LFTR fuel component
+			MaterialGenerator.generate(MISC_MATERIALS.AMMONIA); //LFTR fuel component
+			MaterialGenerator.generate(MISC_MATERIALS.AMMONIUM); //LFTR fuel component
 			MaterialGenerator.generate(FLUORIDES.AMMONIUM_BIFLUORIDE); //LFTR fuel component
 			MaterialGenerator.generate(FLUORIDES.BERYLLIUM_HYDROXIDE); //LFTR fuel component
 			MaterialGenerator.generate(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); //LFTR fuel component
@@ -1054,10 +1055,10 @@ public final class ModItems {
 			GT_OreDictUnificator.registerOre("platePhasedIron", ItemUtils.getSimpleStack(itemPlatePulsatingIron));
 			GT_OreDictUnificator.registerOre("blockVibrantAlloy", ItemUtils.getItemStackOfAmountFromOreDict("blockPhasedGold", 1));			
 
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(144), 10000, 16, 4*9);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(144), 10000, 16, 4*9);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(16), 10000, 16, 4);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(1294), 10000, 16, 4*9*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), MaterialEIO.REDSTONE_ALLOY.getFluid(16), 16, 4);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), MaterialEIO.REDSTONE_ALLOY.getFluid(1294), 16, 4*9*9);
 			
 		}
 		else {
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 90e831cbb4..9b732e38e1 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -96,7 +96,7 @@ public class BaseItemComponent extends Item{
 		this.extraData = RGBA;
 		this.setTextureName(CORE.MODID + ":" + "item"+ComponentTypes.CELL.COMPONENT_NAME);
 		GameRegistry.registerItem(this, aFormattedNameForFluids);
-		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+aFormattedNameForFluids, ItemUtils.getSimpleStack(this));
+		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+Utils.sanitizeStringKeepBrackets(localName), ItemUtils.getSimpleStack(this));
 		registerComponent();
 	}
 
@@ -165,13 +165,32 @@ public class BaseItemComponent extends Item{
 	public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 
 		try {
+			
+
+			if (this.componentMaterial == null){
+				if (this.materialName != null){
+					//list.add(Utils.sanitizeStringKeepBrackets(materialName));					
+				}				
+			}			
+			
 			if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && (this.componentMaterial != null)){
 
 
 				if (this.componentMaterial != null){
-					if ((!this.componentMaterial.vChemicalFormula.equals("??")) && (!this.componentMaterial.vChemicalFormula.equals("?")) && (this.componentMaterial.getState() != MaterialState.PURE_LIQUID)) {
+					if (!this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
 						list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula));
 					}
+					else if (this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
+						String temp = componentMaterial.vChemicalFormula;
+						temp = temp.replace(" ", "");
+						temp = temp.replace("-", "");
+						temp = temp.replace("_", "");
+						temp = temp.replace("!", "");
+						temp = temp.replace("@", "");
+						temp = temp.replace("#", "");
+						temp = temp.replace(" ", "");				
+						list.add(temp);
+					}
 
 					if (this.componentMaterial.isRadioactive){
 						list.add(CORE.GT_Tooltip_Radioactive);
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index afc4b17354..9022f864cb 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -1,14 +1,10 @@
 package gtPlusPlus.core.item.base.dusts;
 
 import gtPlusPlus.core.item.base.BaseItemComponent;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 
 public class BaseItemDust extends BaseItemComponent {
 
-
-
-	private Material dustInfo;
 	private BaseItemComponent[] mSizedDusts = new BaseItemComponent[2];
 
 	public BaseItemDust(Material aMat) {
@@ -33,127 +29,10 @@ public class BaseItemDust extends BaseItemComponent {
 		}
 	}
 
-	private BaseItemDust(final String unlocalizedName, final String materialName, final Material matInfo, final int colour, final String pileSize, final int tier){
-		this(unlocalizedName, materialName, matInfo, colour, pileSize, tier, true);
-	}
-
 	private BaseItemDust(String unlocalizedName, String materialName, Material matInfo, int colour, String pileSize, int tier, boolean addRecipes) {
 		super(matInfo, ComponentTypes.DUST);
-
-		try {/*
-			this.setUnlocalizedName(unlocalizedName);
-			this.setMaxStackSize(64);
-
-			this.setCreativeTab(tabMisc);
-			this.colour = colour;
-			this.mTier = tier;
-			this.materialName = materialName;
-			this.dustInfo = matInfo;
-			this.setTextureName(this.getCorrectTexture(pileSize));
-			GameRegistry.registerItem(this, unlocalizedName);
-
-			String temp = "";
-			Logger.WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
-			if (this.getUnlocalizedName().contains("item.")){
-				temp = this.getUnlocalizedName().replace("item.", "");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			else {
-				temp = this.getUnlocalizedName();
-			}
-			if (temp.contains("DustTiny")){
-				temp = temp.replace("itemD", "d");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			else if (temp.contains("DustSmall")){
-				temp = temp.replace("itemD", "d");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			else {
-				temp = temp.replace("itemD", "d");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			if ((temp != null) && !temp.equals("")){
-				GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
-			}
-			if (addRecipes){
-				this.addFurnaceRecipe();
-				this.addMacerationRecipe();
-			}		
-		 */}
-		catch (Throwable t) {
-			t.printStackTrace();
-		}
 	}
 
-	private String getCorrectTexture(final String pileSize){
-
-		if (!CORE.ConfigSwitches.useGregtechTextures || this.dustInfo.getTextureSet() == null){
-			if ((pileSize == "dust") || (pileSize == "Dust")){
-				this.setTextureName(CORE.MODID + ":" + "dust");}
-			else{
-				this.setTextureName(CORE.MODID + ":" + "dust"+pileSize);
-			}
-		}
-
-
-		if (pileSize.toLowerCase().contains("small")){
-			return "gregtech" + ":" + "materialicons/"+this.dustInfo.getTextureSet().mSetName+"/dustSmall";
-		}
-		else if (pileSize.toLowerCase().contains("tiny")){
-			return "gregtech" + ":" + "materialicons/"+this.dustInfo.getTextureSet().mSetName+"/dustTiny";
-		}
-		return "gregtech" + ":" + "materialicons/"+this.dustInfo.getTextureSet().mSetName+"/dust";
-	}
-
-	/*	@Override
-	public String getItemStackDisplayName(final ItemStack iStack) {
-
-		String unlocal = super.getItemStackDisplayName(iStack);
-		if (!unlocal.toLowerCase().contains(".name")) {
-			return unlocal;
-		}
-		else {
-			return unlocal;
-		}
-
-	}*/
-
-	/*	@Override
-	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) {
-		try {
-			if (this.dustInfo != null){
-				if (entityHolding instanceof EntityPlayer){
-					if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode){
-						EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.dustInfo.vRadiationLevel, world, entityHolding);	
-					}
-				}
-			}		
-		}
-		catch (Throwable t) {
-			t.printStackTrace();
-		}
-	}*/
-
-	/*@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-
-		if (stack.getDisplayName().toLowerCase().contains("fluorite")){
-			list.add("Mined from Sandstone and Limestone.");
-		}
-		if (this.dustInfo != null){
-			list.add(this.dustInfo.vChemicalFormula);
-		}
-		if (this.dustInfo.vRadiationLevel > 0){
-			list.add(CORE.GT_Tooltip_Radioactive);
-		}
-
-
-		//}
-		super.addInformation(stack, aPlayer, list, bool);
-	}*/
-
 	public static class DustState {
 		static final int NORMAL = (1);
 		static final int SMALL = (10);
@@ -208,8 +87,7 @@ public class BaseItemDust extends BaseItemComponent {
 			else if (amount == 10) {
 				doesThings[0] = false;
 				doesThings[1] = true;
-				doesThings[2] = false;
-				
+				doesThings[2] = false;				
 			}
 			else if (amount == 100) {
 				doesThings[0] = false;
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index e1c3e179ee..e4fa06c58e 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -118,7 +118,7 @@ public class BaseItemDustUnique extends Item{
 
 	private String getCorrectTexture(final String pileSize){
 		if (!CORE.ConfigSwitches.useGregtechTextures){
-			if ((pileSize == "dust") || (pileSize == "Dust")){
+			if ((pileSize.equals("dust")) || (pileSize.equals("Dust"))){
 				this.setTextureName(CORE.MODID + ":" + "dust");}
 			else{
 				this.setTextureName(CORE.MODID + ":" + "dust"+pileSize);
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
index 51b133241b..251230932c 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
@@ -9,10 +9,10 @@ import net.minecraft.item.ItemStack;
 
 import gtPlusPlus.api.interfaces.ITileTooltip;
 
-public class ItemBlockBasicTile extends ItemBlock{
+public class ItemBlockBasicTile extends ItemBlock {
 
 	private final int mID;
-	
+
 	public ItemBlockBasicTile(final Block block) {
 		super(block);
 		this.mID = ((ITileTooltip) block).getTooltipID();
@@ -21,37 +21,50 @@ public class ItemBlockBasicTile extends ItemBlock{
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		if (this.mID == 0){ //Fish trap
-			list.add("This trap catches fish faster if surrounded by more water blocks");	
-			list.add("Can also be placed beside upto 4 other fish traps");	
-			list.add("Requires at least two faces touching water");		
-			list.add("1/1000 chance to produce triple loot.");		
-		}
-		else if (this.mID == 1){ //Modularity
-			list.add("Used to construct modular armour & bauble upgrades..");			
-		}
-		else if (this.mID == 2){ //Trade
-			list.add("Allows for SMP trade-o-mat type trading.");			
-		}
-		else if (this.mID == 3){ //Project
-			list.add("Scan any crafting recipe in this to mass fabricate them in the Autocrafter..");			
-		}
-		else if (this.mID == 4){ //Circuit Table
+		if (this.mID == 0) { // Fish trap
+			list.add("This trap catches fish faster if surrounded by more water blocks");
+			list.add("Can also be placed beside upto 4 other fish traps");
+			list.add("Requires at least two faces touching water");
+			list.add("1/1000 chance to produce triple loot.");
+		} 
+		else if (this.mID == 1) { // Modularity
+			list.add("Used to construct modular armour & bauble upgrades..");
+		} 
+		else if (this.mID == 2) { // Trade
+			list.add("Allows for SMP trade-o-mat type trading.");
+		} 
+		else if (this.mID == 3) { // Project
+			list.add("Scan any crafting recipe in this to mass fabricate them in the Autocrafter..");
+		} 
+		else if (this.mID == 4) { // Circuit Table
 			list.add("Easy Circuit Configuration");
 			list.add("Change default setting with a Screwdriver");
-			list.add("Default is used to select slot for auto-insertion");			
+			list.add("Default is used to select slot for auto-insertion");
+		} 
+		else if (this.mID == 5) { // Decayables Chest
+			list.add("Chest which holds radioactive materials");
+			list.add("Items which decay will tick while inside");
+			list.add("Place with right click");
+		} 
+		else if (this.mID == 6) { // Butterfly Killer
+			list.add("Kills Forestry Butterflies, Bats and other pests");
+			list.add("Use either Formaldehyde or Hydrogen cyanide");
+			list.add("Be weary of your neighbours");
+		} 
+		else if (this.mID == 7) {
+
+		} 
+		else if (this.mID == 8){
+			
 		}
-		else if (this.mID == 5){ //Decayables Chest
-			list.add("Chest which holds radioactive materials");	
-			list.add("Items which decay will tick while inside");	
-			list.add("Place with right click");			
+		else if (this.mID == 9){
+			
 		}
+
 		else {
-			list.add("Bad Tooltip ID - "+mID);
-			
+			list.add("Bad Tooltip ID - " + mID);
 		}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
-	
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java
deleted file mode 100644
index 9badd384d8..0000000000
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gtPlusPlus.core.item.base.itemblock;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-
-import gtPlusPlus.api.interfaces.ITileTooltip;
-
-public class ItemBlockBasicTooltip extends ItemBlock{
-
-	protected final int mID;
-	
-	public ItemBlockBasicTooltip(final Block block) {
-		super(block);
-		this.mID = ((ITileTooltip) block).getTooltipID();
-	}	
-	
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		if (this.mID == 0){ //blockDarkWorldPortalFrame
-			list.add("Assembled in the same shape as the Nether Portal.");			
-		}
-		else if (this.mID == 1){ //Modularity
-			list.add("Used to construct modular armour & bauble upgrades..");			
-		}
-	}
-	
-
-}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
new file mode 100644
index 0000000000..2d0fd00dd9
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
@@ -0,0 +1,110 @@
+package gtPlusPlus.core.item.base.itemblock;
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlockWithMetadata;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
+{
+	private final Block mBlock;
+
+	public ItemBlockRoundRobinator(final Block aBlock){
+		super(aBlock, aBlock);
+		this.mBlock = aBlock;
+	}
+	
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		list.add("Attempts to output items evenly on all four horizontal planes");		
+		if (stack.getItemDamage() == 0) {
+			list.add("1 Item per enabled side every 400 ticks");			
+		}
+		else if (stack.getItemDamage() == 1) {
+			list.add("1 Item per enabled side every 100 ticks");			
+		}
+		else if (stack.getItemDamage() == 2) {
+			list.add("1 Item per enabled side every 20 ticks");			
+		}
+		else if (stack.getItemDamage() == 3) {
+			list.add("1 Item per enabled side every 10 ticks");			
+		}
+		else if (stack.getItemDamage() == 4) {
+			list.add("1 Item per enabled side every tick");			
+		}		
+		list.add("Top and bottom do not pull, so you must push items in");
+		list.add("Sides can also be disabled with a screwdriver");	
+		list.add("Shift+RMB with empty hand to view inventory contents");	
+		super.addInformation(stack, aPlayer, list, bool);		
+	}
+
+	/**
+	 * Gets an icon index based on an item's damage value
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconFromDamage(final int p_77617_1_)
+	{
+		return this.mBlock.getIcon(0, p_77617_1_);
+	}
+
+	/**
+	 * Returns the metadata of the block which this Item (ItemBlock) can place
+	 */
+	@Override
+	public int getMetadata(final int p_77647_1_)
+	{
+		return p_77647_1_;
+	}
+
+	@Override
+	public String getUnlocalizedName(final ItemStack stack) {
+		return this.getUnlocalizedName() + "." + stack.getItemDamage();
+	}
+
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) {
+		return false;
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+		return false;
+	}
+
+	@Override
+	public int getDisplayDamage(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public int getItemEnchantability(ItemStack stack) {
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 277114a6ae..c5b7191ddd 100644
--- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -128,10 +128,20 @@ public class BaseOreComponent extends Item{
 	public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 		if (this.materialName != null && !this.materialName.equals("")){
 			if (this.componentMaterial != null){
-				if (!this.componentMaterial.vChemicalFormula.equals("??") && !this.componentMaterial.vChemicalFormula.equals("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
+				if (!this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
 					list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula));
 				}
-
+				else if (this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
+					String temp = componentMaterial.vChemicalFormula;
+					temp = temp.replace(" ", "");
+					temp = temp.replace("-", "");
+					temp = temp.replace("_", "");
+					temp = temp.replace("!", "");
+					temp = temp.replace("@", "");
+					temp = temp.replace("#", "");
+					temp = temp.replace(" ", "");				
+					list.add(temp);
+				}
 				if (this.componentMaterial.isRadioactive){
 					list.add(CORE.GT_Tooltip_Radioactive+" | Level: "+this.componentMaterial.vRadiationLevel);
 				}
diff --git a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
index 2e40d86473..70de4603e7 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
@@ -90,7 +90,7 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
 		String aString2 = StatCollector.translateToLocal("GTPP.battpack.tooltip.2");
 		String aString3 = StatCollector.translateToLocal("GTPP.battpack.tooltip.3");
 		String aString4 = StatCollector.translateToLocal("GTPP.battpack.tooltip.4");
-		
+
 		String aEU = StatCollector.translateToLocal("GTPP.info.eu");	
 		String aEUT = aEU+"/t";
 
@@ -128,31 +128,34 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
 	@Override // TODO
 	public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase aPlayer) {
 		if (!aPlayer.worldObj.isRemote) {
-			if (this.getCharge(aBaubleStack) >= getTransferLimit(aBaubleStack)) {
-				// Try Iterate Armour Slots of Player
-				if (aPlayer instanceof EntityPlayer) {
-
-					// amour
-					for (final ItemStack aInvStack : ((EntityPlayer) aPlayer).inventory.armorInventory) {
-						if (aInvStack != null) {
-							if (aInvStack == aBaubleStack) {
-								continue;
-							}
-							if (ChargingHelper.isItemValid(aInvStack)) {
-								double aTransferRate = 0;
-								final IElectricItem electricItem = (IElectricItem) aInvStack.getItem();
-								if (electricItem != null) {
-									aTransferRate = electricItem.getTransferLimit(aInvStack);
-									double aItemCharge = ElectricItem.manager.getCharge(aInvStack);
-									if (aItemCharge >= 0 && aItemCharge != electricItem.getMaxCharge(aInvStack)) {
-										if (aItemCharge <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
+
+			try {
+
+				if (this.getCharge(aBaubleStack) >= getTransferLimit(aBaubleStack)) {
+					// Try Iterate Armour Slots of Player
+					if (aPlayer instanceof EntityPlayer) {
+
+						// amour
+						for (final ItemStack aInvStack : ((EntityPlayer) aPlayer).inventory.armorInventory) {
+							if (aInvStack != null) {
+								if (aInvStack == aBaubleStack) {
+									continue;
+								}
+								if (ChargingHelper.isItemValid(aInvStack)) {
+									double aTransferRate = 0;
+									final IElectricItem electricItem = (IElectricItem) aInvStack.getItem();
+									if (electricItem != null) {
+										aTransferRate = electricItem.getTransferLimit(aInvStack);
+										double aItemCharge = ElectricItem.manager.getCharge(aInvStack);
+										if (aItemCharge >= 0 && aItemCharge != electricItem.getMaxCharge(aInvStack)) {
+											if (aItemCharge <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
 												if (ElectricItem.manager.getCharge(aBaubleStack) >= aTransferRate) {
 													if (ElectricItem.manager.getCharge(aInvStack) <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
 														double d = ElectricItem.manager.charge(aInvStack, aTransferRate * 16, mTier, false, true);
 														if (d > 0) {
-														d = ElectricItem.manager.charge(aInvStack, aTransferRate * 16, mTier, false, false);
-														ElectricItem.manager.discharge(aBaubleStack, d, mTier, false, true,	false);
-														//Logger.INFO("Charging " + aInvStack.getDisplayName() + " | " + d	 + " | "+electricItem.getMaxCharge(aInvStack));
+															d = ElectricItem.manager.charge(aInvStack, aTransferRate * 16, mTier, false, false);
+															ElectricItem.manager.discharge(aBaubleStack, d, mTier, false, true,	false);
+															//Logger.INFO("Charging " + aInvStack.getDisplayName() + " | " + d	 + " | "+electricItem.getMaxCharge(aInvStack));
 														}
 													}
 													else {
@@ -167,29 +170,29 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
 												//Logger.INFO("3");
 											}
 
+										}
+										else {
+											//Logger.INFO("1");
+										}
 									}
-									else {
-										//Logger.INFO("1");
-									}
-								}
 
+								}
+							}
+							if (this.getCharge(aBaubleStack) > 0) {
+								continue;
+							} else {
+								break;
 							}
 						}
-						if (this.getCharge(aBaubleStack) > 0) {
-							continue;
-						} else {
-							break;
-						}
-					}
 
-					// Hotbar Slots
-					int aSlotCounter = 0;
-					for (final ItemStack aInvStack : ((EntityPlayer) aPlayer).inventory.mainInventory) {
-						if (aSlotCounter > (InventoryPlayer.getHotbarSize() - 1)) {
-							break;
-						}
-						aSlotCounter++;
-						if (aInvStack != null) {
+						// Hotbar Slots
+						int aSlotCounter = 0;
+						for (final ItemStack aInvStack : ((EntityPlayer) aPlayer).inventory.mainInventory) {
+							if (aSlotCounter > (InventoryPlayer.getHotbarSize() - 1)) {
+								break;
+							}
+							aSlotCounter++;
+							if (aInvStack != null) {
 								if (aInvStack == aBaubleStack) {
 									continue;
 								}
@@ -201,26 +204,26 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
 										double aItemCharge = ElectricItem.manager.getCharge(aInvStack);
 										if (aItemCharge >= 0 && aItemCharge != electricItem.getMaxCharge(aInvStack)) {
 											if (aItemCharge <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
-													if (ElectricItem.manager.getCharge(aBaubleStack) >= aTransferRate) {
-														if (ElectricItem.manager.getCharge(aInvStack) <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
-															double d = ElectricItem.manager.charge(aInvStack, aTransferRate, mTier, false, true);
-															if (d > 0) {
+												if (ElectricItem.manager.getCharge(aBaubleStack) >= aTransferRate) {
+													if (ElectricItem.manager.getCharge(aInvStack) <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
+														double d = ElectricItem.manager.charge(aInvStack, aTransferRate, mTier, false, true);
+														if (d > 0) {
 															d = ElectricItem.manager.charge(aInvStack, aTransferRate, mTier, false, false);
 															ElectricItem.manager.discharge(aBaubleStack, d, mTier, false, true,	false);
 															//Logger.INFO("Charging " + aInvStack.getDisplayName() + " | " + d	 + " | "+electricItem.getMaxCharge(aInvStack));
-															}
-														}
-														else {
-															//Logger.INFO("5");
 														}
 													}
 													else {
-														//Logger.INFO("4");
+														//Logger.INFO("5");
 													}
 												}
 												else {
-													//Logger.INFO("3");
+													//Logger.INFO("4");
 												}
+											}
+											else {
+												//Logger.INFO("3");
+											}
 
 										}
 										else {
@@ -228,16 +231,24 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
 										}
 									}
 								}							
-						}
-						if (this.getCharge(aBaubleStack) > 0) {
-							continue;
-						} else {
-							break;
+							}
+							if (this.getCharge(aBaubleStack) > 0) {
+								continue;
+							} else {
+								break;
+							}
 						}
 					}
-				}
+				}			
 			}
+			catch (Throwable t) {
+
+			}			
 		}
+
+
+
+
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
index 04467091c0..6a8751b682 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
@@ -11,6 +11,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.DevHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -28,7 +29,7 @@ public class FireProtectionBauble extends BaseBauble {
 	private static Field isImmuneToFire;
 	
 	static {
-		isImmuneToFire = ReflectionUtils.getField(Entity.class, "isImmuneToFire");
+		isImmuneToFire = ReflectionUtils.getField(Entity.class, DevHelper.isObfuscatedEnvironment() ? "func_70045_F" : "isImmuneToFire");
 	}
 	
 	public static boolean fireImmune(Entity aEntity) {
@@ -36,7 +37,11 @@ public class FireProtectionBauble extends BaseBauble {
 	}
 	
 	public static boolean setEntityImmuneToFire(Entity aEntity, boolean aImmune) {
-		return ReflectionUtils.setField(aEntity, isImmuneToFire, aImmune);
+		try {
+			return ReflectionUtils.setField(aEntity, isImmuneToFire, aImmune);
+		}
+		catch (Throwable t) {}
+		return false;
 	}	
 	
 	public FireProtectionBauble() {		
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 0c2bdaa3ef..0e23e9a845 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -1,10 +1,12 @@
 package gtPlusPlus.core.item.chemistry;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.List;
 
-import forestry.plugins.PluginCore;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
+import gtPlusPlus.api.helpers.MaterialHelper;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
@@ -14,6 +16,12 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.plugin.agrichem.BioRecipes;
+import gtPlusPlus.plugin.agrichem.item.algae.ItemAgrichemBase;
+import gtPlusPlus.plugin.agrichem.item.algae.ItemAlgaeBase;
+import gtPlusPlus.plugin.agrichem.item.algae.ItemBioChip;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -40,7 +48,8 @@ public class AgriculturalChem extends ItemPackage {
 	public static Fluid FertileManureSlurry;
 	// Blood
 	public static Fluid CustomBlood;
-
+	// Red Mud
+	public static Fluid RedMud;
 	/**
 	 * Items
 	 */
@@ -70,6 +79,64 @@ public class AgriculturalChem extends ItemPackage {
 	// Fertilizer
 
 
+	
+	public static Item mAlgae;
+	public static Item mBioCircuit;
+	public static Item mAgrichemItem1;
+	
+	/*
+	 * 0 - Algae Biomass
+	 * 1 - Green Algae Biomass
+	 * 2 - Brown Algae Biomass
+	 * 3 - Golden-Brown Algae Biomass
+	 * 4 - Red Algae Biomass
+	 * 5 - Cellulose Fiber
+	 * 6 - Golden-Brown Cellulose Fiber
+	 * 7 - Red Cellulose Fiber
+	 * 8 - Compost
+	 * 9 - Wood Pellet
+	 * 10 - Wood Brick
+	 * 11 - Cellulose Pulp
+	 * 12 - Raw Bio Resin
+	 * 13 - Catalyst Carrier
+	 * 14 - Green Metal Catalyst
+	 * 15 - Alginic Acid
+	 * 16 - Alumina
+	 * 17 - Aluminium Pellet
+	 * 18 - Sodium Aluminate
+	 * 19 - Sodium Hydroxide // Exists in Newer GT
+	 * 20 - Sodium Carbonate
+	 * 21 - Lithium Chloride
+	 * 22 - Pellet Mold
+	 * 23 - Clean Aluminium Mix
+	 */
+
+	public static ItemStack mAlgaeBiosmass;
+	public static ItemStack mGreenAlgaeBiosmass;
+	public static ItemStack mBrownAlgaeBiosmass;
+	public static ItemStack mGoldenBrownAlgaeBiosmass;
+	public static ItemStack mRedAlgaeBiosmass;
+	public static ItemStack mCelluloseFiber;
+	public static ItemStack mGoldenBrownCelluloseFiber;
+	public static ItemStack mRedCelluloseFiber;
+	public static ItemStack mCompost;
+	public static ItemStack mWoodPellet;
+	public static ItemStack mWoodBrick;
+	public static ItemStack mCellulosePulp;
+	public static ItemStack mRawBioResin;
+	public static ItemStack mCatalystCarrier;
+	public static ItemStack mGreenCatalyst;
+	public static ItemStack mAlginicAcid;
+	public static ItemStack mAlumina;
+	public static ItemStack mAluminiumPellet;
+	public static ItemStack mSodiumAluminate;
+	public static ItemStack mSodiumHydroxide;
+	public static ItemStack mSodiumCarbonate;
+	public static ItemStack mLithiumChloride;
+	public static ItemStack mPelletMold;
+	public static ItemStack mCleanAluminiumMix;
+	
+
 	@Override
 	public void items() {
 		// Nitrogen, Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
@@ -81,7 +148,100 @@ public class AgriculturalChem extends ItemPackage {
 				"Ca5(PO4)3(OH)", Utils.rgbtoHexValue(240, 240, 240))[0];
 
 		// Dirt Dust :)
-		dustDirt = ItemUtils.generateSpecialUseDusts("Dirt", "Dried Earth", Utils.rgbtoHexValue(65, 50, 15))[0];		
+		dustDirt = ItemUtils.generateSpecialUseDusts("Dirt", "Dried Earth", Utils.rgbtoHexValue(65, 50, 15))[0];	
+		
+		mAlgae = new ItemAlgaeBase();
+		mAgrichemItem1 = new ItemAgrichemBase();
+		mBioCircuit = new ItemBioChip();		
+		GregtechItemList.Circuit_BioRecipeSelector.set(mBioCircuit);
+		
+		
+
+		mAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 0, 1);
+		mGreenAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 1, 1);
+		mBrownAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 2, 1);
+		mGoldenBrownAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 3, 1);
+		mRedAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 4, 1);
+		mCelluloseFiber = ItemUtils.simpleMetaStack(mAgrichemItem1, 5, 1);
+		mGoldenBrownCelluloseFiber = ItemUtils.simpleMetaStack(mAgrichemItem1, 6, 1);
+		mRedCelluloseFiber = ItemUtils.simpleMetaStack(mAgrichemItem1, 7, 1);
+		mCompost = ItemUtils.simpleMetaStack(mAgrichemItem1, 8, 1);
+		mWoodPellet = ItemUtils.simpleMetaStack(mAgrichemItem1, 9, 1);
+		mWoodBrick = ItemUtils.simpleMetaStack(mAgrichemItem1, 10, 1);
+		mCellulosePulp = ItemUtils.simpleMetaStack(mAgrichemItem1, 11, 1);
+		mRawBioResin = ItemUtils.simpleMetaStack(mAgrichemItem1, 12, 1);
+		mCatalystCarrier = ItemUtils.simpleMetaStack(mAgrichemItem1, 13, 1);
+		mGreenCatalyst = ItemUtils.simpleMetaStack(mAgrichemItem1, 14, 1);
+		mAlginicAcid = ItemUtils.simpleMetaStack(mAgrichemItem1, 15, 1);
+		mAlumina = ItemUtils.simpleMetaStack(mAgrichemItem1, 16, 1);
+		mAluminiumPellet = ItemUtils.simpleMetaStack(mAgrichemItem1, 17, 1);
+		mSodiumAluminate = ItemUtils.simpleMetaStack(mAgrichemItem1, 18, 1);
+		
+		/**
+		 * If It exists, don't add a new one.
+		 */
+		if (OreDictionary.doesOreNameExist("dustSodiumHydroxide_GT5U") || OreDictionary.doesOreNameExist("dustSodiumHydroxide")) {
+			List<ItemStack> aTest = OreDictionary.getOres("dustSodiumHydroxide", false);
+			ItemStack aTestStack;
+			if (aTest.isEmpty()) {
+				aTest = OreDictionary.getOres("dustSodiumHydroxide_GT5U", false);
+				if (aTest.isEmpty()) {
+					aTestStack = ItemUtils.simpleMetaStack(mAgrichemItem1, 19, 1);	
+				}
+				else {
+					aTestStack = aTest.get(0);
+				}
+			}
+			else {
+				aTestStack = aTest.get(0);
+			}
+			mSodiumHydroxide = aTestStack;
+		}
+		else {
+			mSodiumHydroxide = ItemUtils.simpleMetaStack(mAgrichemItem1, 19, 1);			
+		}		
+		mSodiumCarbonate = ItemUtils.simpleMetaStack(mAgrichemItem1, 20, 1);
+		mLithiumChloride = ItemUtils.simpleMetaStack(mAgrichemItem1, 21, 1);
+		mPelletMold = ItemUtils.simpleMetaStack(mAgrichemItem1, 22, 1);
+		mCleanAluminiumMix = ItemUtils.simpleMetaStack(mAgrichemItem1, 23, 1);
+
+		ItemUtils.addItemToOreDictionary(mGreenAlgaeBiosmass, "biomassGreenAlgae");
+		ItemUtils.addItemToOreDictionary(mBrownAlgaeBiosmass, "biomassBrownAlgae");
+		ItemUtils.addItemToOreDictionary(mGoldenBrownAlgaeBiosmass, "biomassGoldenBrownAlgae");
+		ItemUtils.addItemToOreDictionary(mRedAlgaeBiosmass, "biomassRedAlgae");
+
+		ItemUtils.addItemToOreDictionary(mCelluloseFiber, "fiberCellulose");
+		ItemUtils.addItemToOreDictionary(mGoldenBrownCelluloseFiber, "fiberCellulose");
+		ItemUtils.addItemToOreDictionary(mGoldenBrownCelluloseFiber, "fiberGoldenBrownCellulose");
+		ItemUtils.addItemToOreDictionary(mRedCelluloseFiber, "fiberCellulose");
+		ItemUtils.addItemToOreDictionary(mRedCelluloseFiber, "fiberRedCellulose");
+		
+		ItemUtils.addItemToOreDictionary(mWoodPellet, "pelletWood");
+		ItemUtils.addItemToOreDictionary(mWoodBrick, "brickWood");
+		ItemUtils.addItemToOreDictionary(mCellulosePulp, "pulpCellulose");
+
+		ItemUtils.addItemToOreDictionary(mCatalystCarrier, "catalystEmpty");
+		ItemUtils.addItemToOreDictionary(mGreenCatalyst, "catalystAluminiumSilver");
+		ItemUtils.addItemToOreDictionary(mAlginicAcid, "dustAlginicAcid");
+		ItemUtils.addItemToOreDictionary(mAlumina, "dustAlumina");
+		ItemUtils.addItemToOreDictionary(mAluminiumPellet, "pelletAluminium");
+
+		ItemUtils.addItemToOreDictionary(mSodiumAluminate, "dustSodiumAluminate");
+		ItemUtils.addItemToOreDictionary(mSodiumHydroxide, "dustSodiumHydroxide");	
+		ItemUtils.addItemToOreDictionary(mSodiumCarbonate, "dustSodiumCarbonate");
+		ItemUtils.addItemToOreDictionary(mLithiumChloride, "dustLithiumChloride");	
+		
+		//Handle GT NaOH dusts
+		List<ItemStack> NaOHSmall = OreDictionary.getOres("dustSmallSodiumHydroxide_GT5U", false);
+		if (!NaOHSmall.isEmpty()) {
+			ItemUtils.addItemToOreDictionary(NaOHSmall.get(0), "dustSmallSodiumHydroxide");				
+		}
+		List<ItemStack> NaOHTiny = OreDictionary.getOres("dustTinySodiumHydroxide_GT5U", false);
+		if (!NaOHTiny.isEmpty()) {
+			ItemUtils.addItemToOreDictionary(NaOHTiny.get(0), "dustTinySodiumHydroxide");				
+		}
+		
+		
 	}
 
 	@Override
@@ -101,7 +261,10 @@ public class AgriculturalChem extends ItemPackage {
 
 		// Sewage
 		FertileManureSlurry = FluidUtils.generateFluidNonMolten("fertile.manure.slurry", "Fertile Manure Slurry",
-				45 + 175, new short[] { 65, 50, 15, 100 }, null, null, 0, true);		
+				45 + 175, new short[] { 65, 50, 15, 100 }, null, null, 0, true);
+		
+		RedMud = FluidUtils.generateFluidNoPrefix("mud.red.slurry", "Red Mud Slurry", 32 + 175, new short[] { 180, 35, 25, 100 }, true);
+		
 	}
 	
 	
@@ -155,20 +318,20 @@ public class AgriculturalChem extends ItemPackage {
 
 	}
 
-	private static AutoMap<ItemStack> mMeats = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mFish = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mFruits = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mVege = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mNuts = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mSeeds = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mPeat = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mBones = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mBoneMeal = new AutoMap<ItemStack>();
-
-	private static AutoMap<ItemStack> mList_Master_Meats = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mList_Master_Bones = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mMeats = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mFish = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mFruits = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mVege = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mNuts = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mSeeds = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mPeat = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mBones = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mBoneMeal = new AutoMap<ItemStack>();
+
+	private final static AutoMap<ItemStack> mList_Master_Meats = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mList_Master_Bones = new AutoMap<ItemStack>();
 
 	private static void processAllOreDict() {
 		processOreDict("listAllmeatraw", mMeats);
@@ -322,6 +485,10 @@ public class AgriculturalChem extends ItemPackage {
 			}
 		}
 	}
+	
+	public static ItemStack aFertForestry;
+	public static ItemStack aFertIC2;
+	
 
 	private static void addMiscRecipes() {
 
@@ -334,19 +501,32 @@ public class AgriculturalChem extends ItemPackage {
 		 * Forestry Support
 		 */
 		if (LoadedMods.Forestry) {
-
-			Item aForestryFert = PluginCore.items.fertilizerCompound;
-
-			CORE.RA.addDehydratorRecipe(
-					new ItemStack[] { CI.getNumberedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
-					null, new ItemStack[] { ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod },
-					new int[] { 10000, 2000, 2000 }, 20 * 20, 240);
+			Field aItemField = ReflectionUtils.getField(ReflectionUtils.getClass("forestry.plugins.PluginCore"), "items");
+			try {
+				Object aItemRegInstance = aItemField != null ? aItemField.get(aItemField) : null;
+				if (aItemRegInstance != null) {
+					Field aFertField = ReflectionUtils.getField(aItemRegInstance.getClass(), "fertilizerCompound");	
+					Object aItemInstance = aFertField.get(aItemRegInstance);
+					if (aItemInstance instanceof Item) {
+						aFertForestry = ItemUtils.getSimpleStack((Item) aItemInstance);
+						Item aForestryFert = (Item) aItemInstance;
+						CORE.RA.addDehydratorRecipe(
+								new ItemStack[] { CI.getNumberedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
+								null, new ItemStack[] { ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod },
+								new int[] { 10000, 2000, 2000 }, 20 * 20, 240);
+					}
+				}
+			}
+			catch (IllegalArgumentException | IllegalAccessException e) {
+				
+			}		
 		}
 
 		/**
 		 * IC2 Support
 		 */
 		if (LoadedMods.IndustrialCraft2) {
+			aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1);
 			CORE.RA.addDehydratorRecipe(
 					new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
 					null, new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod,
@@ -364,8 +544,8 @@ public class AgriculturalChem extends ItemPackage {
 		GT_Values.RA.addCentrifugeRecipe(CI.getNumberedCircuit(20), ItemUtils.getSimpleStack(aManureByprod, 4),
 				FluidUtils.getFluidStack("sulfuricacid", 250), // In Fluid
 				FluidUtils.getFluidStack("sulfuricapatite", 50), // Out Fluid
-				Materials.Phosphorus.getDustSmall(2), Materials.Calcium.getDustSmall(2),
-				Materials.Copper.getDustTiny(1), Materials.Carbon.getDust(1), ItemUtils.getSimpleStack(dustDirt, 1),
+				MaterialHelper.getDustSmall(Materials.Phosphorus, 2), MaterialHelper.getDustSmall(Materials.Calcium, 2),
+				MaterialHelper.getDustTiny(Materials.Copper, 1), MaterialHelper.getDust(Materials.Carbon, 1), ItemUtils.getSimpleStack(dustDirt, 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAmmoniumNitrate", 1),
 				new int[] { 2500, 2500, 750, 1000, 5000, 250 }, // Chances
 				20 * 20, // Time
@@ -380,7 +560,6 @@ public class AgriculturalChem extends ItemPackage {
 
 	@Override
 	public String errorMessage() {
-		// TODO Auto-generated method stub
 		return "Failed to generate recipes for AgroChem.";
 	}
 
@@ -403,6 +582,9 @@ public class AgriculturalChem extends ItemPackage {
 		addAdvancedOrganiseFertRecipes();
 
 		addMiscRecipes();
+		
+		BioRecipes.init();
+		
 		return true;
 	}
 }
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index e060723afd..8428328f37 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -1,23 +1,18 @@
 package gtPlusPlus.core.item.chemistry;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -26,7 +21,6 @@ public class CoalTar extends ItemPackage {
 	public static Fluid Coal_Gas;
 	public static Fluid Coal_Oil;
 	public static Fluid Ethylene;
-	public static Fluid Benzene;
 	public static Fluid Ethylbenzene;
 	public static Fluid Anthracene;
 	public static Fluid Toluene;
@@ -35,10 +29,6 @@ public class CoalTar extends ItemPackage {
 	public static Fluid Sulfuric_Coal_Tar_Oil;
 	public static Fluid Naphthalene;
 	public static Fluid Phthalic_Acid;
-	public static Fluid Ethylanthraquinone2;
-	public static Fluid Ethylanthrahydroquinone2;
-	public static Fluid Hydrogen_Peroxide;
-	public static Fluid Lithium_Peroxide;
 
 	private static void recipeEthylBenzineFuelsIntoHeavyFuel() {
 			CORE.RA.addChemicalRecipe(
@@ -264,85 +254,8 @@ public class CoalTar extends ItemPackage {
 
 	}
 
-	private static void recipe2Ethylanthraquinone() {
-		GT_Values.RA.addChemicalRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 4),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2),
-				null,
-				FluidUtils.getFluidStack("fluid.2ethylanthraquinone", 2000+(144*4)),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
-				20*16);
-
-	}
-
-	private static void recipe2Ethylanthrahydroquinone() {
-		GT_Values.RA.addChemicalRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict("platePalladium", 0),
-				ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthraquinone", 1),
-				FluidUtils.getFluidStack("hydrogen", 500),
-				FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", 1200),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1),
-				20*40);
-
-	}
-
-	private static void recipeHydrogenPeroxide() {		
-		GT_Values.RA.addElectrolyzerRecipe(
-				GT_ModHandler.getAirCell(15),
-				ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthrahydroquinone", 5),
-				FluidUtils.getFluidStack("fluid.anthracene", 50),
-				FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", 4450),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 2),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 18), 
-				null, 
-				null,
-				null,
-				null,
-				new int[]{10000, 10000}, 
-				20*90, 
-				240);		
-	}
-
-
-	private static void recipeLithiumHydroperoxide() {
-		GT_Values.RA.addElectrolyzerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1),
-				FluidUtils.getFluidStack("fluid.cellhydrogenperoxide", 50),
-				null,
-				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 14),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), 
-				null, 
-				null,
-				null,
-				null,
-				new int[]{10000, 10000}, 
-				20*60, 
-				240);		
-	}
-
-
-	private static void recipeLithiumPeroxide() {
-		CORE.RA.addDehydratorRecipe(
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 2),
-						ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 3)
-				}, 
-				null, 
-				null, 
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 2)
-				},
-				new int[]{10000, 10000, 10000}, 
-				20*100, 
-				240);
-	}
-
 	@Override
 	public String errorMessage() {
-		// TODO Auto-generated method stub
 		return "Bad Coal Science!";
 	}
 
@@ -357,11 +270,6 @@ public class CoalTar extends ItemPackage {
 		recipeCoalTarOilToSulfuricOilToNaphthalene();
 		recipeNaphthaleneToPhthalicAcid();
 		recipePhthalicAcidToPhthalicAnhydride();
-		recipe2Ethylanthraquinone();
-		recipe2Ethylanthrahydroquinone();
-		recipeHydrogenPeroxide();
-		recipeLithiumHydroperoxide();
-		recipeLithiumPeroxide();
 		
 		recipeEthylBenzineFuelsIntoHeavyFuel();		
 
@@ -390,7 +298,6 @@ public class CoalTar extends ItemPackage {
 
 	@Override
 	public void blocks() {
-		// TODO Auto-generated method stub
 		
 	}
 
@@ -407,19 +314,11 @@ public class CoalTar extends ItemPackage {
 		
 		
 		//Create Ethylene
-		if (!FluidUtils.doesFluidExist("Ethylene")){
-			Ethylene = FluidUtils.generateFluidNonMolten("Ethylene", "Ethylene", -103, new short[]{255, 255, 255, 100}, null, null);
-		}
-		else {
-			Ethylene = FluidUtils.getWildcardFluidStack("Ethylene", 1).getFluid();
-		}
-		
-		//Create Benzene - (Toluene + Hydrogen | 95% Benzene / 5% methane)
-		if (!FluidUtils.doesFluidExist("NitrousOxide")){
-			Benzene = FluidUtils.generateFluidNonMolten("Benzene", "Benzene", 81, new short[]{150, 75, 0, 100}, null, null);
+		if (!FluidUtils.doesFluidExist("ethylene")){
+			Ethylene = FluidUtils.generateFluidNonMolten("ethylene", "Ethylene", -103, new short[]{255, 255, 255, 100}, null, null);
 		}
 		else {
-			Benzene = FluidUtils.getWildcardFluidStack("Benzene", 1).getFluid();
+			Ethylene = FluidUtils.getWildcardFluidStack("ethylene", 1).getFluid();
 		}
 		
 		//Create Ethylbenzene - Ethylbenzene is produced in on a large scale by combining benzene and ethylene in an acid-catalyzed chemical reaction
@@ -428,13 +327,11 @@ public class CoalTar extends ItemPackage {
 		//Create Anthracene
 		Anthracene = FluidUtils.generateFluidNonMolten("Anthracene", "Anthracene", 340, new short[]{255, 255, 255, 100}, null, null);
 		//Toluene
-		if (!FluidUtils.doesFluidExist("Toluene")){
-			Toluene = FluidUtils.generateFluidNonMolten("Toluene", "Toluene", -95, new short[]{140, 70, 20, 100}, null, null);
+		if (!FluidUtils.doesFluidExist("liquid_toluene")){
+			Toluene = FluidUtils.generateFluidNonMolten("liquid_toluene", "Toluene", -95, new short[]{140, 70, 20, 100}, null, null);
 		}
 		else {
-			Toluene = FluidUtils.getWildcardFluidStack("Toluene", 1).getFluid();
-			Item itemCellToluene = new BaseItemComponent("Toluene", "Toluene", new short[]{140, 70, 20, 100});
-			MaterialGenerator.addFluidCannerRecipe(ItemUtils.getEmptyCell(), ItemUtils.getSimpleStack(itemCellToluene), FluidUtils.getFluidStack(Toluene, 1000), null);
+			Toluene = FluidUtils.getWildcardFluidStack("liquid_toluene", 1).getFluid();
 		}
 
 		//Create Coal Tar
@@ -457,23 +354,6 @@ public class CoalTar extends ItemPackage {
 
 
 
-		//Create 2-Ethylanthraquinone
-		//2-Ethylanthraquinone is prepared from the reaction of phthalic anhydride and ethylbenzene
-		Ethylanthraquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthraquinone", "2-Ethylanthraquinone", 415, new short[]{227, 255, 159, 100}, null, null);
-		//Create 2-Ethylanthrahydroquinone
-		//Palladium plate + Hydrogen(250) + 2-Ethylanthraquinone(500) = 600 Ethylanthrahydroquinone
-		Ethylanthrahydroquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthrahydroquinone", "2-Ethylanthrahydroquinone", 415, new short[]{207, 225, 129, 100}, null, null);
-		//Create Hydrogen Peroxide
-		//Compressed Air(1500) + Ethylanthrahydroquinone(500) + Anthracene(5) = 450 Ethylanthraquinone && 200 Peroxide
-		Hydrogen_Peroxide = FluidUtils.generateFluidNonMolten("HydrogenPeroxide", "Hydrogen Peroxide", 150, new short[]{210, 255, 255, 100}, null, null);
-
-
-
-		//Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
-		//ItemUtils.generateSpecialUseDusts("LithiumHydroperoxide", "Lithium Hydroperoxide", "HLiO2", Utils.rgbtoHexValue(125, 125, 125));
-		// v - Dehydrate
-		//Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
-		Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null);
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index c64ad07d2a..35d2066793 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -1,19 +1,29 @@
 package gtPlusPlus.core.item.chemistry;
 
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.TextureSet;
+import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
+import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.NONMATERIAL;
 import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.plugin.agrichem.item.algae.ItemAgrichemBase;
+import net.minecraft.block.Block;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
 
 public class GenericChem extends ItemPackage {
 
@@ -66,12 +76,18 @@ public class GenericChem extends ItemPackage {
 	public Fluid Putrescine; //https://en.wikipedia.org/wiki/Putrescine
 	
 
+	public static Fluid Ethylanthraquinone2;
+	public static Fluid Ethylanthrahydroquinone2;
+	public static Fluid Hydrogen_Peroxide;
+	public static Fluid Lithium_Peroxide;
+
 	/**
 	 * Items
 	 */
 
 	// Phenol Byproducts
 	public Item PhenolicResins; //https://en.wikipedia.org/wiki/Phenol_formaldehyde_resin
+	public ItemGenericChemBase mGenericChemItem1;
 
 
 
@@ -80,7 +96,46 @@ public class GenericChem extends ItemPackage {
 		PhenolicResins = ItemUtils.generateSpecialUseDusts("phenolicresins", "Phenolic Resin", "HOC6H4CH2OH", Utils.rgbtoHexValue(80, 40, 40))[0];		
 		MaterialGenerator.generate(BAKELITE, false);	
 		MaterialGenerator.generate(NYLON, false);
-		MaterialGenerator.generate(TEFLON, false);
+		MaterialGenerator.generate(TEFLON, false);		
+
+		mGenericChemItem1 = new ItemGenericChemBase();		
+		
+		registerItemStacks();
+		registerOreDict();
+	}
+
+	private ItemStack mCatalystCarrier;
+	
+	public ItemStack mRedCatalyst;
+	public ItemStack mYellowCatalyst;
+	public ItemStack mBlueCatalyst;
+	public ItemStack mOrangeCatalyst;
+	public ItemStack mPurpleCatalyst;
+	public ItemStack mBrownCatalyst;
+	
+	
+	public void registerItemStacks() {
+
+		mCatalystCarrier = ItemUtils.simpleMetaStack(AgriculturalChem.mAgrichemItem1, 13, 1);
+		
+		mRedCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 0, 1);
+		mYellowCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 1, 1);
+		mBlueCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 2, 1);
+		mOrangeCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 3, 1);
+		mPurpleCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 4, 1);
+		mBrownCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 5, 1);
+		
+	}
+	
+	public void registerOreDict() {
+
+		ItemUtils.addItemToOreDictionary(mRedCatalyst, "catalystIronCopper");
+		ItemUtils.addItemToOreDictionary(mYellowCatalyst, "catalystTungstenNickel");
+		ItemUtils.addItemToOreDictionary(mBlueCatalyst, "catalystCobaltTitanium");
+		ItemUtils.addItemToOreDictionary(mOrangeCatalyst, "catalystVanadiumPalladium");
+		ItemUtils.addItemToOreDictionary(mPurpleCatalyst, "catalystIridiumRuthenium");
+		ItemUtils.addItemToOreDictionary(mBrownCatalyst, "catalystNickelAluminium");
+		
 	}
 
 	@Override
@@ -115,18 +170,500 @@ public class GenericChem extends ItemPackage {
 		Cadaverine = FluidUtils.generateFluidNoPrefix("cadaverine", "Cadaverine", 32 + 175,	new short[] { 100, 70, 30, 100 }, true);
 		Putrescine = FluidUtils.generateFluidNoPrefix("putrescine", "Putrescine", 32 + 175,	new short[] { 100, 70, 30, 100 }, true);
 		
+		//Create 2-Ethylanthraquinone
+		//2-Ethylanthraquinone is prepared from the reaction of phthalic anhydride and ethylbenzene
+		Ethylanthraquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthraquinone", "2-Ethylanthraquinone", 415, new short[]{227, 255, 159, 100}, null, null);
+		//Create 2-Ethylanthrahydroquinone
+		//Palladium plate + Hydrogen(250) + 2-Ethylanthraquinone(500) = 600 Ethylanthrahydroquinone
+		Ethylanthrahydroquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthrahydroquinone", "2-Ethylanthrahydroquinone", 415, new short[]{207, 225, 129, 100}, null, null);
+		//Create Hydrogen Peroxide
+		//Compressed Air(1500) + Ethylanthrahydroquinone(500) + Anthracene(5) = 450 Ethylanthraquinone && 200 Peroxide
+		Hydrogen_Peroxide = FluidUtils.generateFluidNonMolten("HydrogenPeroxide", "Hydrogen Peroxide", 150, new short[]{210, 255, 255, 100}, null, null);
+
+
+
+		//Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
+		//ItemUtils.generateSpecialUseDusts("LithiumHydroperoxide", "Lithium Hydroperoxide", "HLiO2", Utils.rgbtoHexValue(125, 125, 125));
+		// v - Dehydrate
+		//Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
+		Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null);
+
+		
+		
 	}	
 
 	@Override
 	public String errorMessage() {
-		// TODO Auto-generated method stub
-		return "Failed to generate recipes for AgroChem.";
+		return "Failed to generate recipes for GenericChem.";
 	}
 
 	@Override
-	public boolean generateRecipes() {		
-
+	public boolean generateRecipes() {
+		
+		recipeCatalystRed();
+		recipeCatalystYellow();
+		recipeCatalystBlue();
+		recipeCatalystOrange();
+		recipeCatalystPurple();
+		recipeCatalystBrown();
+		
+		recipeNitroBenzene();
+		recipeAniline();
+		recipeCadaverineAndPutrescine();
+		recipeCyclohexane();
+		recipeCyclohexanone();
+		
+		recipe2Ethylanthraquinone();
+		recipe2Ethylanthrahydroquinone();
+		recipeHydrogenPeroxide();
+		recipeLithiumHydroperoxide();
+		recipeLithiumPeroxide();		
 		
 		return true;
 	}
+
+	private void recipeCyclohexane() {
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						getTierTwoChip(),		
+						ItemUtils.getSimpleStack(mBrownCatalyst, 1)
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Benzene, 2000),
+						FluidUtils.getFluidStack("hydrogen", 10000)
+				}, 
+				new ItemStack[] {
+						ItemUtils.getSimpleStack(mCatalystCarrier, 1)
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Cyclohexane, 1000),
+				}, 
+				20 * 120, 
+				120, 
+				2);
+		
+	}
+
+	private void recipeCyclohexanone() {
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						getTierTwoChip(),		
+						ItemUtils.getSimpleStack(mBlueCatalyst, 1)
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Cyclohexane, 2000),
+						FluidUtils.getFluidStack("air", 10000)
+				}, 
+				new ItemStack[] {
+						ItemUtils.getSimpleStack(mCatalystCarrier, 1)
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Cyclohexanone, 2000),
+				},  
+				20 * 120, 
+				120, 
+				2);
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						getTierTwoChip(),
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Phenol, 2000),
+						FluidUtils.getFluidStack("oxygen", 5000)
+				}, 
+				new ItemStack[] {
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Cyclohexanone, 2000),
+				},  
+				20 * 120, 
+				120, 
+				2);
+		
+		
+		
+		
+	}
+
+	private void recipeCatalystRed() {
+		// Assembly Recipe
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				getTierOneChip(),
+				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				ELEMENT.getInstance().IRON.getDust(2),
+				ELEMENT.getInstance().COPPER.getDust(2),
+		}, 
+				GT_Values.NF, 
+				ItemUtils.getSimpleStack(mRedCatalyst, 10),
+				20 * 20, 
+				30);
+		
+	}
+
+	private void recipeCatalystYellow() {
+		// Assembly Recipe
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				getTierThreeChip(),
+				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				ELEMENT.getInstance().TUNGSTEN.getDust(4),
+				ELEMENT.getInstance().NICKEL.getDust(4),
+		}, 
+				GT_Values.NF, 
+				ItemUtils.getSimpleStack(mYellowCatalyst, 10),
+				60 * 20, 
+				2000);
+		
+	}
+
+	private void recipeCatalystBlue() {
+		// Assembly Recipe
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				getTierTwoChip(),
+				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				ELEMENT.getInstance().COBALT.getDust(3),
+				ELEMENT.getInstance().TITANIUM.getDust(3),
+		}, 
+				GT_Values.NF, 
+				ItemUtils.getSimpleStack(mBlueCatalyst, 10),
+				40 * 20, 
+				500);
+		
+	}
+
+	private void recipeCatalystOrange() {
+		// Assembly Recipe
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				getTierTwoChip(),
+				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				ELEMENT.getInstance().VANADIUM.getDust(5),
+				ELEMENT.getInstance().PALLADIUM.getDust(5),
+		}, 
+				GT_Values.NF, 
+				ItemUtils.getSimpleStack(mOrangeCatalyst, 10),
+				40 * 20, 
+				500);
+		
+	}
+
+	private void recipeCatalystPurple() {
+		// Assembly Recipe
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				getTierFourChip(),
+				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				ELEMENT.getInstance().IRIDIUM.getDust(6),
+				ELEMENT.getInstance().RUTHENIUM.getDust(6),
+		}, 
+				GT_Values.NF, 
+				ItemUtils.getSimpleStack(mPurpleCatalyst, 10),
+				120 * 20, 
+				8000);
+		
+	}
+
+	private void recipeCatalystBrown() {
+		// Assembly Recipe
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				getTierOneChip(),
+				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				ELEMENT.getInstance().NICKEL.getDust(4),
+				ELEMENT.getInstance().ALUMINIUM.getDust(4),
+		}, 
+				GT_Values.NF, 
+				ItemUtils.getSimpleStack(mBrownCatalyst, 10),
+				15 * 20, 
+				30);
+		
+	}
+
+	private void recipeCadaverineAndPutrescine() {
+		
+		// Basic Recipe
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						getTierOneChip(),		
+						ItemUtils.getSimpleStack(Items.rotten_flesh, 64)
+				}, 
+				new FluidStack[] {
+						FluidUtils.getHotWater(2000)
+				}, 
+				new ItemStack[] {
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Cadaverine, 250),
+						FluidUtils.getFluidStack(Putrescine, 250),
+				}, 
+				20 * 120, 
+				120, 
+				1);
+
+		// Advanced Recipe
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						getTierTwoChip(),		
+						ItemUtils.getSimpleStack(Items.rotten_flesh, 128),		
+						ItemUtils.simpleMetaStack(AgriculturalChem.mAgrichemItem1, 8, 32)
+				}, 
+				new FluidStack[] {
+						FluidUtils.getHotWater(3000)
+				}, 
+				new ItemStack[] {
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Cadaverine, 750),
+						FluidUtils.getFluidStack(Putrescine, 750),
+				}, 
+				20 * 120, 
+				240, 
+				2);
+		
+	}
+
+	private void recipeAniline() {
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						getTierThreeChip(),		
+						ItemUtils.getSimpleStack(mBlueCatalyst, 1)
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(NitroBenzene, 2000),
+						FluidUtils.getFluidStack("hydrogen", 10000)
+				}, 
+				new ItemStack[] {
+						ItemUtils.getSimpleStack(mCatalystCarrier, 1)
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Aniline, 2000),
+				}, 
+				20 * 30, 
+				500, 
+				3);
+		
+	}
+
+	private void recipeNitroBenzene() {
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						getTierThreeChip(),						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Benzene, 5000),
+						FluidUtils.getFluidStack("sulfuricacid", 3000),
+						FluidUtils.getFluidStack("nitricacid", 3000),
+						FluidUtils.getDistilledWater(10000)
+				}, 
+				new ItemStack[] {
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack("dilutedsulfuricacid", 3000),
+						FluidUtils.getFluidStack(NitroBenzene, 5000),
+				}, 
+				20 * 30, 
+				500, 
+				3);
+		
+	}
+
+	private void recipe2Ethylanthraquinone() {
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(4),		
+						ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 4),				
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(CoalTar.Ethylbenzene, 2000),
+				}, 
+				new ItemStack[] {
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Ethylanthraquinone2, 2000+(144*4)),
+				}, 
+				20 * 15, 
+				120, 
+				1);		
+		
+		/*GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 4),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2),
+				null,
+				FluidUtils.getFluidStack("fluid.2ethylanthraquinone", 2000+(144*4)),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
+				20*16);*/
+	
+	}
+
+	private void recipe2Ethylanthrahydroquinone() {
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(4),		
+						ItemUtils.getSimpleStack(mOrangeCatalyst, 1),			
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Ethylanthraquinone2, 4000),
+						FluidUtils.getFluidStack("hydrogen", 2000),
+				}, 
+				new ItemStack[] {
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000),
+				}, 
+				20 * 40, 
+				120, 
+				1);	
+		
+		/*GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("platePalladium", 0),
+				ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthraquinone", 1),
+				FluidUtils.getFluidStack("hydrogen", 500),
+				FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", 1200),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1),
+				20*40);*/
+	
+	}
+
+	private void recipeLithiumPeroxide() {
+		CORE.RA.addDehydratorRecipe(
+				new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 2),
+						ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 3)
+				}, 
+				null, 
+				null, 
+				new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 2)
+				},
+				new int[]{10000, 10000, 10000}, 
+				20*100, 
+				120);
+	}
+
+	private void recipeLithiumHydroperoxide() {
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(4),		
+						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7),
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack("fluid.hydrogenperoxide", 2000),
+				}, 
+				new ItemStack[] {
+						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 14),						
+				}, 
+				new FluidStack[] {
+						
+				}, 
+				20 * 30, 
+				240, 
+				1);
+		
+		
+		
+		/*CORE.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1),
+				20,
+				FluidUtils.getFluidStack("fluid.cellhydrogenperoxide", 50),
+				null,
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 14),
+				CI.emptyCells(1),
+				20*30,
+				240);	*/
+	}
+
+	private void recipeHydrogenPeroxide() {	
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(4),
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack("air", 15000),
+						FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000),
+						FluidUtils.getFluidStack("fluid.anthracene", 50),
+				}, 
+				new ItemStack[] {					
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Ethylanthraquinone2, 4000),
+						FluidUtils.getFluidStack("fluid.hydrogenperoxide", 2000),						
+				}, 
+				20 * 30, 
+				240, 
+				1);
+		
+		/*		CORE.RA.addChemicalRecipe(
+						GT_ModHandler.getAirCell(15),
+						ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthrahydroquinone", 5),
+						20,
+						FluidUtils.getFluidStack("fluid.anthracene", 50),
+						FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", 4450),
+						ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 2),
+						CI.emptyCells(18),
+						20*30,
+						240);*/
+		
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	private static final ItemStack getTierOneChip() {
+		return CI.getNumberedBioCircuit(4);
+	}
+	private static final ItemStack getTierTwoChip() {
+		return CI.getNumberedBioCircuit(8);
+	}
+	private static final ItemStack getTierThreeChip() {
+		return CI.getNumberedBioCircuit(12);
+	}
+	private static final ItemStack getTierFourChip() {
+		return CI.getNumberedBioCircuit(16);
+	}
+	
+	
+	
 }
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java b/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
index cb7e32eaf0..4406995d27 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
@@ -1,16 +1,6 @@
 package gtPlusPlus.core.item.chemistry;
 
-import java.util.ArrayList;
-
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.oredict.OreDictionary;
 
 public class OilChem extends ItemPackage {
 
@@ -18,54 +8,16 @@ public class OilChem extends ItemPackage {
 	 * Fluids
 	 */
 
-	// Poop Juice
-	public static Fluid PoopJuice;
-	// Manure Slurry
-	public static Fluid ManureSlurry;
-	// Fertile Manure Slurry
-	public static Fluid FertileManureSlurry;
 
 	/**
 	 * Items
 	 */
 
-	// Manure Byproducts
-	public static Item dustManureByproducts;
-	// Organic Fertilizer
-	public static Item dustOrganicFertilizer;
-	// Dirt
-	public static Item dustDirt;
-
-	// Poop Juice
-	// vv - Centrifuge
-	// Manure Slurry && Manure Byproducts -> (Elements) Centrifuge to several tiny
-	// piles
-	// vv - Chem Reactor - Add Peat, Meat
-	// Organic Fertilizer
-	// vv - Dehydrate
-	// Fertilizer
-
-	// Poop Juice
-	// vv - Mixer - Add Blood, Bone, Meat (1000L Poo, 200L Blood, x2 Bone, x3 Meat)
-	// Fertile Manure Slurry
-	// vv - Chem Reactor - Add Peat x1.5
-	// Organic Fertilizer x3
-	// vv - Dehydrate
-	// Fertilizer
 
 
 	@Override
 	public void items() {
-		// Nitrogen, Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
-		dustManureByproducts = ItemUtils.generateSpecialUseDusts("ManureByproducts", "Manure Byproduct",
-				"(N2H4O3)N2P2Ca3CuC8", Utils.rgbtoHexValue(110, 75, 25))[0];
-
-		// Basically Guano
-		dustOrganicFertilizer = ItemUtils.generateSpecialUseDusts("OrganicFertilizer", "Organic Fertilizer",
-				"Ca5(PO4)3(OH)", Utils.rgbtoHexValue(240, 240, 240))[0];
-
-		// Dirt Dust :)
-		dustDirt = ItemUtils.generateSpecialUseDusts("Dirt", "Dried Earth", Utils.rgbtoHexValue(65, 50, 15))[0];		
+				
 	}
 
 	@Override
@@ -75,127 +27,19 @@ public class OilChem extends ItemPackage {
 
 	@Override
 	public void fluids() {
-		// Sewage
-		PoopJuice = FluidUtils.generateFluidNonMolten("raw.waste", "Raw Animal Waste", 32 + 175,
-				new short[] { 100, 70, 30, 100 }, null, null, 0, true);
-
-		// Sewage
-		ManureSlurry = FluidUtils.generateFluidNonMolten("manure.slurry", "Manure Slurry", 39 + 175,
-				new short[] { 75, 45, 15, 100 }, null, null, 0, true);
-
-		// Sewage
-		FertileManureSlurry = FluidUtils.generateFluidNonMolten("fertile.manure.slurry", "Fertile Manure Slurry",
-				45 + 175, new short[] { 65, 50, 15, 100 }, null, null, 0, true);		
-	}
-
-	private static AutoMap<ItemStack> mMeats = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mFish = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mFruits = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mVege = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mNuts = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mSeeds = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mPeat = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mBones = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mBoneMeal = new AutoMap<ItemStack>();
-
-	private static AutoMap<ItemStack> mList_Master_Meats = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mList_Master_Bones = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
-
-	private static void processAllOreDict() {
-		processOreDict("listAllmeatraw", mMeats);
-		processOreDict("listAllfishraw", mFish);
-		processOreDict("listAllfruit", mFruits);
-		processOreDict("listAllVeggie", mVege);
-		processOreDict("listAllnut", mNuts);
-		processOreDict("listAllSeed", mSeeds);
-		processOreDict("brickPeat", mPeat);
-		processOreDict("bone", mBones);
-		processOreDict("dustBone", mBoneMeal);
-		// Just make a mega list, makes life easier.
-		if (!mMeats.isEmpty()) {
-			for (ItemStack g : mMeats) {
-				mList_Master_Meats.put(g);
-			}
-		}
-		if (!mFish.isEmpty()) {
-			for (ItemStack g : mFish) {
-				mList_Master_Meats.put(g);
-			}
-		}
-		if (!mFruits.isEmpty()) {
-			for (ItemStack g : mFruits) {
-				mList_Master_FruitVege.put(g);
-			}
-		}
-		if (!mVege.isEmpty()) {
-			for (ItemStack g : mVege) {
-				mList_Master_FruitVege.put(g);
-			}
-		}
-		if (!mNuts.isEmpty()) {
-			for (ItemStack g : mNuts) {
-				mList_Master_FruitVege.put(g);
-			}
-		}
-		if (!mSeeds.isEmpty()) {
-			for (ItemStack g : mSeeds) {
-				mList_Master_Seeds.put(g);
-			}
-		}
-		if (!mBoneMeal.isEmpty()) {
-			for (ItemStack g : mBoneMeal) {
-				mList_Master_Bones.put(g);
-			}
-		}
-		if (!mBones.isEmpty()) {
-			for (ItemStack g : mBones) {
-				mList_Master_Bones.put(g);
-			}
-		}
-	}
-
-	private static void processOreDict(String aOreName, AutoMap<ItemStack> aMap) {
-		ArrayList<ItemStack> aTemp = OreDictionary.getOres(aOreName);
-		if (!aTemp.isEmpty()) {
-			for (ItemStack stack : aTemp) {
-				aMap.put(stack);
-			}
-		}
+			
 	}
 
-	private static void addBasicSlurryRecipes() {}
-
-	private static void addAdvancedSlurryRecipes() {}
-
-	private static void addBasicOrganiseFertRecipes() {}
-
-	private static void addAdvancedOrganiseFertRecipes() {}
-
-	private static void addMiscRecipes() {}
+	
 
 	@Override
 	public String errorMessage() {
-		// TODO Auto-generated method stub
-		return "Failed to generate recipes for AgroChem.";
+		return "Failed to generate recipes for OilChem.";
 	}
 
 	@Override
 	public boolean generateRecipes() {		
 
-		// Organise OreDict
-		processAllOreDict();
-
-		// Slurry Production
-		addBasicSlurryRecipes();
-		addAdvancedSlurryRecipes();
-
-		// Organic Fert. Production
-		addBasicOrganiseFertRecipes();
-		addAdvancedOrganiseFertRecipes();
-
-		addMiscRecipes();
 		return true;
 	}
 }
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index f2b5d0683c..bbdf322817 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -9,6 +9,7 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.Recipe_GT;
+import gtPlusPlus.api.helpers.MaterialHelper;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.lib.CORE;
@@ -25,7 +26,7 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 public class RocketFuels extends ItemPackage {
-	
+
 	public static HashSet<String> mValidRocketFuelNames = new HashSet<String>();
 	public static HashMap<Integer, Fluid> mValidRocketFuels = new HashMap<Integer, Fluid>();
 
@@ -40,6 +41,7 @@ public class RocketFuels extends ItemPackage {
 	public static Fluid Nitrous_Oxide;		
 	public static Fluid Hydrated_Ammonium_Nitrate_Slurry;	
 	public static Fluid Liquid_Oxygen;
+	public static Fluid Liquid_Hydrogen;
 	public static Fluid Formaldehyde;
 
 
@@ -51,16 +53,16 @@ public class RocketFuels extends ItemPackage {
 
 	public static Item Ammonium_Nitrate_Dust;
 	public static Item Formaldehyde_Catalyst;
-	
+
 	public static void createKerosene(){
-		
-		
-		
+
+
+
 		FluidStack fuelA = FluidUtils.getFluidStack("diesel", 300);
 		FluidStack fuelB = FluidUtils.getFluidStack("fuel", 300);
-		
-		
-		
+
+
+
 		if (fuelA != null){
 			//GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
 			GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelA, FluidUtils.getFluidStack(Kerosene, 100), 200, 64, false);
@@ -134,7 +136,11 @@ public class RocketFuels extends ItemPackage {
 	private static void createLOX() {		
 		GT_Values.RA.addVacuumFreezerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidOxygen", 1), 20*16);
 		CORE.RA.addAdvancedFreezerRecipe(new ItemStack[] {}, new FluidStack[] {FluidUtils.getFluidStack("oxygen", 3000)}, new FluidStack[] {FluidUtils.getFluidStack(Liquid_Oxygen, 3000)}, new ItemStack[] {}, new int[] {}, 20*16, 240, 0);
+	}
 
+	private static void createLOH() {		
+		GT_Values.RA.addVacuumFreezerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidhydrogen", 1), 20*16);
+		CORE.RA.addAdvancedFreezerRecipe(new ItemStack[] {}, new FluidStack[] {FluidUtils.getFluidStack("hydrogen", 300)}, new FluidStack[] {FluidUtils.getFluidStack(Liquid_Hydrogen, 300)}, new ItemStack[] {}, new int[] {}, 20*4, 540, 0);
 	}
 
 	private static void createHydratedAmmoniumNitrateSlurry() {
@@ -213,7 +219,7 @@ public class RocketFuels extends ItemPackage {
 				0,
 				0,
 				256)); //Fuel Value
-		
+
 		mRocketFuels.put(1, new Recipe_GT(
 				true,
 				new ItemStack[] {},
@@ -225,7 +231,7 @@ public class RocketFuels extends ItemPackage {
 				0,
 				0,
 				512)); //Fuel Value
-		
+
 		mRocketFuels.put(2, new Recipe_GT(
 				true,
 				new ItemStack[] {},
@@ -237,7 +243,7 @@ public class RocketFuels extends ItemPackage {
 				0,
 				0,
 				768)); //Fuel Value
-		
+
 		mRocketFuels.put(3, new Recipe_GT(
 				true,
 				new ItemStack[] {},
@@ -249,8 +255,8 @@ public class RocketFuels extends ItemPackage {
 				0,
 				0,
 				1024)); //Fuel Value
-		
-		
+
+
 		//Add in default Diesel for the Buggy
 		mValidRocketFuels.put(-1, Diesel);	
 
@@ -287,7 +293,7 @@ public class RocketFuels extends ItemPackage {
 
 		GT_Values.RA.addCentrifugeRecipe(
 				CI.getNumberedCircuit(23),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellRP1Fuel", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellRP1", 1),
 				FluidUtils.getFluidStack(Liquid_Oxygen, 4000), 
 				FluidUtils.getFluidStack(RP1_Plus_Liquid_Oxygen, 200), 
 				CI.emptyCells(1),
@@ -348,7 +354,7 @@ public class RocketFuels extends ItemPackage {
 					20*48,
 					480);	
 		}
-		
+
 
 		GT_Values.RA.addCentrifugeRecipe(
 				CI.getNumberedCircuit(23),
@@ -429,6 +435,7 @@ public class RocketFuels extends ItemPackage {
 		if (!CORE.GTNH) {
 			createLOX();
 		}
+		createLOH();
 
 
 		createHydratedAmmoniumNitrateSlurry();		
@@ -439,18 +446,18 @@ public class RocketFuels extends ItemPackage {
 
 		createRocketFuels();
 		addRocketFuelsToMap();
-		
+
 		return true;
 	}
 
 	@Override
 	public boolean onLoadComplete(FMLLoadCompleteEvent event) {	
 
-		
+
 		if (MathUtils.randInt(1, 2) > 0) {
 			return false;
 		}
-		
+
 
 		Materials aMaterial_Chloramine = MaterialUtils.getMaterial("Chloramine");
 		Materials aMaterial_Dimethylamine = MaterialUtils.getMaterial("Dimethylamine");
@@ -458,33 +465,35 @@ public class RocketFuels extends ItemPackage {
 		Materials aMaterial_NitrogenDioxide = MaterialUtils.getMaterial("NitrogenDioxide");
 		Materials aMaterial_DinitrogenTetroxide = MaterialUtils.getMaterial("DinitrogenTetroxide");
 		Materials aMaterial_Dimethylhydrazine = MaterialUtils.getMaterial("Dimethylhydrazine");
-		
+
 		Materials aMaterial_Oxygen = Materials.Oxygen;
 		Materials aMaterial_Water = Materials.Water;
 		Materials aMaterial_HypochlorousAcid = MaterialUtils.getMaterial("HypochlorousAcid");
 		Materials aMaterial_Ammonia = MaterialUtils.getMaterial("Ammonia");
 		Materials aMaterial_Methanol = MaterialUtils.getMaterial("Methanol");
-		
+
 		if (aMaterial_Chloramine == null || aMaterial_Dimethylamine == null || aMaterial_DilutedHydrochloricAcid == null 
 				|| aMaterial_Dimethylhydrazine == null || aMaterial_NitrogenDioxide == null || aMaterial_DinitrogenTetroxide == null 
 				|| aMaterial_HypochlorousAcid == null || aMaterial_Ammonia == null || aMaterial_Methanol == null) {
 			return false;
 		}
-		
 
-		ItemStack aCellEmpty = CI.emptyCells(1);
-		ItemStack aCellWater = aMaterial_Water.getCells(1);
-		ItemStack aCellOxygen = aMaterial_Oxygen.getCells(1);
-		ItemStack aCellChloramine = aMaterial_Chloramine.getCells(1);
-		ItemStack aCellDimethylamine = aMaterial_Dimethylamine.getCells(1);
-		ItemStack aCellDilutedHydrochloricAcid = aMaterial_DilutedHydrochloricAcid.getCells(1);
-		ItemStack aCellNitrogenDioxide = aMaterial_NitrogenDioxide.getCells(1);
-		ItemStack aCellDinitrogenTetroxide = aMaterial_DinitrogenTetroxide.getCells(1);
-		ItemStack aCellDimethylhydrazine = aMaterial_Dimethylhydrazine.getCells(1);
-		
-		
-		
+
+		MaterialHelper.getCells(aMaterial_Water, 1);
 		
+		ItemStack aCellEmpty = CI.emptyCells(1);
+		ItemStack aCellWater = MaterialHelper.getCells(aMaterial_Water, 1);
+		ItemStack aCellOxygen = MaterialHelper.getCells(aMaterial_Oxygen, 1);
+		ItemStack aCellChloramine = MaterialHelper.getCells(aMaterial_Chloramine, 1);
+		ItemStack aCellDimethylamine = MaterialHelper.getCells(aMaterial_Dimethylamine, 1);
+		ItemStack aCellDilutedHydrochloricAcid = MaterialHelper.getCells(aMaterial_DilutedHydrochloricAcid, 1);
+		ItemStack aCellNitrogenDioxide = MaterialHelper.getCells(aMaterial_NitrogenDioxide, 1);
+		ItemStack aCellDinitrogenTetroxide = MaterialHelper.getCells(aMaterial_DinitrogenTetroxide, 1);
+		ItemStack aCellDimethylhydrazine = MaterialHelper.getCells(aMaterial_Dimethylhydrazine, 1);
+
+
+
+
 
 
 		GT_Recipe aChemReactor_1 = new Recipe_GT(
@@ -510,10 +519,10 @@ public class RocketFuels extends ItemPackage {
 				0,  //Dura
 				0,  //Eu
 				0); //Special
-		
-		
-		
-		
+
+
+
+
 		GT_Recipe aChemReactor_Basic_1 = new Recipe_GT(
 				true, //Optimise
 				new ItemStack[] {}, //I
@@ -561,18 +570,18 @@ public class RocketFuels extends ItemPackage {
 				0,  //Dura
 				0,  //Eu
 				0); //Special
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
+
+
+
+
+
+
+
+
+
+
+
+
 
 		GT_Recipe aChemReactor_Adv_1 = new Recipe_GT(
 				true, //Optimise
@@ -598,26 +607,26 @@ public class RocketFuels extends ItemPackage {
 				0,  //Eu
 				0); //Special
 
-		
-		
+
+
 
 		//RecipeUtils.removeGtRecipe(aChemReactor_Basic_1, GT_Recipe.GT_Recipe_Map.sChemicalRecipes);
 		//RecipeUtils.removeGtRecipe(aChemReactor_Basic_1, GT_Recipe.GT_Recipe_Map.sChemicalRecipes);
 		//RecipeUtils.removeGtRecipe(aChemReactor_Basic_1, GT_Recipe.GT_Recipe_Map.sChemicalRecipes);
 		//RecipeUtils.removeGtRecipe(aChemReactor_Basic_1, GT_Recipe.GT_Recipe_Map.sChemicalRecipes);	
-		
-		
-		
-		
-		
 
-      /*  GT_Values.RA.addChemicalRecipe(                   Materials.Chloramine.getCells(2),    GT_Utility.getIntegratedCircuit(1),  Materials.Dimethylamine.getGas(5000), Materials.Dimethylhydrazine.getFluid(6000),        Materials.DilutedHydrochloricAcid.getCells(1), Materials.Empty.getCells(1), 960, 480);        
+
+
+
+
+
+		/*  GT_Values.RA.addChemicalRecipe(                   Materials.Chloramine.getCells(2),    GT_Utility.getIntegratedCircuit(1),  Materials.Dimethylamine.getGas(5000), Materials.Dimethylhydrazine.getFluid(6000),        Materials.DilutedHydrochloricAcid.getCells(1), Materials.Empty.getCells(1), 960, 480);        
         GT_Values.RA.addChemicalRecipe(                   Materials.Dimethylamine.getCells(5), GT_Utility.getIntegratedCircuit(1),  Materials.Chloramine.getFluid(2000),  Materials.Dimethylhydrazine.getFluid(6000),        Materials.DilutedHydrochloricAcid.getCells(1), Materials.Empty.getCells(4), 960, 480);        
         GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Chloramine.getCells(2),    Materials.Empty.getCells(4),         Materials.Dimethylamine.getGas(5000), Materials.DilutedHydrochloricAcid.getFluid(1000),  Materials.Dimethylhydrazine.getCells(6),       GT_Values.NI, 960, 480);        
         GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Dimethylamine.getCells(5), Materials.Empty.getCells(1),         Materials.Chloramine.getFluid(2000),  Materials.DilutedHydrochloricAcid.getFluid(1000),  Materials.Dimethylhydrazine.getCells(6),       GT_Values.NI, 960, 480);        
         GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Dimethylamine.getCells(5), Materials.Chloramine.getCells(2),    Materials.Chloramine.getFluid(2000),  Materials.DilutedHydrochloricAcid.getFluid(1000),  Materials.Dimethylhydrazine.getCells(6),       Materials.DilutedHydrochloricAcid.getCells(1), 960, 480);        
     	GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(24)}, new FluidStack[]{Materials.HypochlorousAcid.getFluid(3000), Materials.Ammonia.getGas(8000), Materials.Methanol.getFluid(12000)}, new FluidStack[]{Materials.Dimethylhydrazine.getFluid(12000), Materials.DilutedHydrochloricAcid.getFluid(2000), Materials.Water.getFluid(9000)}, null, 1040, 480);
-        
+
         GT_Values.RA.addChemicalRecipe(GT_Utility.getIntegratedCircuit(2),    GT_Values.NI,                        Materials.NitrogenDioxide.getGas(1000), Materials.DinitrogenTetroxide.getGas(1000), GT_Values.NI, 640);        
         GT_Values.RA.addChemicalRecipe(Materials.NitrogenDioxide.getCells(1), GT_Utility.getIntegratedCircuit(2),  GT_Values.NF,                           Materials.DinitrogenTetroxide.getGas(1000), Materials.Empty.getCells(1), 640);        
         GT_Values.RA.addChemicalRecipe(Materials.NitrogenDioxide.getCells(1), GT_Utility.getIntegratedCircuit(12), GT_Values.NF,                           GT_Values.NF, Materials.DinitrogenTetroxide.getCells(1), 640);        
@@ -629,25 +638,25 @@ public class RocketFuels extends ItemPackage {
         GT_Values.RA.addMixerRecipe(Materials.Dimethylhydrazine.getCells(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Oxygen.getGas(1000), new FluidStack(ItemList.sRocketFuel, 3000), Materials.Empty.getCells(2), 60, 16);
         GT_Values.RA.addMixerRecipe(Materials.Oxygen.getCells(1), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Dimethylhydrazine.getFluid(2000), new FluidStack(ItemList.sRocketFuel, 3000), Materials.Empty.getCells(1), 60, 16);
 
-		
-		*/
-		
-		
-		
-		
-		
-		
-		
-		
-		
+
+		 */
+
+
+
+
+
+
+
+
+
 		//Get Rocket Fuel
-		
+
 		//Find recipes using default values
-		
+
 		//Remove	
-		
+
 		//Rebake map		
-		
+
 		return true;
 	};
 
@@ -662,18 +671,28 @@ public class RocketFuels extends ItemPackage {
 
 	@Override
 	public void fluids() {
-		
+
 		//Register default fluids
 		Diesel = MaterialUtils.getMaterial("Fuel", "Diesel").getFluid(1).getFluid();
-		Oil_Heavy = MaterialUtils.getMaterial("OilHeavy", "Oil").getFluid(1).getFluid();		
-		
 		
+		// 5.08 Compat
+		if (!FluidUtils.doesFluidExist("liquid_heavy_oil")){
+			Oil_Heavy = FluidUtils.generateFluidNoPrefix("liquid_heavy_oil", "Heavy Oil", 200, new short[]{10, 10, 10, 100});
+		}
+		else {
+			Oil_Heavy = MaterialUtils.getMaterial("OilHeavy", "Oil").getFluid(1).getFluid();
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellOilHeavy", 1) == null){				
+				new BaseItemComponent("OilHeavy", "Heavy Oil", new short[] {10, 10, 10});
+			}
+		}		
+
+
 		//Create Kerosene
 		Kerosene = FluidUtils.generateFluidNonMolten("Kerosene", "Kerosene", 500, new short[]{150, 40, 150, 100}, null, null);
 		CoalTar.Coal_Oil = Kerosene;
-		
+
 		//RP! Focket Fuel
-		RP1 = FluidUtils.generateFluidNonMolten("RP1Fuel", "RP-1 Rocket Fuel", 500, new short[]{210, 50, 50, 100}, null, null);
+		RP1 = FluidUtils.generateFluidNonMolten("RP1Fuel", "RP-1", 500, new short[]{210, 50, 50, 100}, null, null);
 
 		//Create Nitrogen Tetroxide
 		Nitrogen_Tetroxide = FluidUtils.generateFluidNonMolten("NitrogenTetroxide", "Nitrogen Tetroxide", -11, new short[]{170, 170, 0, 100}, null, null);
@@ -697,7 +716,7 @@ public class RocketFuels extends ItemPackage {
 				new BaseItemComponent("NitrousOxide", "Nitrous Oxide", new short[] {10, 10, 175});
 			}
 		}
-		
+
 		//Unsymmetrical_Dimethylhydrazine		
 		if (FluidUtils.getFluidStack("1,1dimethylhydrazine", 1) == null){
 			Unsymmetrical_Dimethylhydrazine = FluidUtils.generateFluidNonMolten("UnsymmetricalDimethylhydrazine", "Unsymmetrical Dimethylhydrazine", -57, new short[]{70, 210, 20, 100}, null, null);
@@ -727,16 +746,31 @@ public class RocketFuels extends ItemPackage {
 				new BaseItemComponent("LiquidOxygen", "Liquid Oxygen", new short[] {10, 10, 175});
 			}
 		}
-		
+
+		//Create Liquid_Hydrogen
+		if (FluidUtils.getFluidStack("LiquidHydrogen", 1) == null && FluidUtils.getFluidStack("liquidhydrogen", 1) == null){
+			Liquid_Hydrogen = FluidUtils.generateFluidNonMolten("LiquidHydrogen", "Liquid Hydrogen", -240, new short[]{75, 75, 220, 100}, null, null);
+		}
+		else {
+			if (FluidUtils.getFluidStack("LiquidHydrogen", 1) != null ) {
+				Liquid_Hydrogen = FluidUtils.getFluidStack("LiquidHydrogen", 1).getFluid();				
+			}
+			else {
+				Liquid_Hydrogen = FluidUtils.getFluidStack("liquidhydrogen", 1).getFluid();
+			}
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellLiquidHydrogen", 1) == null){				
+				new BaseItemComponent("LiquidHydrogen", "Liquid Hydrogen", new short[] {10, 10, 175});
+			}
+		}
 
 		Formaldehyde = FluidUtils.generateFluidNonMolten("Formaldehyde", "Formaldehyde", -92, new short[]{150, 75, 150, 100}, null, null);
-		
+
 		Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide = FluidUtils.generateFluidNonMolten("RocketFuelMixA", "H8N4C2O4 Rocket Fuel", -185, new short[]{50, 220, 50, 100}, null, null);
-		RP1_Plus_Liquid_Oxygen = FluidUtils.generateFluidNonMolten("RocketFuelMixB", "Rp-1 Fuel Mixture", -250, new short[]{250, 50, 50, 100}, null, null);
+		RP1_Plus_Liquid_Oxygen = FluidUtils.generateFluidNonMolten("RocketFuelMixB", "Rp-1 Rocket Fuel", -250, new short[]{250, 50, 50, 100}, null, null);
 		Monomethylhydrazine_Plus_Nitric_Acid = FluidUtils.generateFluidNonMolten("RocketFuelMixC", "CN3H7O3 Rocket Fuel", -300, new short[]{125, 75, 180, 100}, null, null);
 		Dense_Hydrazine_Mix = FluidUtils.generateFluidNonMolten("RocketFuelMixD", "Dense Hydrazine Fuel Mixture", -250, new short[]{175, 80, 120, 100}, null, null);
 
-		
+
 	}
 
 
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
index 1e833a7b00..10eaaf0da9 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
@@ -149,7 +149,7 @@ public class StandardBaseParticles extends BaseItemParticle {
 	@Override
 	public void registerIcons(IIconRegister reg) {		
 		for (int i = 0; i < this.icons.length; i++) {
-			this.icons[i] = reg.registerIcon(CORE.MODID + ":" + "particle/"+i);			
+			this.icons[i] = reg.registerIcon(CORE.MODID + ":" + "particle/new/"+i);			
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
new file mode 100644
index 0000000000..8a003ec7aa
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
@@ -0,0 +1,162 @@
+package gtPlusPlus.core.item.chemistry.general;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class ItemGenericChemBase extends Item {
+
+	final protected IIcon base[];
+	
+	final private int aMetaSize = 6;
+	
+	/*
+	 * 0 - Red Metal Catalyst //FeCu
+	 * 1 - Yellow Metal Catalyst //WNi
+	 * 2 - Blue Metal Catalyst //CoTi
+	 * 3 - Orange Metal Catalyst //Vanadium Pd
+	 * 4 - Purple Metal Catalyst //IrIdium Ruthenium
+	 * 5 - Brown Metal Catalyst //NiAl
+	 * 
+	 */
+	
+	public ItemGenericChemBase() {
+		this.setHasSubtypes(true);
+		this.setNoRepair();
+		this.setMaxStackSize(64);
+		this.setMaxDamage(0);		
+		base = new IIcon[aMetaSize];		
+		this.setUnlocalizedName("BasicGenericChemItem");
+		GameRegistry.registerItem(this, this.getUnlocalizedName());
+	}
+	
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public boolean shouldRotateAroundWhenRendering() {
+		return super.shouldRotateAroundWhenRendering();
+	}
+
+	@Override
+	public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
+		super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_);
+	}
+
+	@Override
+	public String getItemStackDisplayName(ItemStack aStack) {
+		return super.getItemStackDisplayName(aStack);
+	}
+
+	@Override
+	public void addInformation(ItemStack aStack, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
+		try {
+			
+		}
+		catch (Throwable t) {
+			t.printStackTrace();
+		}
+		super.addInformation(aStack, p_77624_2_, aList, p_77624_4_);
+	}
+
+	@Override
+	public EnumRarity getRarity(ItemStack p_77613_1_) {
+		return EnumRarity.common;
+	}
+
+	@Override
+	public boolean requiresMultipleRenderPasses() {
+		return false;
+	}
+
+	@Override
+	public void getSubItems(Item aItem, CreativeTabs p_150895_2_, List aList) {
+		for (int i=0;i<aMetaSize;i++) {			
+			aList.add(ItemUtils.simpleMetaStack(aItem, i, 1));			
+		}
+	}
+
+	@Override
+	public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) {
+		return false;
+	}
+
+	@Override
+	public boolean isRepairable() {
+		return false;
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+		return false;
+	}
+
+	@Override
+	public int getDisplayDamage(ItemStack stack) {
+		return stack.getItemDamage();
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public int getItemEnchantability(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public void registerIcons(final IIconRegister u) {
+		for (int i=0;i<this.aMetaSize;i++) {
+			String aPath = CORE.MODID + ":" + "science/general/MetaItem1/"+i;
+			this.base[i] = u.registerIcon(aPath);										
+		}
+	}	
+	
+	
+	@Override
+	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
+		return this.base[damage];		
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int damage) {
+		return this.base[damage];	
+	}
+
+	@Override
+	public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
+		return this.base[stack.getItemDamage()];
+	}
+
+	@Override
+	public IIcon getIcon(ItemStack stack, int pass) {
+		return this.base[stack.getItemDamage()];	
+	}
+
+	@Override
+    public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName() + "." + stack.getItemDamage();
+    }
+	
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
index 1c28f99ff8..3f8e31d8d2 100644
--- a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
+++ b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
@@ -26,7 +26,9 @@ public class ItemDummyResearch extends ItemGenericToken {
 		RESEARCH_4_BASIC_PHYSICS("Basic Physics", "Fundamental laws of motion"),
 		RESEARCH_5_ADV_PHYSICS("Advanced Physics", "Advanced knowledge!"),
 		RESEARCH_6_BASIC_METALLURGY("Basic Metallurgy", "Information about material smelting"),
-		RESEARCH_7_ADV_METALLURGY("Advanced Metallurgy", "Advanced Material Sciences!");	
+		RESEARCH_7_ADV_METALLURGY("Advanced Metallurgy", "Advanced Material Sciences!"),
+		RESEARCH_8_TURBINE_AUTOMATION("Turbine Automation", "You really don't want to share this with anyone!"), 
+		RESEARCH_9_CLOAKING("Cloaking Technologies", "Sneaking around like a mouse");	
 		
 		
 		
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java b/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
index 5ef72b6f17..b74b7972be 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
@@ -71,6 +71,9 @@ public class ItemControlCore extends Item {
 
 	@Override
 	public String getItemStackDisplayName(final ItemStack tItem) {
+		if (tItem == null) {
+			return "Control Core";
+		}
 		String aReturnValue = super.getItemStackDisplayName(tItem);
 		if (tItem != null) {
 			try {
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
index c076bf5c95..21d2c6e120 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
@@ -148,8 +148,19 @@ public class ItemGenericToken extends CoreItem {
 	}
 
 	@Override
-	public int getItemStackLimit(ItemStack stack) {
-		return mMaxStackSizes.get(stack.getItemDamage());
+	public int getItemStackLimit(ItemStack aStack) {
+		if (aStack == null) {
+			return getItemStackLimit();
+		}
+		else {
+			Integer aSize = mMaxStackSizes.get(aStack.getItemDamage());
+			if (aSize != null) {
+				return aSize;
+			}
+			else {
+				return getItemStackLimit();
+			}
+		}
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
index c8acdc2152..82bb29b5bf 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
@@ -2,23 +2,10 @@ package gtPlusPlus.core.item.general;
 
 import java.util.List;
 
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-
 import baubles.api.BaubleType;
 import baubles.api.IBauble;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
@@ -31,6 +18,16 @@ import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import ic2.api.item.IElectricItemManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
 
 @Optional.InterfaceList(value = {@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")})
 public class ItemHealingDevice extends Item implements IElectricItem, IElectricItemManager, IBauble{
@@ -232,7 +229,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
 
 	@Override //TODO
 	public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase arg1) {
-		if (!arg1.worldObj.isRemote){
+		if (arg1 != null && arg1.worldObj != null && !arg1.worldObj.isRemote){
 			
 			//Try Charge First
 
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
index 7134df4a44..fa008bf1a3 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
@@ -2,10 +2,15 @@ package gtPlusPlus.core.item.general;
 
 import java.util.List;
 
+import baubles.api.BaubleType;
+import baubles.api.IBauble;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.client.Minecraft;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.events.CustomMovementHandler;
+import gtPlusPlus.core.handler.events.SneakManager;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,14 +19,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
-import baubles.api.BaubleType;
-import baubles.api.IBauble;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.events.CustomMovementHandler;
-import gtPlusPlus.core.handler.events.SneakManager;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-
 @Optional.InterfaceList(value = {@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")})
 public class ItemSlowBuildingRing extends Item implements IBauble{
 
@@ -42,23 +39,11 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 		if (worldObj.isRemote) {
 			return;
 		}
-		if (player instanceof EntityPlayer){
-			for (final ItemStack is : ((EntityPlayer) player).inventory.mainInventory) {
-				if (is == itemStack) {
-					continue;
-				}
-				if (is != null) {
-
-
-				}
-			}
-		}
 		super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_);
 	}
 
 	@Override
 	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-
 		return (EnumChatFormatting.YELLOW+"Slow Building Ring"+EnumChatFormatting.GRAY);
 	}
 
@@ -68,6 +53,7 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 		return false;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 		list.add("");
@@ -95,13 +81,32 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 
 	@Override //TODO
 	public void onEquipped(final ItemStack arg0, final EntityLivingBase arg1) {
-		doEffect(arg1);
+		try {
+			EntityPlayer aPlayer;
+			if (arg1 instanceof EntityPlayer) {
+				aPlayer = (EntityPlayer) arg1;
+				SneakManager s = SneakManager.get(aPlayer);				
+				s.putRingOn();
+			}
+		}
+		catch (Throwable t) {
+			t.printStackTrace();
+		}
 	}
 
 	@Override //TODO
 	public void onUnequipped(final ItemStack arg0, final EntityLivingBase arg1) {
-		SneakManager.setSprintingStateON();
-		SneakManager.setCrouchingStateOFF();
+		try {
+			EntityPlayer aPlayer;
+			if (arg1 instanceof EntityPlayer) {
+				aPlayer = (EntityPlayer) arg1;
+				SneakManager s = SneakManager.get(aPlayer);				
+				s.takeRingOff();
+			}
+		}
+		catch (Throwable t) {
+			t.printStackTrace();
+		}
 	}
 
 	@Override //TODO
@@ -110,20 +115,26 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 	}
 
 	private static void doEffect(final EntityLivingBase arg1){
-		if (arg1.worldObj.isRemote){
-			if (!arg1.isSneaking()){
-				arg1.setSneaking(true);
-				Minecraft.getMinecraft().thePlayer.setSneaking(true);
-				SneakManager.setSprintingStateOFF();
-				SneakManager.setCrouchingStateON();
-			}
-			else if (arg1.isSneaking()){
-				arg1.setSprinting(false);
-				Minecraft.getMinecraft().thePlayer.setSprinting(true);
-				SneakManager.setSprintingStateOFF();
-				SneakManager.setCrouchingStateON();
+		try {		
+			// Get World
+			World aWorld = arg1.worldObj;
+			if (aWorld != null && !aWorld.isRemote) {				
+				EntityPlayer aPlayer;
+				if (arg1 instanceof EntityPlayer) {
+					aPlayer = (EntityPlayer) arg1;
+					SneakManager s = SneakManager.get(aPlayer);	
+					if (!aPlayer.isSneaking()){						
+						aPlayer.setSneaking(true);
+					}						
+					if (aPlayer.isSprinting()) {
+						aPlayer.setSprinting(false);						
+					}				
+				}				
 			}
 		}
+		catch (Throwable t) {
+			t.printStackTrace();
+		}
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java
index aa6fdabacc..9994c7d362 100644
--- a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java
+++ b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.item.materials;
 
+import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -10,6 +12,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.handler.Recipes.DecayableRecipe;
 import gtPlusPlus.core.item.base.BaseItemTickable;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
@@ -25,6 +28,7 @@ public class DustDecayable extends BaseItemTickable {
 		this.turnsIntoItem = turnsInto;
 		this.radLevel = radLevel;
 		GT_OreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this));
+		new DecayableRecipe(maxTicks, getSimpleStack(this), getSimpleStack(turnsInto));
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java b/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
index d0f3005d00..0170df0dc7 100644
--- a/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
@@ -7,6 +7,7 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
@@ -62,19 +63,22 @@ public class DebugScanner extends CoreItem {
 			PlayerUtils.messagePlayer(player, "Invisible? "+entity.isInvisible());
 			PlayerUtils.messagePlayer(player, "Age: "+entity.ticksExisted);
 			
-			if (entity instanceof EntityLiving) {
-				EntityLiving g = (EntityLiving) entity;
+			if (entity instanceof EntityLivingBase) {
+				EntityLivingBase g = (EntityLivingBase) entity;
 				PlayerUtils.messagePlayer(player, "Health: "+g.getHealth()+"/"+g.getMaxHealth());
 				PlayerUtils.messagePlayer(player, "On ground? "+g.onGround);
-				PlayerUtils.messagePlayer(player, "Can Loot? "+g.canPickUpLoot());
-				PlayerUtils.messagePlayer(player, "Child? "+g.isChild());
-				if (entity instanceof EntityPlayer) {
-					EntityPlayer y = (EntityPlayer) entity;
-					PlayerUtils.messagePlayer(player, "Experience: "+y.experience);
-					PlayerUtils.messagePlayer(player, "Name: "+y.getCommandSenderName());				
-				}
+				PlayerUtils.messagePlayer(player, "Child? "+g.isChild());				
+			}
+			if (entity instanceof EntityLiving) {
+				EntityLiving g = (EntityLiving) entity;
+				PlayerUtils.messagePlayer(player, "Can Loot? "+g.canPickUpLoot());				
 				
 			}
+			if (entity instanceof EntityPlayer) {
+				EntityPlayer y = (EntityPlayer) entity;
+				PlayerUtils.messagePlayer(player, "Experience: "+y.experience);
+				PlayerUtils.messagePlayer(player, "Name: "+y.getCommandSenderName());				
+			}
 			
 		}
 		return true;
diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
index 0c31b999cd..a48573888e 100644
--- a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
@@ -1127,7 +1127,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 		else if ((aTileEntity instanceof IFluidTank || aTileEntity instanceof IFluidHandler)) {
 			if (aTileEntity instanceof IFluidTank) {
 				Logger.INFO("Tile Was instanceof IFluidTank.");
-				FluidStack f = ((IFluidTank) aTileEntity).getFluid();
+				FluidStack f = ((IFluidTank) aTileEntity).getFluid();				
 				if (aSetFluid == null) {
 					aSetFluid = f;
 					aSetFluid.amount = f.amount;