% Tried to adjust the name of IC2 Hot Water.

$ Fixed OreDicting ore Sodium Hydroxide if GT dusts are detected.
$ Fixed bad oredict look-up for RP1 cell.
$ Rewrote how GT++ Materials look for existing fluids and cells during generation, hopefully this didn't break any existing cells or fluids. (Please investigate log after loading a world)

11 files changed, 373 insertions, 275 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index c8b6253753..9b732e38e1 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -169,7 +169,7 @@ public class BaseItemComponent extends Item{
 
 			if (this.componentMaterial == null){
 				if (this.materialName != null){
-					list.add(Utils.sanitizeStringKeepBrackets(materialName));					
+					//list.add(Utils.sanitizeStringKeepBrackets(materialName));					
 				}				
 			}			
 			
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 324a3aa9ee..55f4dfa0be 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -219,12 +219,19 @@ public class AgriculturalChem extends ItemPackage {
 		ItemUtils.addItemToOreDictionary(mAluminiumPellet, "pelletAluminium");
 
 		ItemUtils.addItemToOreDictionary(mSodiumAluminate, "dustSodiumAluminate");
-		if (mSodiumHydroxide.getItem() instanceof ItemAgrichemBase) {
-			ItemUtils.addItemToOreDictionary(mSodiumHydroxide, "dustSodiumHydroxide");			
-		}
+		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");				
+		}
 		
 		
 	}
@@ -300,19 +307,19 @@ public class AgriculturalChem extends ItemPackage {
 
 	}
 
-	public final static AutoMap<ItemStack> mMeats = new AutoMap<ItemStack>();
-	public final static AutoMap<ItemStack> mFish = new AutoMap<ItemStack>();
-	public final static AutoMap<ItemStack> mFruits = new AutoMap<ItemStack>();
-	public final static AutoMap<ItemStack> mVege = new AutoMap<ItemStack>();
-	public final static AutoMap<ItemStack> mNuts = new AutoMap<ItemStack>();
-	public final static AutoMap<ItemStack> mSeeds = 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>();
 
-	public final static AutoMap<ItemStack> mList_Master_Meats = new AutoMap<ItemStack>();
-	public final static AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
-	public final static AutoMap<ItemStack> mList_Master_Seeds = 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() {
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index c02e767dcd..0bea7dfc31 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -292,7 +292,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),
@@ -679,7 +679,7 @@ public class RocketFuels extends ItemPackage {
 		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);
