Merge pull request #50 from GTNewHorizons/gtnh-milling

Milling/Nuclear Sciences revamp + Lots of minor fixes

23 files changed, 431 insertions, 218 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 1e0b779bac..4c6f0dc712 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -5,6 +5,7 @@ import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
@@ -13,6 +14,7 @@ import gtPlusPlus.core.common.compat.COMPAT_Baubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.*;
 import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
+import gtPlusPlus.core.item.base.dusts.BaseItemDust;
 import gtPlusPlus.core.item.base.foil.BaseItemFoil;
 import gtPlusPlus.core.item.base.foods.BaseItemFood;
 import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
@@ -231,7 +233,17 @@ public final class ModItems {
 	public static Item dustFertUN18;
 	public static Item dustFertUN32;
 
-	public static Fluid fluidFLiBeSalt;
+	//public static Fluid fluidFLiBeSalt;
+	//public static Fluid fluidFLiBeSaltBurnt;
+
+	public static Fluid fluidLftrCore1;
+	public static Fluid fluidLftrCore2;
+	public static Fluid fluidLftrCore3;
+	public static Fluid fluidLftrCore4;
+	public static Fluid fluidLftrBlanket1;
+	public static Fluid fluidLftrBlanket2;
+	public static Fluid fluidLftrBlanket3;
+	public static Fluid fluidNuclearWaste;
 
 
 	//Possibly missing base items that GT may be missing.
@@ -245,6 +257,7 @@ public final class ModItems {
 	public static Item itemDoublePlateClay;
 	public static Item itemDoublePlateEuropium;
 	public static Item itemFoilUranium235;
+	public static Item itemDustIndium;
 	public static BlockBaseModular blockRawMeat;
 	
 	public static Item itemBoilerChassis;
@@ -283,6 +296,7 @@ public final class ModItems {
 	public static Item dustNeptunium238;
 	public static Item dustDecayedRadium226;
 	public static Item dustRadium226;
+	public static Item dustProtactinium233;
 	
 	public static ItemGiantEgg itemBigEgg;
 
@@ -458,6 +472,8 @@ public final class ModItems {
 			MaterialGenerator.generate(ELEMENT.getInstance().IODINE); //LFTR byproduct
 			MaterialGenerator.generate(ELEMENT.getInstance().HAFNIUM);
 			MaterialGenerator.generate(ELEMENT.getInstance().DYSPROSIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().ERBIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().PRASEODYMIUM);
 			MaterialGenerator.generate(ELEMENT.getInstance().TELLURIUM); //LFTR byproduct
 			MaterialGenerator.generate(ELEMENT.getInstance().RHODIUM);
 			MaterialGenerator.generate(ELEMENT.getInstance().RHENIUM);
@@ -536,30 +552,31 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE);
 
 			//LFTR Fuel components
-			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
+			//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.generateNuclearDusts(FLUORIDES.AMMONIUM_BIFLUORIDE); //LFTR fuel component
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_HYDROXIDE); //LFTR fuel component
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); //LFTR fuel component
 
 			//Generate Fluorides
-			MaterialGenerator.generateNuclearMaterial(FLUORIDES.BERYLLIUM_FLUORIDE);
-			MaterialGenerator.generateNuclearMaterial(FLUORIDES.LITHIUM_FLUORIDE);
-			MaterialGenerator.generateNuclearMaterial(FLUORIDES.THORIUM_TETRAFLUORIDE);
-			MaterialGenerator.generateNuclearMaterial(FLUORIDES.THORIUM_HEXAFLUORIDE);
-			MaterialGenerator.generateNuclearMaterial(FLUORIDES.URANIUM_TETRAFLUORIDE);
-			MaterialGenerator.generateNuclearMaterial(FLUORIDES.URANIUM_HEXAFLUORIDE);
-			MaterialGenerator.generateNuclearMaterial(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE);
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_FLUORIDE);
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.LITHIUM_FLUORIDE);
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.THORIUM_TETRAFLUORIDE);
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.THORIUM_HEXAFLUORIDE);
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.URANIUM_TETRAFLUORIDE, false);
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.URANIUM_HEXAFLUORIDE, false);
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE);
 			//LFTR Fluoride outputs
-			MaterialGenerator.generateNuclearMaterial(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE);
-			MaterialGenerator.generateNuclearMaterial(FLUORIDES.TECHNETIUM_HEXAFLUORIDE);
-			MaterialGenerator.generateNuclearMaterial(FLUORIDES.SELENIUM_HEXAFLUORIDE);
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE);
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.TECHNETIUM_HEXAFLUORIDE);
+			MaterialGenerator.generateNuclearDusts(FLUORIDES.SELENIUM_HEXAFLUORIDE);
 
 			//Generate Reactor Fuel Salts
-			MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ZrF4U235, false);
-			MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ZrF4UF4, false);
-			MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ThF4UF4, false);
+			MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4U235);
+			MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4UF4);
+			MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ThF4UF4);
+			//MaterialGenerator.generateNuclearMaterial(NUCLIDE.Li2BeF4, false);
 
 			//Generate some Alloys
 
@@ -626,12 +643,14 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.TRINIUM_REINFORCED_STEEL);
 			
 			//Top Tier Alloys
+			MaterialGenerator.generate(ALLOY.HELICOPTER);
 			MaterialGenerator.generate(ALLOY.LAFIUM);
 			MaterialGenerator.generate(ALLOY.CINOBITE);
 			MaterialGenerator.generate(ALLOY.PIKYONIUM);
 			MaterialGenerator.generate(ALLOY.ABYSSAL);
 			MaterialGenerator.generate(ALLOY.LAURENIUM);
 			MaterialGenerator.generate(ALLOY.BOTMIUM);
+			MaterialGenerator.generate(ALLOY.HS188A);
 			
 
 			MaterialGenerator.generate(ALLOY.TITANSTEEL);
