Added more nuclear processing recipes.

Removed lots of useless nuclear generated items.
More NEI improvements.
Made Dehydrator and FFPP recipe handling more lenient.

33 files changed, 699 insertions, 788 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 272b16fbfb..5447bec472 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;
@@ -232,8 +233,8 @@ public final class ModItems {
 	public static Item dustFertUN18;
 	public static Item dustFertUN32;
 
-	public static Fluid fluidFLiBeSalt;
-	public static Fluid fluidFLiBeSaltBurnt;
+	//public static Fluid fluidFLiBeSalt;
+	//public static Fluid fluidFLiBeSaltBurnt;
 
 	public static Fluid fluidLftrCore1;
 	public static Fluid fluidLftrCore2;
@@ -549,30 +550,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
 
@@ -725,10 +727,11 @@ public final class ModItems {
 		dustLi2CO3CaOH2 = ItemUtils.generateSpecialUseDusts("Li2CO3CaOH2", "Li2CO3 + Ca(OH)2 Compound", "Li2CO3CaOH2", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
 
 		//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);
-		fluidFLiBeSaltBurnt = FluidUtils.addGTFluidNoPrefix("Li2BeF2UF4", "Li2BeF2UF4", new short[]{50, 255, 50, 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);
@@ -1069,10 +1072,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/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index f61a2096b7..ecdc97357f 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -351,7 +351,7 @@ public class GenericChem extends ItemPackage {
 
 				}, 
 				new FluidStack[] {
-						ELEMENT.getInstance().HYDROGEN.getFluid(2000)						
+						ELEMENT.getInstance().HYDROGEN.getFluidStack(2000)						
 				}, 
 				20 *20,
 				120, 
@@ -433,8 +433,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 +516,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 +527,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 +547,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 +556,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 +566,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 +581,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/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 404c5c7918..cc7e21656b 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -49,7 +49,7 @@ public class Material {
 	private MaterialState materialState;
 	private TextureSet textureSet;
 
-	private Fluid vMoltenFluid;
+	private Fluid mFluid;
 	private Fluid vPlasma;
 
 	private boolean vGenerateCells;
@@ -478,7 +478,7 @@ public class Material {
 				final Materials isValid = Materials.get(this.getLocalizedName());				
 				FluidStack aTest = FluidUtils.getWildcardFluidStack(localizedName, 1);				
 				if (aTest != null){
-					this.vMoltenFluid = aTest.getFluid();
+					this.mFluid = aTest.getFluid();
 				}
 				else {
 					if (isValid == null || isValid == Materials._NULL){
@@ -487,7 +487,7 @@ public class Material {
 					else {		
 						FluidStack aTest2 = FluidUtils.getWildcardFluidStack(localizedName, 1);	
 						if (aTest2 != null){
-							this.vMoltenFluid = aTest2.getFluid();
+							this.mFluid = aTest2.getFluid();
 						}
 						else {
 							queueFluidGeneration();
@@ -497,7 +497,7 @@ public class Material {
 				this.vPlasma = this.generatePlasma();
 			}
 			else {
-				this.vMoltenFluid = null;
+				this.mFluid = null;
 				this.vPlasma = null;
 			}
 			String ratio = "";
@@ -1104,7 +1104,7 @@ public class Material {
 	public final static void generateQueuedFluids() {
 		for (Material m : mMaterialMap) {
 			if (m.isFluidQueued) {
-				m.vMoltenFluid = m.generateFluid();
+				m.mFluid = m.generateFluid();
 			}
 		}
 	}
@@ -1249,18 +1249,21 @@ public class Material {
 	}
 
 
+	public Fluid getFluid() {
+		return mFluid;
+	}
 
-	final public FluidStack getFluid(final int fluidAmount) {
-		if (this.vMoltenFluid == null){
+	final public FluidStack getFluidStack(final int fluidAmount) {
+		if (this.mFluid == null){
 			return null;
 		}
-		final FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount);
+		final FluidStack moltenFluid = new FluidStack(this.mFluid, fluidAmount);
 		return moltenFluid;
 	}
 	
 	final public boolean setFluid(Fluid aFluid) {
-		if (this.vMoltenFluid == null){
-			this.vMoltenFluid = aFluid;
+		if (this.mFluid == null){
+			this.mFluid = aFluid;
 			return true;
 		}
 		return false;
@@ -1353,8 +1356,8 @@ public class Material {
 	}
 	
 	private static boolean registerComponentForMaterial(Material componentMaterial, FluidStack aStack) {		
-		if (componentMaterial != null && aStack != null && componentMaterial.vMoltenFluid == null) {
-			componentMaterial.vMoltenFluid = aStack.getFluid();
+		if (componentMaterial != null && aStack != null && componentMaterial.mFluid == null) {
+			componentMaterial.mFluid = aStack.getFluid();
 			return true;
 		}
 		return false;
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 68026d1cac..4a3af94f6d 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -29,7 +29,10 @@ import gtPlusPlus.core.item.base.rods.BaseItemRod;
 import gtPlusPlus.core.item.base.rods.BaseItemRodLong;
 import gtPlusPlus.core.item.base.rotors.BaseItemRotor;
 import gtPlusPlus.core.item.base.screws.BaseItemScrew;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -262,13 +265,47 @@ public class MaterialGenerator {
 		generateNuclearMaterial(matInfo, true);
 	}
 
+
+	public static void generateNuclearDusts(final Material matInfo){
+		generateNuclearDusts(matInfo, true);
+	}
+
+	public static void generateNuclearDusts(final Material matInfo, boolean generateDehydratorRecipe){
+		generateNuclearMaterial(matInfo, false, true, false, false);
+		if (generateDehydratorRecipe && matInfo.getFluid() != null && matInfo.getDust(0) != null) {
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[] {
+							
+					}, 
+					matInfo.getFluidStack(144), 
+					null, 
+					new ItemStack[] { 
+							matInfo.getDust(1),
+					}, 
+					new int[] { 10000 }, 
+					10*(matInfo.vVoltageMultiplier/5), // Time in ticks
+					matInfo.vVoltageMultiplier); // EU
+		}
+	}
+	
 	public static void generateNuclearMaterial(final Material matInfo, final boolean generatePlates){
+		generateNuclearMaterial(matInfo, true, true, true, generatePlates);
+	}
+
+	public static void generateNuclearMaterial(final Material matInfo, final boolean generateBlock, 
+			final boolean generateDusts, final boolean generateIngot, final boolean generatePlates){
 		try {
 			
-			tempBlock = new BlockBaseModular(matInfo,BlockTypes.STANDARD);
-			temp = new BaseItemDust(matInfo);
-			temp = new BaseItemIngot(matInfo);
-			temp = new BaseItemNugget(matInfo);
+			if (generateBlock) {
+				tempBlock = new BlockBaseModular(matInfo,BlockTypes.STANDARD);
+			}
+			if (generateDusts) {
+				temp = new BaseItemDust(matInfo);
+			}
+			if (generateIngot) {
+				temp = new BaseItemIngot(matInfo);
+				temp = new BaseItemNugget(matInfo);
+			}
 
 			if (generatePlates) {
 				temp = new BaseItemPlate(matInfo);
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index c2556b60f1..363708859f 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -263,10 +263,11 @@ public final class ORES {
 			-1,
 			-1, //Radiation
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().EUROPIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
 			});
 
 	public static final Material YTTRIALITE = new Material(
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index 9e59758f73..8fe99f16e7 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -10,6 +10,24 @@ import gtPlusPlus.core.util.data.StringUtils;
 
 public final class NUCLIDE {
 
+	public static final Material Li2BeF4 = new Material(
+			"Lithium Tetrafluoroberyllate", //Material Name
+			MaterialState.LIQUID, //State
+			TextureSets.NUCLEAR.get(),
+			null, //Material Colour
+			566, //Melting Point in C
+			870, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"Li2BeF4"), //Chemical Formula
+			4, //Radioactivity Level
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 2),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1)
+			});
+	
 	public static final Material LiFBeF2ThF4UF4 = new Material(
 			"LiFBeF2ThF4UF4", //Material Name
 			MaterialState.LIQUID, //State
@@ -70,6 +88,44 @@ public final class NUCLIDE {
 					new MaterialStack(ELEMENT.getInstance().URANIUM235, 14)
 			});
 	
+	// Misc	
+	public static final Material BurntLftrFuel_MK1 = new Material(
+			"Burnt Reactor Fuel I", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiBeF2UF4FP"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
+			});
+	
+	public static final Material BurntLftrFuel_MK2 = new Material(
+			"Burnt Reactor Fuel II", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiBeF2UF4FP"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
+			});
+	
+	
 	
 	// LFTR Core Fluids
 	public static final Material LiBeF2UF4FP = new Material(
@@ -81,6 +137,7 @@ public final class NUCLIDE {
 			-1, //Protons
 			-1, //Neutrons
 			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiBeF2UF4FP"), //Chemical Formula
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
@@ -98,6 +155,7 @@ public final class NUCLIDE {
 			-1, //Protons
 			-1, //Neutrons
 			false, //Uses Blast furnace?
+			StringUtils.subscript("UF6F2FP"), //Chemical Formula
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
@@ -114,6 +172,7 @@ public final class NUCLIDE {
 			-1, //Protons
 			-1, //Neutrons
 			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2"), //Chemical Formula
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
@@ -129,6 +188,7 @@ public final class NUCLIDE {
 			-1, //Protons
 			-1, //Neutrons
 			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2UF4"), //Chemical Formula
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(LiFBeF2, 1),
@@ -142,6 +202,7 @@ public final class NUCLIDE {
 	
 	// LFTR Blanket Fluids
 
+	// Tier 1 Fuel blanket output
 	public static final Material LiFThF4 = new Material(
 			"LiFThF4", //Material Name
 			MaterialState.PURE_LIQUID, //State
@@ -151,12 +212,14 @@ public final class NUCLIDE {
 			-1, //Protons
 			-1, //Neutrons
 			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFThF4"), //Chemical Formula
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
 					new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
 			});
 	
+	// Tier 2 Fuel blanket output
 	public static final Material LiFBeF2ThF4 = new Material(
 			"LiFBeF2ThF4", //Material Name