@@ -753,7 +753,7 @@ public class RocketFuels extends ItemPackage {
 		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/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index d95b17e75c..b5922dde53 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -1094,96 +1094,41 @@ public class Material {
 		if (this.materialState == MaterialState.ORE){
 			return null;
 		}
+		
+		Fluid aGTBaseFluid = null;
 
-		final Materials isValid = Materials.get(this.getLocalizedName());
-		//Logger.MATERIALS("Is "+this.getLocalizedName()+" a Gregtech material? "+(isValid != null && isValid != Materials._NULL)+" | Found "+isValid.mDefaultLocalName);
-		if (isValid != Materials._NULL){
-			for (Materials m : invalidMaterials.values()){
-				if (isValid == m){
-					Logger.MATERIALS("Trying to generate a fluid for blacklisted material: "+m.mDefaultLocalName);
-					FluidStack a1 = m.getFluid(1);
-					FluidStack a2 = m.getGas(1);
-					FluidStack a3 = m.getMolten(1);
-					FluidStack a4 = m.getSolid(1);
-					FluidStack a5 = m.getPlasma(1);
-					if (a1 != null){
-						Logger.MATERIALS("Using a pre-defined Fluid from GT. Fluid.");
-						return a1.getFluid();
-					}
-					if (a2 != null){
-						Logger.MATERIALS("Using a pre-defined Fluid from GT. Gas.");
-						return a2.getFluid();
-					}
-					if (a3 != null){
-						Logger.MATERIALS("Using a pre-defined Fluid from GT. Molten.");
-						return a3.getFluid();
-					}
-					if (a4 != null){
-						Logger.MATERIALS("Using a pre-defined Fluid from GT. Solid.");
-						return a4.getFluid();
-					}
-					if (a5 != null){
-						Logger.MATERIALS("Using a pre-defined Fluid from GT. Plasma.");
-						return a5.getFluid();
-					}
-					Logger.MATERIALS("Using null.");
-					return null;
-				}
-			}
-		}
+		// Clean up Internal Fluid Generation
+		final Materials n1 = MaterialUtils.getMaterial(this.getLocalizedName(), Utils.sanitizeString(this.getLocalizedName()));
+		final Materials n2 = MaterialUtils.getMaterial(this.getUnlocalizedName(), Utils.sanitizeString(this.getUnlocalizedName()));
 
-		if (this.materialState == MaterialState.SOLID){
-			if (isValid.mFluid != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mFluid.");
-				return isValid.mFluid;
-			}
-			else if (isValid.mStandardMoltenFluid != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mStandardMoltenFluid.");
-				return isValid.mStandardMoltenFluid;
-			}
-		}
-		else if (this.materialState == MaterialState.GAS){
-			if (isValid.mGas != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mGas.");
-				return isValid.mGas;
-			}
-		}
-		else if (this.materialState == MaterialState.LIQUID || this.materialState == MaterialState.PURE_LIQUID){
-			if (isValid.mFluid != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mFluid.");
-				return isValid.mFluid;
-			}
-			else if (isValid.mGas != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mGas.");
-				return isValid.mGas;
-			}
-			else if (isValid.mStandardMoltenFluid != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mStandardMoltenFluid.");
-				return isValid.mStandardMoltenFluid;
-			}
-		}
-
-		FluidStack aTest1 = FluidUtils.getFluidStack("molten."+Utils.sanitizeString(this.getLocalizedName()), 1);
-		FluidStack aTest2 = FluidUtils.getFluidStack("fluid."+Utils.sanitizeString(this.getLocalizedName()), 1);
-		FluidStack aTest3 = FluidUtils.getFluidStack(Utils.sanitizeString(this.getLocalizedName()), 1);
+		FluidStack f1 = FluidUtils.getWildcardFluidStack(n1, 1);
+		FluidStack f2 = FluidUtils.getWildcardFluidStack(n2, 1);
+		FluidStack f3 = FluidUtils.getWildcardFluidStack(Utils.sanitizeString(this.getUnlocalizedName(), new char[] {'-', '_'}), 1);
+		FluidStack f4 = FluidUtils.getWildcardFluidStack(Utils.sanitizeString(this.getLocalizedName(), new char[] {'-', '_'}), 1);
 
-		if (aTest1 != null) {
-			Logger.MATERIALS("Found FluidRegistry entry for "+"molten."+Utils.sanitizeString(this.getLocalizedName()));
-			return aTest1.getFluid();
+		if (f1 != null) {
+			aGTBaseFluid = f1.getFluid();
 		}
-		if (aTest2 != null) {
-			Logger.MATERIALS("Found FluidRegistry entry for "+"fluid."+Utils.sanitizeString(this.getLocalizedName()));
-			return aTest2.getFluid();
+		else if (f2 != null) {
+			aGTBaseFluid = f2.getFluid();
 		}
-		if (aTest3 != null) {
-			Logger.MATERIALS("Found FluidRegistry entry for "+Utils.sanitizeString(this.getLocalizedName()));
-			return aTest3.getFluid();
+		else if (f3 != null) {
+			aGTBaseFluid = f3.getFluid();
 		}
+		else if (f4 != null) {
+			aGTBaseFluid = f4.getFluid();
+		}
+		
 
 		ItemStack aFullCell = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1);
+		ItemStack aFullCell2 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getLocalizedName(), 1);
+		ItemStack aFullCell3 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+Utils.sanitizeString(this.getUnlocalizedName(), new char[] {'-', '_'}), 1);
+		ItemStack aFullCell4 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+Utils.sanitizeString(this.getLocalizedName(), new char[] {'-', '_'}), 1);
+		
 		Logger.MATERIALS("Generating our own fluid.");
-		//Generate a Cell if we need to
-		if (aFullCell == null){
+		//Generate a Cell if we need to, but first validate all four searches are invalid
+		
+		if (!ItemUtils.checkForInvalidItems(new ItemStack[] {aFullCell, aFullCell2, aFullCell3, aFullCell4})){
 			if (this.vGenerateCells){
 				Item g = new BaseItemCell(this);
 				aFullCell = ItemUtils.getSimpleStack(g);
@@ -1193,7 +1138,29 @@ public class Material {
 				Logger.MATERIALS("Did not generate a cell for "+this.getUnlocalizedName());
 			}
 		}
+		else {
+			// One cell we searched for was valid, let's register it.
+			if (aFullCell != null) {
+				this.registerComponentForMaterial(ComponentTypes.CELL, aFullCell);
+			}
+			else if (aFullCell2 != null) {
+				this.registerComponentForMaterial(ComponentTypes.CELL, aFullCell2);					
+			}
+			else if (aFullCell3 != null) {
+				this.registerComponentForMaterial(ComponentTypes.CELL, aFullCell3);					
+			}
+			else if (aFullCell4 != null) {
+				this.registerComponentForMaterial(ComponentTypes.CELL, aFullCell4);					
+			}
+		}
 
+		// We found a GT fluid, let's use it.
+		// Good chance we registered the cell from this material too.
+		if (aGTBaseFluid != null) {
+			return aGTBaseFluid;
+		}
+		
+		// This fluid does not exist at all, time to generate it.
 		if (this.materialState == MaterialState.SOLID){
 			return FluidUtils.addGTFluid(
 					this.getUnlocalizedName(),
diff --git a/src/Java/gtPlusPlus/core/slots/SlotNoInputLogging.java b/src/Java/gtPlusPlus/core/slots/SlotNoInputLogging.java
index 42bc7ce346..762714ac94 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotNoInputLogging.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotNoInputLogging.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.slots;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.block.Block;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
@@ -12,13 +13,23 @@ public class SlotNoInputLogging extends SlotNoInput {
 	public SlotNoInputLogging(final IInventory inventory, final int index, final int x, final int y) {
 		super(inventory, index, x, y);
 		aSlotIndex = index;
+		Logger.INFO("Slot "+index+" is doing logging");
 	}
 
 	@Override
 	public boolean isItemValid(final ItemStack itemstack) {
 		if (ItemUtils.checkForInvalidItems(itemstack)) {
 			Logger.INFO("Tried Inserting "+ItemUtils.getItemName(itemstack)+" into slot "+aSlotIndex);
-		}		
+			Block b = Block.getBlockFromItem(itemstack.getItem());
+			Logger.INFO(""+itemstack.getUnlocalizedName());
+			if (b != null) {
+				Logger.INFO(""+b.getLocalizedName());
+				Logger.INFO(""+b.getUnlocalizedName());
+			}
+		}	
+		else {
+			Logger.INFO("Bad Itemstack");
+		}
 		return false;
 	}
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index a0a684d3c6..b3372e8bde 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -15,6 +15,7 @@ import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.common.GT_Proxy;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.item.base.cell.BaseItemCell;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.MaterialGenerator;
@@ -239,11 +240,16 @@ public class PollutionUtils {
 				if (CD != null) {
 					Logger.INFO("[PollutionCompat] Found carbon dioxide fluid, registering it.");
 					PollutionUtils.mPollutionFluidStacks.put(CD);
+					MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(CD);
 					ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonDioxide", 1);
 					if (ItemUtils.checkForInvalidItems(cellCD)) {
 						Logger.INFO("[PollutionCompat] Found carbon dioxide cell, registering component.");
 						MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD);
 					}
+					else {
+						Logger.INFO("[PollutionCompat] Did not find carbon dioxide cell, registering new component.");
+						new BaseItemCell(MISC_MATERIALS.CARBON_DIOXIDE);
+					}
 				}
 				else {
 					MaterialGenerator.generate(MISC_MATERIALS.CARBON_DIOXIDE, false, false);
@@ -252,11 +258,16 @@ public class PollutionUtils {
 				if (CM != null) {
 					Logger.INFO("[PollutionCompat] Found carbon monoxide fluid, registering it.");
 					PollutionUtils.mPollutionFluidStacks.put(CM);
+					MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(CM);
 					ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonMonoxide", 1);
 					if (ItemUtils.checkForInvalidItems(cellCD)) {
-						Logger.INFO("[PollutionCompat] Found carbon dioxide cell, registering component.");
+						Logger.INFO("[PollutionCompat] Found carbon monoxide cell, registering component.");
 						MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD);
 					}
+					else {
+						Logger.INFO("[PollutionCompat] Did not find carbon monoxide cell, registering new component.");
+						new BaseItemCell(MISC_MATERIALS.CARBON_MONOXIDE);
+					}
 				}
 				else {
 					MaterialGenerator.generate(MISC_MATERIALS.CARBON_MONOXIDE, false, false);
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index 9512651417..477bdb2ff5 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -5,10 +5,12 @@ import static gtPlusPlus.core.lib.CORE.GTNH;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.HashSet;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
@@ -487,10 +489,64 @@ public class BioRecipes {
 
 
 	}
-
+	
+	
+
+	public final static HashSet<GT_ItemStack> mFruits = new HashSet<GT_ItemStack>();
+	public final static HashSet<GT_ItemStack> mVege = new HashSet<GT_ItemStack>();
+	public final static HashSet<GT_ItemStack> mNuts = new HashSet<GT_ItemStack>();
+	public final static HashSet<GT_ItemStack> mSeeds = new HashSet<GT_ItemStack>();
+	
+	public final static AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
+	public final static AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
+
+	private static void processFermentationOreDict() {
+		processOreDictEntry("listAllfruit", mFruits);		
+		processOreDictEntry("listAllFruit", mFruits);
+		processOreDictEntry("listAllveggie", mVege);
+		processOreDictEntry("listAllVeggie", mVege);
+		processOreDictEntry("listAllnut", mNuts);
+		processOreDictEntry("listAllNut", mNuts);
+		processOreDictEntry("listAllseed", mSeeds);
+		processOreDictEntry("listAllSeed", mSeeds);
+		
+		if (!mFruits.isEmpty()) {
+			for (GT_ItemStack g : mFruits) {
+				mList_Master_FruitVege.put(g.toStack());
+			}
+		}
+		if (!mVege.isEmpty()) {
+			for (GT_ItemStack g : mVege) {
+				mList_Master_FruitVege.put(g.toStack());
+			}
+		}
+		if (!mNuts.isEmpty()) {
+			for (GT_ItemStack g : mNuts) {
+				mList_Master_FruitVege.put(g.toStack());
+			}
+		}
+		if (!mSeeds.isEmpty()) {
+			for (GT_ItemStack g : mSeeds) {
+				mList_Master_Seeds.put(g.toStack());
+			}
+		}
+	}
+	
+	// Make Fermentation
+	private static void processOreDictEntry(String aOreName, HashSet<GT_ItemStack> mfruits2) {
+		ArrayList<ItemStack> aTemp = OreDictionary.getOres(aOreName);
+		if (!aTemp.isEmpty()) {
+			for (ItemStack stack : aTemp) {
+				mfruits2.add(new GT_ItemStack(stack));
+			}
+		}
+	}
+	
+	
 	private static void recipeFermentationBase() {
-		AutoMap<ItemStack> aFruitVege = AgriculturalChem.mList_Master_FruitVege;
-		AutoMap<ItemStack> aSeeds = AgriculturalChem.mList_Master_Seeds;
+		processFermentationOreDict();
+		AutoMap<ItemStack> aFruitVege = mList_Master_FruitVege;
+		AutoMap<ItemStack> aSeeds = mList_Master_Seeds;
 		ArrayList<ItemStack> aMap = OreDictionary.getOres("cropSugarbeet");		
 		for (ItemStack a : aFruitVege) {
 			if (aMap.contains(a)) {
@@ -780,7 +836,7 @@ public class BioRecipes {
 	private static void recipeAluminiumPellet() {
 		GT_Values.RA.addAutoclaveRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 3),
-				null, 
+				FluidUtils.getFluidStack(BioRecipes.mAir, 1000),
 				ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 4),
 				10000,
 				120 * 20,
@@ -856,7 +912,7 @@ public class BioRecipes {
 
 	private static void recipeAlginicAcid() {
 
-		// Turn into Cellulose Pulp
+		/*// Turn into Cellulose Pulp
 		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 				getBioChip(7),
 				ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 20),
@@ -865,7 +921,7 @@ public class BioRecipes {
 				GT_Values.NF,
 				ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 20),
 				90 * 20,
-				16);
+				16);*/
 	}
 
 	private static void recipeSulfuricAcid() {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index f85d432b0c..42354e49e1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -36,6 +36,7 @@ import gtPlusPlus.everglades.gen.gt.WorldGen_GT;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config;
 import gtPlusPlus.xmod.gregtech.api.world.GTPP_Worldgen;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 import gtPlusPlus.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
@@ -134,6 +135,7 @@ public class HANDLER_GT {
 		}		
 		RecipesToRemove.go();
 		convertPyroToCokeOven();
+		Meta_GT_Proxy.fixIC2FluidNames();
 	}
 
 	private static void convertPyroToCokeOven() {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java
index 0c64644166..cdca065e60 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java
@@ -11,6 +11,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.slots.SlotChemicalPlantInput;
 import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.slots.SlotNoInputLogging;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_ChemicalReactor;
 import net.minecraft.entity.player.EntityPlayer;
@@ -93,6 +94,7 @@ public class Container_FluidReactor extends GT_Container_BasicMachine {
 				}
 			}	
 		}
+		//Logger.INFO("Clicked slot "+aSlotIndex);
 		return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);			
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index 2d7151bf45..d507b3c814 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -13,10 +13,12 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
@@ -33,11 +35,15 @@ import gtPlusPlus.core.handler.AchievementHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.BaseCustomPower_MTE;
 import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
+import ic2.core.init.BlocksItems;
+import ic2.core.init.InternalName;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -45,6 +51,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 public class Meta_GT_Proxy {
@@ -52,74 +60,111 @@ public class Meta_GT_Proxy {
 	static {
 		Logger.INFO("GT_PROXY - initialized.");
 	}
-	
+
 	public static List<Runnable> GT_BlockIconload = new ArrayList<>();
 	public static List<Runnable> GT_ItemIconload = new ArrayList<>();
-	
+
 	public static AutoMap<Integer> GT_ValidHeatingCoilMetas = new AutoMap<Integer>();
 
 	private static Class<BaseCustomTileEntity> sBaseMetaTileEntityClass;
 	private static Class<BaseCustomPower_MTE> sBaseMetaTileEntityClass2;
-	
+
 	public static AchievementHandler mAssemblyAchievements;
-	
+
 	public static final Map<String, FormattedTooltipString> mCustomGregtechMetaTooltips = new LinkedHashMap<String, FormattedTooltipString>();
-	
+
 
 	@SideOnly(Side.CLIENT)
 	public static IIconRegister sBlockIcons, sItemIcons;
 
 	public Meta_GT_Proxy() {
-		
+
 	}
-	
+
 	public static Block sBlockMachines;
-	
+
 	public static void preInit() {
-		
+
 		//New GT++ Block, yay! (Progress)
 		//sBlockMachines = new GTPP_Block_Machines();
-		
-        GT_Log.out.println("GT++ Mod: Register TileEntities.");
-        BaseMetaTileEntity tBaseMetaTileEntity = constructBaseMetaTileEntity();
-        BaseMetaTileEntity tBaseMetaTileEntity2 = constructBaseMetaTileEntityCustomPower();
-
-        GT_Log.out.println("GT++ Mod: Testing BaseMetaTileEntity.");
-        if (tBaseMetaTileEntity == null || tBaseMetaTileEntity2 == null) {
-            GT_Log.out.println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
-            throw new RuntimeException("");
-        }
-		
-        //Gotta set it here so that we don't try call gregtech too early.        
-        //Must set on the correct side
-        
-        if (ReflectionUtils.doesFieldExist(GT_Proxy.class, "gt6Pipe")) {
-        	StaticFields59.mGT6StylePipes = (boolean) StaticFields59.getFieldFromGregtechProxy("gt6Pipe");        	
-        }
-        else {
-        	StaticFields59.mGT6StylePipes = false;        	
-        }       
-        
-        GT_Log.out.println("GT++ Mod: Registering the BaseMetaTileEntity.");
-        GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity_GTPP");
-        GameRegistry.registerTileEntity(tBaseMetaTileEntity2.getClass(), "BaseMetaTileEntity_GTPP2");
-        CoverManager.generateCustomCovers();
+		fixIC2FluidNames();		
+
+		GT_Log.out.println("GT++ Mod: Register TileEntities.");
+		BaseMetaTileEntity tBaseMetaTileEntity = constructBaseMetaTileEntity();
+		BaseMetaTileEntity tBaseMetaTileEntity2 = constructBaseMetaTileEntityCustomPower();
+
+		GT_Log.out.println("GT++ Mod: Testing BaseMetaTileEntity.");
+		if (tBaseMetaTileEntity == null || tBaseMetaTileEntity2 == null) {
+			GT_Log.out.println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
+			throw new RuntimeException("");
+		}
+
+		//Gotta set it here so that we don't try call gregtech too early.        
+		//Must set on the correct side
+
+		if (ReflectionUtils.doesFieldExist(GT_Proxy.class, "gt6Pipe")) {
+			StaticFields59.mGT6StylePipes = (boolean) StaticFields59.getFieldFromGregtechProxy("gt6Pipe");        	
+		}
+		else {
+			StaticFields59.mGT6StylePipes = false;        	
+		}       
+
+		GT_Log.out.println("GT++ Mod: Registering the BaseMetaTileEntity.");
+		GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity_GTPP");
+		GameRegistry.registerTileEntity(tBaseMetaTileEntity2.getClass(), "BaseMetaTileEntity_GTPP2");
+		CoverManager.generateCustomCovers();
 	}
-	
+
 	public static void init() {
 		scheduleCoverMapCleaner();
 		setValidHeatingCoilMetas();	
+		PollutionUtils.setPollutionFluids();
+		fixIC2FluidNames();		
 	}
-	
+
 	public static void postInit() {
-		mAssemblyAchievements = new AchievementHandler();			
+		mAssemblyAchievements = new AchievementHandler();	
+		fixIC2FluidNames();				
 	}
-	
+
+	@SuppressWarnings("deprecation")
+	public static void fixIC2FluidNames() {
+		//Fix IC2 Hot Water name
+		try {
+		String aNewHeatedWaterName = "Heated Water";
+		Logger.INFO("Renaming [IC2 Hotspring Water] --> ["+aNewHeatedWaterName+"].");LanguageRegistry.instance().addStringLocalization("fluidHotWater", "Heated Water");
+		LanguageRegistry.instance().addStringLocalization("fluidHotWater", aNewHeatedWaterName);
+		LanguageRegistry.instance().addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName);
+		GT_LanguageManager.addStringLocalization("fluidHotWater", aNewHeatedWaterName);
+		GT_LanguageManager.addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName);
+
+		Block b = BlocksItems.getFluidBlock(InternalName.fluidHotWater);
+		if (b != null) {
+			LanguageRegistry.addName(ItemUtils.getSimpleStack(b), aNewHeatedWaterName);
+			LanguageRegistry.instance().addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName);
+			GT_LanguageManager.addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName);
+		}
+		Fluid f = BlocksItems.getFluid(InternalName.fluidHotWater);
+		if (f != null) {
+			LanguageRegistry.instance().addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName);
+			GT_LanguageManager.addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName);
+			int aDam = FluidRegistry.getFluidID(f);
+			ItemStack s = ItemList.Display_Fluid.getWithDamage(1, aDam);
+			if (s != null) {
+				LanguageRegistry.addName(s, aNewHeatedWaterName);
+			}			
+		}
+		}
+		catch (Throwable t) {
+			
+		}
+	}
+
 	public static boolean generatePlasmaRecipesForAdvVacFreezer() {
-		
+
 		AutoMap<Recipe_GT> aFreezerMapRebaked = new AutoMap<Recipe_GT>();
 		AutoMap<Recipe_GT> aRemovedRecipes = new AutoMap<Recipe_GT>();
-		
+
 		//Find recipes containing Plasma and map them
 		for (Recipe_GT y : Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes.mRecipeList) {			
 			if (y.mFluidInputs.length > 0) {
@@ -132,20 +177,20 @@ public class Meta_GT_Proxy {
 				aFreezerMapRebaked.put(y);
 			}			
 		}
-		
+
 		AutoMap<Recipe_GT> aNewRecipes = new AutoMap<Recipe_GT>();
 		int aAtomicMass = 0;
 		int aAtomicTier = 0;
-		
+
 		final FluidStack NULL_PLASMA = Materials._NULL.getPlasma(1);
-		
+
 		for (String s : ELEMENT.NAMES) {
-			
+
 			aAtomicMass++;
 			aAtomicTier = (aAtomicMass/30)+1;
 			FluidStack aMoltenFluid = null;
 			FluidStack aPlasma = null;
-			
+
 			//Try Get Material via Gregtech
 			Materials aGregMaterial = MaterialUtils.getMaterial(s);
 			if (aGregMaterial != null) {
@@ -161,7 +206,7 @@ public class Meta_GT_Proxy {
 				}
 				aPlasma = aGregMaterial.getPlasma(100);
 			}
-			
+
 			//Just wildcard values
 			if (aMoltenFluid == null || aPlasma == null) {
 				if (aMoltenFluid == null) {
@@ -171,7 +216,7 @@ public class Meta_GT_Proxy {
 					aPlasma = FluidUtils.getFluidStack("plasma."+s.toLowerCase(), 1);
 				}
 			}
-			
+
 			//Skip this material
 			if (aMoltenFluid == null || aPlasma == null || aPlasma.isFluidEqual(NULL_PLASMA)) {
 				Logger.INFO("Could not generate Advanced Vacuum Freezer recipe. Cooling "+s+" plasma. Molten Form Exists? "+(aMoltenFluid != null)+" | Plasma Exists? "+(aPlasma != null));
@@ -186,49 +231,49 @@ public class Meta_GT_Proxy {
 						null, 
 						new int[] {10000},
 						new FluidStack[] {
-							aPlasma,
-							FluidUtils.getFluidStack("cryotheum", aTotalTickTime)
-						}, 
+								aPlasma,
+								FluidUtils.getFluidStack("cryotheum", aTotalTickTime)
+				}, 
 						new FluidStack[] {
-							aMoltenFluid
-						}, 
+								aMoltenFluid
+				}, 
 						aTotalTickTime, 
 						(int) GT_Values.V[4+aAtomicTier],
 						aAtomicMass);
-				
+
 				//Add it to the map if it's valid
 				if (aTempRecipe != null) {
 					aNewRecipes.put(aTempRecipe);					
 				}				
 			}	
-			
+
 		}
-		
+
 
 		//Add the new recipes to the map we will rebake over the original
 		for (Recipe_GT w : aNewRecipes) {
 			aFreezerMapRebaked.put(w);
 		}
-		
+
 		//Best not touch the original map if we don't have a valid map to override it with.
 		if (aFreezerMapRebaked.size() > 0) {
-