@@ -710,12 +729,26 @@ public final class ModItems {
 			GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1));
 		}
 		dustLi2CO3CaOH2 = ItemUtils.generateSpecialUseDusts("Li2CO3CaOH2", "Li2CO3 + Ca(OH)2 Compound", "Li2CO3CaOH2", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
-
+		MaterialUtils.generateSpecialDustAndAssignToAMaterial(FLUORIDES.SODIUM_FLUORIDE, false);
 		//FLiBe Fuel Compounds
-		dustLi2BeF4 = ItemUtils.generateSpecialUseDusts("Li2BeF4", "Li2BeF4 Fuel Compound", "Li2BeF4", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe
+		dustLi2BeF4 = ItemUtils.generateSpecialUseDusts("Li2BeF4", "Lithium Tetrafluoroberyllate Fuel Compound", "Li2BeF4", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe
+		Material.registerComponentForMaterial(NUCLIDE.Li2BeF4, OrePrefixes.dust, ItemUtils.getSimpleStack(dustLi2BeF4));
 		//fluidFLiBeSalt = ("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}, 0);
-		fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Li2BeF4", new short[]{255, 255, 255, 100}, 0, 743, null, CI.emptyCells(1), 1000, true);
-
+		//fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Lithium Tetrafluoroberyllate", new short[]{255, 255, 255, 100}, 0, 743, null, CI.emptyCells(1), 1000, true);
+		//fluidFLiBeSaltBurnt = FluidUtils.addGTFluidNoPrefix("Li2BeF2UF4", "Li2BeF2UF4", new short[]{50, 255, 50, 100}, 0, 743, null, CI.emptyCells(1), 1000, true);
+		
+		// LFTR Core Fluid Processing
+		//fluidLftrCore1 = FluidUtils.addGTFluidNoPrefix("LiBeF2UF4FP", "LiBeF2UF4FP", new short[]{110, 255, 110, 100}, 0, 800, null, CI.emptyCells(1), 1000, true);
+		//fluidLftrCore2 = FluidUtils.addGTFluidNoPrefix("UF6F2FP", "UF6F2FP", new short[]{150, 255, 150, 100}, 0, 800, null, CI.emptyCells(1), 1000, true);
+		//fluidLftrCore3 = FluidUtils.addGTFluidNoPrefix("LiFBeF2", "LiFBeF2", new short[]{100, 255, 50, 100}, 0, 800, null, CI.emptyCells(1), 1000, true);
+		//fluidLftrCore4 = FluidUtils.addGTFluidNoPrefix("LiFBeF2UF4", "LiFBeF2UF4", new short[]{50, 255, 100, 100}, 0, 800, null, CI.emptyCells(1), 1000, true);
+		// LFTR Blanket Fluid Processing
+		//fluidLftrBlanket1 = FluidUtils.addGTFluidNoPrefix("LiFThF4", "LiFThF4", new short[]{50, 150, 255, 50}, 0, 500, null, CI.emptyCells(1), 1000, true);
+		//fluidLftrBlanket2 = FluidUtils.addGTFluidNoPrefix("LiFBeF2ThF4", "LiFBeF2ThF4", new short[]{100, 150, 100, 100}, 0, 500, null, CI.emptyCells(1), 1000, true);
+		//fluidLftrBlanket3 = FluidUtils.addGTFluidNoPrefix("UF6F2", "UF6F2", new short[]{10, 150, 10, 100}, 0, 500, null, CI.emptyCells(1), 1000, true);
+		fluidNuclearWaste = FluidUtils.addGTFluidNoPrefix("nuclear.waste", "Nuclear Waste", new short[]{10, 250, 10, 100}, 0, 1000, null, CI.emptyCells(1), 1000, true);
+		
+		
 		//LFTR Control Circuit
 		itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Control Circuit", AddToCreativeTab.tabMisc, 1, 0,  new String[] {"Keeps Multiblocks Stable"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
 
@@ -737,7 +770,8 @@ public final class ModItems {
 		//GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
 		//GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));
 		fluidZrF4 = FluidUtils.generateFluidNoPrefix("ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[]{170, 170, 140, 100}); //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
-
+		FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4);
+		
 		//Coolant Salt
 		//NaBF4 - NaF - 621C
 		//dustNaBF4NaF = ItemUtils.generateSpecialUseDusts("NaBF4NaF", "NaBF4NaF", Utils.rgbtoHexValue(45, 45, 90))[0]; //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
@@ -831,6 +865,11 @@ public final class ModItems {
 		else {
 			itemHotTitaniumIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1);
 		}
+
+		//Need this for Laurenium
+		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIndium", 1) == null){
+			itemDustIndium = new BaseItemDust(ELEMENT.getInstance().INDIUM);
+		}
 		
 		//Industrial Diamonds
 		itemExquisiteIndustrialDiamond = new CoreItem("IndustrialDiamondExquisite", "High Quality Industrial Diamond", tabMisc);
@@ -938,7 +977,7 @@ public final class ModItems {
 		dustNeptunium238 = new DustDecayable("dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, new String[] {""+StringUtils.superscript("238Np"), "Result: Plutonium 238 ("+StringUtils.superscript("238Pu")+")"}, ELEMENT.getInstance().PLUTONIUM238.getDust(1).getItem(), 5);
 		dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts("DecayedRadium226", "Decayed Radium-226", "Contains Radon ("+StringUtils.superscript("222Rn")+")", ELEMENT.getInstance().RADIUM.getRgbAsHex())[0];
 		dustRadium226 = new DustDecayable("dustRadium226", ELEMENT.getInstance().RADIUM.getRgbAsHex(), 90000, new String[] {""+StringUtils.superscript("226Ra"), "Result: Radon ("+StringUtils.superscript("222Rn")+")"}, ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), 5);
-
+		dustProtactinium233 = new DustDecayable("dustProtactinium233", ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(), 32000, new String[] {""+StringUtils.superscript("233Pa"), "Result: Uranium 233("+StringUtils.superscript("233U")+")"}, ELEMENT.getInstance().URANIUM233.getDust(1).getItem(), 6);
 		dustTechnetium99 = new DustDecayable("dustTechnetium99", ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(), 164500, new String[] {""+StringUtils.superscript("99Mo"), "Result: Ruthenium 99("+StringUtils.superscript("99Ru")+")"}, ELEMENT.getInstance().RUTHENIUM.getDust(1).getItem(), 4);
 		dustTechnetium99M = new DustDecayable("dustTechnetium99M", ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(), 8570, new String[] {""+StringUtils.superscript("99ᵐTc"), "Result: Technicium 99 ("+StringUtils.superscript("99Tc")+")"}, dustTechnetium99, 4);
 		dustMolybdenum99 = new DustDecayable("dustMolybdenum99", ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), 16450, new String[] {""+StringUtils.superscript("99Mo"), "Result: Technicium 99ᵐ ("+StringUtils.superscript("99ᵐTc")+")"}, dustTechnetium99M, 4);
@@ -1037,10 +1076,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), 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);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), MaterialEIO.REDSTONE_ALLOY.getFluidStack(144), 16, 4*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), MaterialEIO.REDSTONE_ALLOY.getFluidStack(144), 16, 4*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), MaterialEIO.REDSTONE_ALLOY.getFluidStack(16), 16, 4);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), MaterialEIO.REDSTONE_ALLOY.getFluidStack(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 9b732e38e1..9ad8ea3feb 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -84,8 +84,9 @@ public class BaseItemComponent extends Item{
 		else {
 			aFormattedNameForFluids = unlocalName;
 		}		
-		 	
-		this.componentMaterial = null;
+		Material aTempMaterial = Material.mMaterialCache.get(localName.toLowerCase());
+		Logger.INFO("Attempted to get "+localName+" cell material from cache. Valid? "+(aTempMaterial != null));
+		this.componentMaterial = aTempMaterial;
 		this.unlocalName = "itemCell"+aFormattedNameForFluids;
 		this.materialName = localName;
 		this.componentType = ComponentTypes.CELL;
@@ -94,6 +95,7 @@ public class BaseItemComponent extends Item{
 		this.setMaxStackSize(64);
 		this.componentColour = MathUtils.getRgbAsHex(RGBA);
 		this.extraData = RGBA;
+		
 		this.setTextureName(CORE.MODID + ":" + "item"+ComponentTypes.CELL.COMPONENT_NAME);
 		GameRegistry.registerItem(this, aFormattedNameForFluids);
 		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+Utils.sanitizeStringKeepBrackets(localName), ItemUtils.getSimpleStack(this));
@@ -177,10 +179,10 @@ public class BaseItemComponent extends Item{
 
 
 				if (this.componentMaterial != null){
-					if (!this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
+					if (!this.componentMaterial.vChemicalFormula.contains("?")) {
 						list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula));
 					}
-					else if (this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
+					else if (this.componentMaterial.vChemicalFormula.contains("?")) {
 						String temp = componentMaterial.vChemicalFormula;
 						temp = temp.replace(" ", "");
 						temp = temp.replace("-", "");
@@ -202,6 +204,12 @@ public class BaseItemComponent extends Item{
 						}
 					}
 				}
+				else {
+					String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase());
+					if (aChemicalFormula != null && aChemicalFormula.length() > 0) {			
+						list.add(Utils.sanitizeStringKeepBrackets(aChemicalFormula));						
+					}
+				}
 
 				//Hidden Tooltip
 				if (KeyboardUtils.isCtrlKeyDown()) {
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
index 79a49f92b7..eb066024e0 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
@@ -45,6 +45,7 @@ public class BaseItemTickable extends CoreItem {
 		this.maxTicks = maxTicks;
 		this.twoRenderPasses = twoPass;
 		this.ticksInContainers = containerTick;
+		this.maxStackSize = 1;
 		//setGregtechItemList();
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
index 5f0254bc51..ea96e2914c 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
@@ -1,12 +1,7 @@
 package gtPlusPlus.core.item.base.ingots;
 
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.util.GT_ModHandler;
-
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class BaseItemIngot extends BaseItemComponent{
 
@@ -21,18 +16,6 @@ public class BaseItemIngot extends BaseItemComponent{
 		super(material, type);
 		this.materialName = material.getLocalizedName();
 		this.unlocalName = material.getUnlocalizedName();
-		if (type != ComponentTypes.HOTINGOT) {
-			this.generateCompressorRecipe();
-		}
 	}
 
-	private void generateCompressorRecipe(){
-		final ItemStack tempStack = componentMaterial.getIngot(9);
-		final ItemStack tempOutput = componentMaterial.getBlock(1);
-		if (ItemUtils.checkForInvalidItems(new ItemStack[] {tempStack, tempOutput})){
-			GT_ModHandler.addCompressionRecipe(tempStack, tempOutput);
-		}
-	}
-
-
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index f9acdded7e..c19fecd924 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -52,8 +52,8 @@ public class BaseItemIngotHot extends BaseItemIngot{
 	}
 
 	private void generateRecipe(){
-		Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of "+this.materialName+".");
-		GT_Values.RA.addVacuumFreezerRecipe(ItemUtils.getSimpleStack(this), this.outputIngot.copy(), 60*this.mTier);
+		Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of "+this.materialName+".");	
+		CORE.RA.addVacuumFreezerRecipe(ItemUtils.getSimpleStack(this), this.outputIngot.copy(), (int) Math.max(this.componentMaterial.getMass() * 3L, 1L), this.componentMaterial.vVoltageMultiplier);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java b/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java
index a6eb598622..1644856bf8 100644
--- a/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java
+++ b/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java
@@ -8,4 +8,5 @@ public class BaseItemNugget extends BaseItemComponent{
 	public BaseItemNugget(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.NUGGET);
 	}
+	
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 883eb241da..2cb23b3f97 100644
--- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -14,7 +14,6 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -124,10 +123,10 @@ 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.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
+				if (!this.componentMaterial.vChemicalFormula.contains("?")) {
 					list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula));
 				}
-				else if (this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
+				else if (this.componentMaterial.vChemicalFormula.contains("?")) {
 					String temp = componentMaterial.vChemicalFormula;
 					temp = temp.replace(" ", "");
 					temp = temp.replace("-", "");
@@ -142,6 +141,12 @@ public class BaseOreComponent extends Item{
 					list.add(CORE.GT_Tooltip_Radioactive+" | Level: "+this.componentMaterial.vRadiationLevel);
 				}
 			}
+			else {
+				String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase());
+				if (aChemicalFormula != null && aChemicalFormula.length() > 0) {			
+					list.add(Utils.sanitizeStringKeepBrackets(aChemicalFormula));						
+				}
+			}
 		}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
index 34d44cd43e..a810b22c70 100644
--- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
+++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
@@ -15,6 +15,4 @@ public class BaseItemPlate extends BaseItemComponent{
 		this(MaterialUtils.generateQuickMaterial(materialName, state, new short[]{colour[0], colour[1], colour[2], 0}, sRadioactivity));
 	}
 
-
-
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java
index 373f84b7c5..31f86e8ffa 100644
--- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java
+++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java
@@ -16,4 +16,5 @@ public class BaseItemPlateDouble extends BaseItemComponent{
 	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
 		return ("Double "+this.materialName+ " Plate");
 	}
+	
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java b/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java
index 62777cc9f5..c83ae94af1 100644
--- a/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java
+++ b/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java
@@ -8,4 +8,5 @@ public class BaseItemRing extends BaseItemComponent{
 	public BaseItemRing(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.RING);
 	}
+	
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
index ef3266fe75..f77f846d34 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
@@ -1,49 +1,12 @@
 package gtPlusPlus.core.item.base.rods;
 
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class BaseItemRod extends BaseItemComponent{
 
 	public BaseItemRod(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.ROD);
-		this.addCutterRecipe(material);
-		this.addLatheRecipe(material);
-	}
-
-
-	private void addCutterRecipe(Material material){
-		Logger.WARNING("Adding cutter recipe for "+this.materialName+" Rods");
-		final ItemStack stackStick = this.componentMaterial.getRod(1);
-		final ItemStack stackBolt = this.componentMaterial.getBolt(4);
-		
-		if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackBolt}))
-			GT_Values.RA.addCutterRecipe(
-					stackStick,
-					stackBolt,
-					null,
-					(int) Math.max(this.componentMaterial.getMass() * 2L, 1L),
-					material.vVoltageMultiplier);
-	}
-
-
-	private void addLatheRecipe(Material material){
-		Logger.WARNING("Adding recipe for "+this.materialName+" Rod");
-		ItemStack boltStack = this.componentMaterial.getIngot(1);
-		if (ItemUtils.checkForInvalidItems(boltStack)){
-			GT_Values.RA.addLatheRecipe(
-					boltStack,
-					ItemUtils.getSimpleStack(this),
-					material.getSmallDust(2),
-					(int) Math.max(this.componentMaterial.getMass() / 8L, 1L),
-					material.vVoltageMultiplier);
-		}
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
index 9b232f95c5..215012817d 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
@@ -1,19 +1,13 @@
 package gtPlusPlus.core.item.base.rods;
 
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.ItemStack;
 
 public class BaseItemRodLong extends BaseItemComponent{
 
 	public BaseItemRodLong(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.RODLONG);
-		this.addExtruderRecipe();
 	}
 
 	@Override
@@ -21,26 +15,4 @@ public class BaseItemRodLong extends BaseItemComponent{
 		return ("Long "+this.materialName+ " Rod");
 	}
 
-	private void addExtruderRecipe(){
-		Logger.WARNING("Adding recipe for Long "+this.materialName+" Rods");
-
-		final ItemStack stackStick = this.componentMaterial.getRod(2);
-		final ItemStack stackLong = this.componentMaterial.getLongRod(1);
-
-		if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackLong}))
-		GT_Values.RA.addForgeHammerRecipe(
-				stackStick,
-				stackLong,
-				(int) Math.max(this.componentMaterial.getMass(), 1L),
-				16);
-
-		if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackLong}))
-		GT_Values.RA.addCutterRecipe(
-				stackLong,
-				stackStick,
-				null,
-				(int) Math.max(this.componentMaterial.getMass(), 1L),
-				4);
-	}
-
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
index 29e525ed10..dbd817215a 100644
--- a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
+++ b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
@@ -1,32 +1,12 @@
 package gtPlusPlus.core.item.base.screws;
 
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class BaseItemScrew extends BaseItemComponent{
 
 	public BaseItemScrew(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.SCREW);
-		this.addLatheRecipe();
-	}
-
-	private void addLatheRecipe(){
-		Logger.WARNING("Adding recipe for "+this.materialName+" Screws");
-		ItemStack boltStack = this.componentMaterial.getBolt(1);
-		if (ItemUtils.checkForInvalidItems(boltStack)){
-			GT_Values.RA.addLatheRecipe(
-					boltStack,
-					ItemUtils.getSimpleStack(this),
-					null,
-					(int) Math.max(this.componentMaterial.getMass() / 8L, 1L),
-					4);
-		}
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
index cfa5cb363d..4316f13401 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
@@ -135,7 +135,7 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric
 		list.add(EnumChatFormatting.GOLD + aEuInfo + EnumChatFormatting.GRAY);
 		list.add(EnumChatFormatting.GRAY + aTier+": [" + EnumChatFormatting.YELLOW + this.getTier(stack)
 		+ EnumChatFormatting.GRAY + "] "+aInputLimit+": [" + EnumChatFormatting.YELLOW
-		+ this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT);
+		+ this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT+"]");
 		list.add(EnumChatFormatting.GRAY + aCurrentPower +": [" + EnumChatFormatting.YELLOW + (long) this.getCharge(stack)
 		+ EnumChatFormatting.GRAY + aEU +"] [" + EnumChatFormatting.YELLOW
 		+ MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index e11b163753..8e7a760195 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -296,7 +296,7 @@ public class AgriculturalChem extends ItemPackage {
 		}
 
 		if (aTiCon) {
-			aBlood = FluidUtils.getFluidStack("hell_blood", 100);
+			aBlood = FluidUtils.getFluidStack("blood", 100);
 			if (aBlood != null) {
 				Logger.INFO("Found Tinker's Construct, enabled Blood support.");
 				CustomBlood = aBlood.getFluid();
@@ -435,7 +435,7 @@ public class AgriculturalChem extends ItemPackage {
 		ItemStack aBone;
 		ItemStack aMeat;
 		ItemStack aEmptyCells = CI.emptyCells(2);
-		ItemStack aInputCells = ItemUtils.getItemStackOfAmountFromOreDict("cellRawWaste", 2);
+		ItemStack aInputCells = ItemUtils.getItemStackOfAmountFromOreDict("cellRawAnimalWaste", 2);
 		FluidStack aOutput = FluidUtils.getFluidStack(FertileManureSlurry, 1000);
 
 		for (FluidStack aBloodStack : mBloodFluids) {
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index badd318414..ca9053dacb 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -53,27 +53,35 @@ public class CoalTar extends ItemPackage {
 		FluidStack bioEth1 = FluidUtils.getFluidStack("fluid.bioethanol", 2000);
 		FluidStack bioEth2 = FluidUtils.getFluidStack("bioethanol", 2000);
 
-		if (bioEth1 != null){
+		if (bioEth1 != null){			
 			CORE.RA.addDehydratorRecipe(
-					ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
-					bioEth1,
+					new ItemStack[] {
+							CI.getNumberedBioCircuit(17),
+							ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1)
+							}, 
+					bioEth1, 
+					FluidUtils.getWater(1000), 
 					new ItemStack[]{
-							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1),
 							ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1)
-					},
-					120*20,
+					}, 
+					new int[] {10000}, 
+					120 * 20,
 					80);
 		}
 
 		if (bioEth2 != null){
 			CORE.RA.addDehydratorRecipe(
-					ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
-					bioEth2,
+					new ItemStack[] {
+							CI.getNumberedBioCircuit(18),
+							ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1)
+							}, 
+					bioEth2, 
+					FluidUtils.getWater(1000), 
 					new ItemStack[]{
-							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1),
 							ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1)
-					},
-					120*20,
+					}, 
+					new int[] {10000}, 
+					120 * 20,
 					80);
 		}
 	}
@@ -241,16 +249,19 @@ public class CoalTar extends ItemPackage {
 
 	}
 
-	private static void recipePhthalicAcidToPhthalicAnhydride() {
+	private static void recipePhthalicAcidToPhthalicAnhydride() {		
 		CORE.RA.addDehydratorRecipe(
-				ItemUtils.getGregtechCircuit(6),
-				FluidUtils.getFluidStack("fluid.phthalicacid", 144),
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(15)
+						}, 
+				FluidUtils.getFluidStack("fluid.phthalicacid", 144), 
+				null, 
 				new ItemStack[]{
 						ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 1)
-				},
-				60*20,
+				}, 
+				new int[] {10000}, 
+				60 * 20,
 				120);
-
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index f61a2096b7..a42d179f65 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -36,9 +36,9 @@ public class GenericChem extends ItemPackage {
 	 * Materials
 	 */	
 
-	public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, null, 0);//Not a GT Inherited Material
-	public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, null, 0);//Not a GT Inherited Material
-	public static final Material CARBYNE = new Material("Carbyne", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{25, 25, 25}, 2500, 5000, 63, 52, true, null, 0);//Not a GT Inherited Material
+	//public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, null, 0);//Not a GT Inherited Material
+	//public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, null, 0);//Not a GT Inherited Material
+	//public static final Material CARBYNE = new Material("Carbyne", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{25, 25, 25}, 2500, 5000, 63, 52, true, null, 0);//Not a GT Inherited Material
 
 
 	//Refined PTFE
@@ -57,13 +57,7 @@ public class GenericChem extends ItemPackage {
 					new MaterialStack(NONMATERIAL.PLASTIC, 15),
 					new MaterialStack(ELEMENT.getInstance().CARBON, 5),
 					new MaterialStack(ELEMENT.getInstance().SODIUM, 5)
-			});// Not a GT
-	// Inherited
-	// Material
-
-	//public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
-	//public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
-	//public static final Material Nylon = new Material();
+			});
 
 	/**
 	 * Fluids
@@ -123,8 +117,8 @@ public class GenericChem extends ItemPackage {
 	@Override
 	public void items() {		
 		PhenolicResins = ItemUtils.generateSpecialUseDusts("phenolicresins", "Phenolic Resin", "HOC6H4CH2OH", Utils.rgbtoHexValue(80, 40, 40))[0];		
-		MaterialGenerator.generate(BAKELITE, false);	
-		MaterialGenerator.generate(NYLON, false);
+		//MaterialGenerator.generate(BAKELITE, false);	
+		//MaterialGenerator.generate(NYLON, false);
 		MaterialGenerator.generate(TEFLON, false);		
 
 		mGenericChemItem1 = new ItemGenericChemBase();	
@@ -351,7 +345,7 @@ public class GenericChem extends ItemPackage {
 
 				}, 
 				new FluidStack[] {
-						ELEMENT.getInstance().HYDROGEN.getFluid(2000)						
+						ELEMENT.getInstance().HYDROGEN.getFluidStack(2000)						
 				}, 
 				20 *20,
 				120, 
@@ -433,8 +427,8 @@ public class GenericChem extends ItemPackage {
 	private void recipeHydricSulfur() {
 		
 		ItemStack aCellHydricSulfide = ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenSulfide", 1);		
-        GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().SULFUR.getDust(1), GT_Utility.getIntegratedCircuit(1), ELEMENT.getInstance().HYDROGEN.getFluid(2000), FluidUtils.getFluidStack(Hydrogen_Sulfide, 3000), GT_Values.NI, 60, 8);
-        GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().SULFUR.getDust(1), CI.emptyCells(3),        ELEMENT.getInstance().HYDROGEN.getFluid(2000), GT_Values.NF, ItemUtils.getSimpleStack(aCellHydricSulfide, 3), GT_Values.NI, 60, 8);
+        GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().SULFUR.getDust(1), GT_Utility.getIntegratedCircuit(1), ELEMENT.getInstance().HYDROGEN.getFluidStack(2000), FluidUtils.getFluidStack(Hydrogen_Sulfide, 3000), GT_Values.NI, 60, 8);
+        GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().SULFUR.getDust(1), CI.emptyCells(3),        ELEMENT.getInstance().HYDROGEN.getFluidStack(2000), GT_Values.NF, ItemUtils.getSimpleStack(aCellHydricSulfide, 3), GT_Values.NI, 60, 8);
 		
 	}
 
@@ -516,9 +510,9 @@ public class GenericChem extends ItemPackage {
 	private void recipeNitrogenDioxide() {
 		ItemStack aNitricOxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitricOxide", 1); 
 		ItemStack aNitrogenDioxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitrogenDioxide", 1);		
-		GT_Values.RA.addChemicalRecipe(                   ItemUtils.getSimpleStack(aNitricOxideCell, 2), GT_Utility.getIntegratedCircuit(1), ELEMENT.getInstance().OXYGEN.getFluid(1000),      FluidUtils.getFluidStack(Nitrogen_Dioxide, 3000), CI.emptyCells(2), 160);
+		GT_Values.RA.addChemicalRecipe(                   ItemUtils.getSimpleStack(aNitricOxideCell, 2), GT_Utility.getIntegratedCircuit(1), ELEMENT.getInstance().OXYGEN.getFluidStack(1000),      FluidUtils.getFluidStack(Nitrogen_Dioxide, 3000), CI.emptyCells(2), 160);
 		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(1),      GT_Utility.getIntegratedCircuit(1), FluidUtils.getFluidStack(Nitric_Oxide, 2000), FluidUtils.getFluidStack(Nitrogen_Dioxide, 3000), CI.emptyCells(1), 160);
-		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ItemUtils.getSimpleStack(aNitricOxideCell, 2), CI.emptyCells(1),        ELEMENT.getInstance().OXYGEN.getFluid(1000),      GT_Values.NF,                           ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30);
+		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ItemUtils.getSimpleStack(aNitricOxideCell, 2), CI.emptyCells(1),        ELEMENT.getInstance().OXYGEN.getFluidStack(1000),      GT_Values.NF,                           ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30);
 		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().OXYGEN.getCell(1),      CI.emptyCells(2),        FluidUtils.getFluidStack(Nitric_Oxide, 2000), GT_Values.NF,                           ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30);
 		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ItemUtils.getSimpleStack(aNitricOxideCell, 2), ELEMENT.getInstance().OXYGEN.getCell(1),       GT_Values.NF,                       GT_Values.NF,                           ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30);
 	}
@@ -527,16 +521,16 @@ public class GenericChem extends ItemPackage {
 	private void recipeNitricOxide() {
 		ItemStack aWaterCell = ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1);
 		ItemStack aNitricOxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitricOxide", 1); 		
-		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(MISC_MATERIALS.AMMONIA.getCell(8), CI.emptyCells(1),         ELEMENT.getInstance().OXYGEN.getFluid(5000),  FluidUtils.getFluidStack(Nitric_Oxide, 4000), ItemUtils.getSimpleStack(aWaterCell, 9),       GT_Values.NI, 160, 30);
-		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().OXYGEN.getCell(5),  CI.emptyCells(4),         MISC_MATERIALS.AMMONIA.getFluid(8000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), ItemUtils.getSimpleStack(aWaterCell, 9),       GT_Values.NI, 160, 30);
-		GT_Values.RA.addChemicalRecipe(                   MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(11), ELEMENT.getInstance().OXYGEN.getFluid(5000),  FluidUtils.getWater(9000),     ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(4), 160);
-		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(5),  GT_Utility.getIntegratedCircuit(11), MISC_MATERIALS.AMMONIA.getFluid(8000), FluidUtils.getWater(9000),     ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(1), 160);
-		GT_Values.RA.addChemicalRecipe(                   MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(2),  ELEMENT.getInstance().OXYGEN.getFluid(5000),  FluidUtils.getFluidStack(Nitric_Oxide, 4000), CI.emptyCells(8), 320);
-		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(5),  GT_Utility.getIntegratedCircuit(2),  MISC_MATERIALS.AMMONIA.getFluid(8000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), CI.emptyCells(5), 320);
-		GT_Values.RA.addChemicalRecipe(                   MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(12), ELEMENT.getInstance().OXYGEN.getFluid(5000),  GT_Values.NF,                       ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(4), 160);
-		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(5),  GT_Utility.getIntegratedCircuit(12), MISC_MATERIALS.AMMONIA.getFluid(8000), GT_Values.NF,                       ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(1), 160);
+		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(MISC_MATERIALS.AMMONIA.getCell(8), CI.emptyCells(1),         ELEMENT.getInstance().OXYGEN.getFluidStack(5000),  FluidUtils.getFluidStack(Nitric_Oxide, 4000), ItemUtils.getSimpleStack(aWaterCell, 9),       GT_Values.NI, 160, 30);
+		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().OXYGEN.getCell(5),  CI.emptyCells(4),         MISC_MATERIALS.AMMONIA.getFluidStack(8000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), ItemUtils.getSimpleStack(aWaterCell, 9),       GT_Values.NI, 160, 30);
+		GT_Values.RA.addChemicalRecipe(                   MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(11), ELEMENT.getInstance().OXYGEN.getFluidStack(5000),  FluidUtils.getWater(9000),     ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(4), 160);
+		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(5),  GT_Utility.getIntegratedCircuit(11), MISC_MATERIALS.AMMONIA.getFluidStack(8000), FluidUtils.getWater(9000),     ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(1), 160);
+		GT_Values.RA.addChemicalRecipe(                   MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(2),  ELEMENT.getInstance().OXYGEN.getFluidStack(5000),  FluidUtils.getFluidStack(Nitric_Oxide, 4000), CI.emptyCells(8), 320);
+		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(5),  GT_Utility.getIntegratedCircuit(2),  MISC_MATERIALS.AMMONIA.getFluidStack(8000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), CI.emptyCells(5), 320);
+		GT_Values.RA.addChemicalRecipe(                   MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(12), ELEMENT.getInstance().OXYGEN.getFluidStack(5000),  GT_Values.NF,                       ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(4), 160);
+		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(5),  GT_Utility.getIntegratedCircuit(12), MISC_MATERIALS.AMMONIA.getFluidStack(8000), GT_Values.NF,                       ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(1), 160);
 		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(MISC_MATERIALS.AMMONIA.getCell(8), ELEMENT.getInstance().OXYGEN.getCell(5),        GT_Values.NF,                   GT_Values.NF,                       ItemUtils.getSimpleStack(aNitricOxideCell, 4), ItemUtils.getSimpleStack(aWaterCell, 9), 160, 30);
-		GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(1)}, new FluidStack[]{MISC_MATERIALS.AMMONIA.getFluid(8000), ELEMENT.getInstance().OXYGEN.getFluid(5000)}, new FluidStack[]{FluidUtils.getFluidStack(Nitric_Oxide, 4000), FluidUtils.getWater(9000)}, null, 160, 30);
+		GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(1)}, new FluidStack[]{MISC_MATERIALS.AMMONIA.getFluidStack(8000), ELEMENT.getInstance().OXYGEN.getFluidStack(5000)}, new FluidStack[]{FluidUtils.getFluidStack(Nitric_Oxide, 4000), FluidUtils.getWater(9000)}, null, 160, 30);
 	}
 
 
@@ -547,7 +541,7 @@ public class GenericChem extends ItemPackage {
 		CORE.RA.addChemicalRecipe(                   
 				ELEMENT.getInstance().CHLORINE.getCell(1), 
 				GT_Utility.getIntegratedCircuit(1),  
-				ELEMENT.getInstance().HYDROGEN.getFluid(1000), 
+				ELEMENT.getInstance().HYDROGEN.getFluidStack(1000), 
 				FluidUtils.getFluidStack(HydrochloricAcid, 2000), 
 				CI.emptyCells(1), 
 				60, 
@@ -556,7 +550,7 @@ public class GenericChem extends ItemPackage {
 		CORE.RA.addChemicalRecipe(                  
 				ELEMENT.getInstance().HYDROGEN.getCell(1),
 				GT_Utility.getIntegratedCircuit(1),  
-				ELEMENT.getInstance().CHLORINE.getFluid(1000), 
+				ELEMENT.getInstance().CHLORINE.getFluidStack(1000), 
 				FluidUtils.getFluidStack(HydrochloricAcid, 2000), 
 				CI.emptyCells(1), 
 				60, 
@@ -566,7 +560,7 @@ public class GenericChem extends ItemPackage {
 				CI.emptyCells(1), 
 				GT_Utility.getIntegratedCircuit(1),
 				FluidUtils.getFluidStack(HydrochloricAcid, 2000),
-				ELEMENT.getInstance().CHLORINE.getFluid(1000),
+				ELEMENT.getInstance().CHLORINE.getFluidStack(1000),
 				ELEMENT.getInstance().HYDROGEN.getCell(1), 
 				GT_Values.NI,            
 				GT_Values.NI, 
@@ -581,7 +575,7 @@ public class GenericChem extends ItemPackage {
 				CI.emptyCells(1),            
 				GT_Utility.getIntegratedCircuit(11), 
 				FluidUtils.getFluidStack(HydrochloricAcid, 2000),        
-				ELEMENT.getInstance().HYDROGEN.getFluid(1000), 
+				ELEMENT.getInstance().HYDROGEN.getFluidStack(1000), 
 				ELEMENT.getInstance().CHLORINE.getCell(1),      
 				GT_Values.NI,                  
 				GT_Values.NI, 
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
index 8c6e66fcb8..dfc85c533b 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
@@ -42,6 +42,7 @@ public class MilledOreProcessing extends ItemPackage {
 	public static Fluid GrossularFlotationFroth;
 	public static Fluid AlmandineFlotationFroth;
 	public static Fluid PyropeFlotationFroth;
+	public static Fluid MonaziteFlotationFroth;
 
 	public static Fluid PineOil;
 
@@ -81,7 +82,10 @@ public class MilledOreProcessing extends ItemPackage {
 	public static Item milledAlmandine;
 
 	// Magnesium, Manganese, Borax, Rhenium
-	public static Item milledPyrope;
+	public static Item milledPyrope;	
+
+	// Erbium, Lanthanum, Praseodymium, Europium
+	public static Item milledMonazite;
 
 
 	@Override
@@ -98,6 +102,7 @@ public class MilledOreProcessing extends ItemPackage {
 		milledGrossular = BaseItemMilledOre.generate(Materials.Grossular, MaterialUtils.getVoltageForTier(6));
 		milledAlmandine = BaseItemMilledOre.generate(Materials.Almandine, MaterialUtils.getVoltageForTier(6));
 		milledPyrope = BaseItemMilledOre.generate(Materials.Pyrope, MaterialUtils.getVoltageForTier(4));
+		milledMonazite = BaseItemMilledOre.generate(Materials.Monazite, MaterialUtils.getVoltageForTier(7));
 
 	}
 
@@ -130,6 +135,8 @@ public class MilledOreProcessing extends ItemPackage {
 		AlmandineFlotationFroth = FluidUtils.generateFluidNoPrefix("froth.almandineflotation", "Almandine Froth", 32 + 175, new short[] { aAlmandineFrothRGB[0], aAlmandineFrothRGB[1], aAlmandineFrothRGB[2], 100 }, true);
 		short[] aPyropeFrothRGB = Materials.Pyrope.mRGBa;
 		PyropeFlotationFroth = FluidUtils.generateFluidNoPrefix("froth.pyropeflotation", "Pyrope Froth", 32 + 175, new short[] { aPyropeFrothRGB[0], aPyropeFrothRGB[1], aPyropeFrothRGB[2], 100 }, true);
+		short[] aMonaziteFrothRGB = Materials.Monazite.mRGBa;
+		MonaziteFlotationFroth = FluidUtils.generateFluidNoPrefix("froth.Monaziteflotation", "Monazite Froth", 32 + 175, new short[] { aMonaziteFrothRGB[0], aMonaziteFrothRGB[1], aMonaziteFrothRGB[2], 100 }, true);
 
 
 		PineOil = FluidUtils.generateFluidNoPrefix("pineoil", "Pine Oil", 32 + 175, new short[] { 250, 200, 60, 100 }, true);
@@ -233,6 +240,14 @@ public class MilledOreProcessing extends ItemPackage {
 				MaterialUtils.generateMaterialFromGtENUM(Materials.Borax), 60,
 				ELEMENT.getInstance().RHENIUM, 20
 				);
+		//milledMonazite TODO
+		registerOreDataForMilledType(
+				MonaziteFlotationFroth, 
+				ELEMENT.getInstance().ERBIUM, 96, 
+				ELEMENT.getInstance().LANTHANUM, 96,
+				ELEMENT.getInstance().PRASEODYMIUM, 96,
+				ELEMENT.getInstance().EUROPIUM, 32
+				);
 
 
 	}
@@ -409,6 +424,21 @@ public class MilledOreProcessing extends ItemPackage {
 				20 * 120, 
 				MaterialUtils.getVoltageForTier(4), 
 				3500);
+		CORE.RA.addVacuumFurnaceRecipe(
+				new ItemStack[] {
+					CI.getNumberedCircuit(aCircuitID++)
+				},
+				new FluidStack[] {
+					FluidUtils.getFluidStack(MonaziteFlotationFroth, 4000)
+				},
+				getOutputsFromMap(MonaziteFlotationFroth),
+				new FluidStack[] {
+					FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000),
+					FluidUtils.getWater(2000)
+				}, 
+				20 * 120, 
+				MaterialUtils.getVoltageForTier(7), 
+				7500);
 		
 	}
 
@@ -559,6 +589,20 @@ public class MilledOreProcessing extends ItemPackage {
 				MaterialUtils.getVoltageForTier(4)
 				);
 
+		// Monazite
+		CORE.RA.addFlotationRecipe(				
+				Materials.Monazite, 
+				ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 1),
+				new FluidStack[] {
+						FluidUtils.getFluidStack(PineOil, 30000),
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(MonaziteFlotationFroth, 1000)						
+				},
+				20 * 1200, 
+				MaterialUtils.getVoltageForTier(6)
+				);
+
 	}
 
 	private void addPineOilExtraction() {
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
index 25beb6d9b5..f112b0d2a5 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
@@ -1,14 +1,15 @@
 package gtPlusPlus.core.item.chemistry;
 
-import net.minecraft.init.Items;
-
-import gregtech.api.enums.GT_Values;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
+import gtPlusPlus.core.item.chemistry.general.ItemNuclearChemBase;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 
 public class NuclearChem extends ItemPackage {
@@ -17,25 +18,44 @@ public class NuclearChem extends ItemPackage {
 	public static Fluid Burnt_LiFBeF2ZrF4UF4;
 	public static Fluid Burnt_LiFBeF2ZrF4U235;
 	
+
+	public static Fluid Impure_LiFBeF2;
+	
 	public static Fluid GeneticMutagen;
 	private static boolean generateMutagenRecipe = false;	
+	
+	public static ItemNuclearChemBase mNuclearChemItem1;
+
+	public static ItemStack mResidueUranium;
+	public static ItemStack mResiduePlutonium;
+	public static ItemStack mResidueFluorides;
+	public static ItemStack mResidueNobles;
 
 	@Override
-	public String errorMessage() {
-		return "bad Nuclear Chemistry Recipes.";
+	public void items() {
+
+		mNuclearChemItem1 = new ItemNuclearChemBase();
+		registerItemStacks();
+		registerOreDict();
 	}
 
-	@Override
-	public boolean generateRecipes() {		
-		if (generateMutagenRecipe) {
-			chemReator_CreateMutagen();	
-		}		
-		chemReactor_MutagenWithEggs();
-		return true;
+
+	public void registerItemStacks() {
+
+		mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 0, 1);
+		mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 1, 1);
+		mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 2, 1);
+		mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 3, 1);
+
 	}
 
-	@Override
-	public void items() {
+	public void registerOreDict() {
+
+		ItemUtils.addItemToOreDictionary(mResidueUranium, "dustResidueUranium");
+		ItemUtils.addItemToOreDictionary(mResiduePlutonium, "dustResiduePlutonium");
+		ItemUtils.addItemToOreDictionary(mResidueFluorides, "dustResidueFluoride");
+		ItemUtils.addItemToOreDictionary(mResidueNobles, "dustResidueNoble");
+
 	}
 
 	@Override
@@ -48,7 +68,7 @@ public class NuclearChem extends ItemPackage {
 		Burnt_LiFBeF2ThF4UF4 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ThF4UF4", "Burnt LiFBeF2ThF4UF4 Salt", 545, new short[]{48, 175, 48, 100}, null, null);
 		Burnt_LiFBeF2ZrF4UF4 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ZrF4UF4", "Burnt LiFBeF2ZrF4UF4 Salt", 520, new short[]{48, 168, 68, 100}, null, null);
 		Burnt_LiFBeF2ZrF4U235 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ZrF4U235", "Burnt LiFBeF2ZrF4U235 Salt", 533, new short[]{68, 185, 48, 100}, null, null);
-		
+		Impure_LiFBeF2 = FluidUtils.generateFluidNonMolten("ImpureLiFBeF2", "Impure LiFBeF2 Salt", 533, new short[]{110, 75, 186, 100}, null, null);
 		if (FluidUtils.getFluidStack("fluid.Mutagen", 1) == null) {
 			GeneticMutagen = FluidUtils.generateFluidNonMolten("GeneticMutagen", "Genetic Mutagen", 12, new short[]{22, 148, 185, 100}, null, null);
 			generateMutagenRecipe = true;
@@ -57,6 +77,20 @@ public class NuclearChem extends ItemPackage {
 			GeneticMutagen = FluidUtils.getFluidStack("fluid.Mutagen", 1).getFluid();
 		}
 	}
+
+	@Override
+	public String errorMessage() {
+		return "Bad Nuclear Chemistry Recipes.";
+	}
+
+	@Override
+	public boolean generateRecipes() {		
+		if (generateMutagenRecipe) {
+			chemReator_CreateMutagen();	
+		}		
+		chemReactor_MutagenWithEggs();
+		return true;
+	}
 	
 	private static void chemReator_CreateMutagen() {
 		CORE.RA.addChemicalRecipe(
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 66f20e0079..b96e0c76ea 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -144,6 +144,29 @@ public class RocketFuels extends ItemPackage {
 				MaterialUtils.getVoltageForTier(2), 
 				1);
 
+		FluidStack aBartWorksHydrogenPeroxide = FluidUtils.getWildcardFluidStack("Hydrogen Peroxide", 2000);
+		if (aBartWorksHydrogenPeroxide != null) {
+			Logger.INFO("Found BW Hydrogen Peroxide, adding compat recipe.");
+			CORE.RA.addChemicalPlantRecipe(
+					new ItemStack[] {
+							CI.getNumberedCircuit(22)
+					}, 
+					new FluidStack[] {
+							aBartWorksHydrogenPeroxide,
+							FluidUtils.getFluidStack("ammonia", 2000),
+					}, 
+					new ItemStack[] {
+
+					}, 
+					new FluidStack[] {
+							FluidUtils.getFluidStack(Hydrazine, 4000),
+
+					},
+					20 * 30, 
+					MaterialUtils.getVoltageForTier(2), 
+					1);
+		}		
+
 	}
 
 
@@ -177,7 +200,7 @@ public class RocketFuels extends ItemPackage {
 	}
 
 	private static void createLOH() {		
-		GT_Values.RA.addVacuumFreezerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidhydrogen", 1), 20*16);
+		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);
 	}
 
@@ -209,7 +232,9 @@ public class RocketFuels extends ItemPackage {
 				new ItemStack[] {CI.getNumberedCircuit(8)}, 
 				FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 8*144), 
 				FluidUtils.getWater(2000), 
-				new ItemStack[] {ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8)}, 
+				new ItemStack[] {
+						ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8)
+				}, 
 				new int[] {10000}, 
 				90 * 20,
 				480);
@@ -292,7 +317,7 @@ public class RocketFuels extends ItemPackage {
 				new FluidStack[] {},
 				0,
 				0,
-				256)); //Fuel Value
+				512)); //Fuel Value
 
 		mRocketFuels.put(1, new GTPP_Recipe(
 				true,
@@ -304,7 +329,7 @@ public class RocketFuels extends ItemPackage {
 				new FluidStack[] {},
 				0,
 				0,
-				512)); //Fuel Value
+				1024)); //Fuel Value
 
 		mRocketFuels.put(2, new GTPP_Recipe(
 				true,
@@ -316,7 +341,7 @@ public class RocketFuels extends ItemPackage {
 				new FluidStack[] {},
 				0,
 				0,
-				768)); //Fuel Value
+				2048)); //Fuel Value
 
 		mRocketFuels.put(3, new GTPP_Recipe(
 				true,
@@ -328,7 +353,7 @@ public class RocketFuels extends ItemPackage {
 				new FluidStack[] {},
 				0,
 				0,
-				1024)); //Fuel Value
+				4196)); //Fuel Value
 
 
 		//Add in default Diesel for the Buggy
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java
new file mode 100644
index 0000000000..cfd3fd6259
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java
@@ -0,0 +1,152 @@
+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 ItemNuclearChemBase extends Item {
+
+	final protected IIcon base[];
+	
+	final private int aMetaSize = 4;
+	
+	/*
+	 * 0 - Uranium Residue
+	 * 1 - Plutonium Residue
+	 * 2 - Fluoride Reside
+	 * 3 - Noble Gas Residue
+	 */
+	
+	public ItemNuclearChemBase() {
+		this.setHasSubtypes(true);
+		this.setNoRepair();
+		this.setMaxStackSize(64);
+		this.setMaxDamage(0);		
+		base = new IIcon[aMetaSize];		
+		this.setUnlocalizedName("BasicNuclearChemItem");
+		GameRegistry.registerItem(this, this.getUnlocalizedName());
+	}
+	
+	@Override
+	public int getItemStackLimit(ItemStack stack) {	
+		return super.getItemStackLimit(stack);
+	}
+
+	@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 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 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/nuclear/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();
+    }
+
+	@Override
+	public void addInformation(ItemStack aStack, EntityPlayer player, List list, boolean bool) {
+		super.addInformation(aStack, player, list, bool);
+	}	
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
index 3f8e31d8d2..d8ddb26675 100644
--- a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
+++ b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
@@ -28,7 +28,8 @@ public class ItemDummyResearch extends ItemGenericToken {
 		RESEARCH_6_BASIC_METALLURGY("Basic Metallurgy", "Information about material smelting"),
 		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");	
+		RESEARCH_9_CLOAKING("Cloaking Technologies", "Sneaking around like a mouse"),
+		RESEARCH_10_SPARGING("Gas Sparging", "Blowing gas for results");	
 		
 		
 		
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
index 82bb29b5bf..db06af8297 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
@@ -144,7 +144,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
 		list.add(EnumChatFormatting.GOLD + aEuInfo + EnumChatFormatting.GRAY);
 		list.add(EnumChatFormatting.GRAY + aTier+": [" + EnumChatFormatting.YELLOW + this.getTier(stack)
 		+ EnumChatFormatting.GRAY + "] "+aInputLimit+": [" + EnumChatFormatting.YELLOW
-		+ this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT);
+		+ this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT+"]");
 		list.add(EnumChatFormatting.GRAY + aCurrentPower +": [" + EnumChatFormatting.YELLOW + (long) this.getCharge(stack)
 		+ EnumChatFormatting.GRAY + aEU +"] [" + EnumChatFormatting.YELLOW
 		+ MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY