Fix a heap of conflicting dehydrator recipes.

9 files changed, 348 insertions, 271 deletions

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/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 66f20e0079..094cb59cb7 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -209,7 +209,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);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 834497745e..f8ab94f23c 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1230,19 +1230,26 @@ public class RECIPES_GREGTECH {
 		Logger.INFO("Loading Recipes for Chemical Dehydrator.");
 
 		try {
-			// Makes Lithium Carbonate
-			CORE.RA.addDehydratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1), 
+			// Makes Lithium Carbonate			
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[] {
+							CI.getNumberedAdvancedCircuit(14),
+							ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1)
+							}, 
 					FluidUtils.getFluidStack("sulfuriclithium", 440), 
+					null, 
 					new ItemStack[] {
 							CI.emptyCells(1),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3) 
-			}, 
-					30 * 20, // Time in ticks
-					30); // EU
+							ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3)						
+					},
+					new int[] {10000, 10000, 10000, 10000, 10000}, 
+					30 * 20,
+					30);
+			
 		}
 		catch (final NullPointerException e) {
 			Logger.INFO("[cellSulfuricLithium] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
@@ -1263,7 +1270,7 @@ public class RECIPES_GREGTECH {
 							ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), // LithiumCarbonate
 			}, // Output Array of Items - Upto 9,
-					new int[] { 0 },
+					new int[] { 10000, 10000, 10000, 10000, 10000 },
 					75 * 20, // Time in ticks
 					1000); // EU
 
@@ -1275,6 +1282,7 @@ public class RECIPES_GREGTECH {
 
 			CORE.RA.addDehydratorRecipe(
 					new ItemStack[] { 
+							CI.getNumberedAdvancedCircuit(13),
 							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
 					}, 
 					FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440), 
@@ -1283,7 +1291,8 @@ public class RECIPES_GREGTECH {
 							ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10),
 							CI.emptyCells(10) 
 					}, 
-					new int[] { 0 }, 150 * 20, // Time in ticks
+					new int[] { 10000 }, 
+					150 * 20, // Time in ticks
 					2000); // EU
 
 		}
@@ -1294,6 +1303,7 @@ public class RECIPES_GREGTECH {
 
 			CORE.RA.addDehydratorRecipe(
 					new ItemStack[] { 
+							CI.getNumberedAdvancedCircuit(12),
 							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
 					}, // Item
 					FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1440), // Fluid
@@ -1301,7 +1311,8 @@ public class RECIPES_GREGTECH {
 					new ItemStack[] { 
 							ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10),
 							CI.emptyCells(10) }, // Output
-					new int[] { 0 }, 300 * 20, // Time in ticks
+					new int[] { 10000 }, 
+					300 * 20, // Time in ticks
 					4000); // EU
 
 		}
@@ -1317,6 +1328,7 @@ public class RECIPES_GREGTECH {
 
 			if (cropGrape != null && foodRaisins != null)			
 				CORE.RA.addDehydratorRecipe(new ItemStack[] { 
+						CI.getNumberedBioCircuit(20),
 						cropGrape
 				}, // Item
 						null, // Fluid input (slot 1)
@@ -1324,7 +1336,8 @@ public class RECIPES_GREGTECH {
 						new ItemStack[] { 
 								foodRaisins
 				}, // Output
-						new int[] { 0 }, 10, // Time in ticks
+						new int[] { 10000 },
+						10, // Time in ticks
 						2); // EU
 
 		}
@@ -1337,12 +1350,16 @@ public class RECIPES_GREGTECH {
 			try {
 
 				CORE.RA.addDehydratorRecipe(
-						new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) }, // Item
+						new ItemStack[] { 
+								CI.getNumberedBioCircuit(20),
+								ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) 
+						}, // Item
 						FluidUtils.getFluidStack("water", 10000), // Fluid input
 						// (slot 1)
 						null, // Fluid output (slot 2)
 						new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) }, // Output
-						new int[] { 0 }, 120 * 20, // Time in ticks
+						new int[] { 10000 }, 
+						120 * 20, // Time in ticks
 						120); // EU
 
 			}
@@ -1355,7 +1372,10 @@ public class RECIPES_GREGTECH {
 		// Process Waste Water
 		try {
 
-			CORE.RA.addDehydratorRecipe(null, 
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[] {
+							CI.getNumberedBioCircuit(21)
+					}, 
 					FluidUtils.getFluidStack("fluid.sludge", 1000), 
 					FluidUtils.getFluidStack("nitricacid", 10), 
 					new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1),
@@ -1383,6 +1403,7 @@ public class RECIPES_GREGTECH {
 
 			CORE.RA.addDehydratorRecipe(
 					new ItemStack[] {
+							CI.getNumberedAdvancedCircuit(20),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5)
 					}, // Item
 					null, // Fluid input (slot 1)
@@ -1391,7 +1412,8 @@ public class RECIPES_GREGTECH {
 							ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) 
 					}, // Output
-					new int[] { 0 }, 120 * 20, // Time in ticks
+					new int[] { 10000, 10000 },
+					120 * 20, // Time in ticks
 					1000); // EU
 
 		}
@@ -1403,14 +1425,14 @@ public class RECIPES_GREGTECH {
 		try {
 
 			CORE.RA.addDehydratorRecipe(new ItemStack[] {
-					ItemUtils.getGregtechCircuit(0)
+					CI.getNumberedAdvancedCircuit(22)
 			}, // Item
 					FluidUtils.getFluidStack("lithiumhydroxide", 144), // Fluid
 					null, // Fluid output (slot 2)
 					new ItemStack[] { 
 							ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1)
 			}, // Output
-					new int[] { 0 },
+					new int[] { 10000 },
 					1 * 20, // Time in ticks
 					64); // EU
 
@@ -1422,32 +1444,44 @@ public class RECIPES_GREGTECH {
 		// Zirconium Chloride -> TetraFluoride
 		try {
 
-			CORE.RA.addDehydratorRecipe(
-					new ItemStack[] { 
-							ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
-							CI.emptyCells(9)
-					}, // Item
-					FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), 
-					null, 
-					new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9),
-							FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9)
-					},
-					new int[] { 0 }, 120 * 20, // Time in ticks
-					500); // EU
-
-
-			if (Utils.getGregtechVersionAsInt() >= 50929) {
+			FluidStack aHydrogenChloride = new FluidStack(GenericChem.HydrochloricAcid, 9000);
+			
+			if (aHydrogenChloride != null) {
 				CORE.RA.addDehydratorRecipe(
-						new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
-								CI.emptyCells(9) },
-						FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144),
-						null,
-						new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9),
-								FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) },						
-						new int[] { 0 },
+						new ItemStack[] { 
+								CI.getNumberedAdvancedCircuit(11),
+								ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
+						}, // Item
+						FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), 
+						aHydrogenChloride, 
+						new ItemStack[] {
+								FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9)
+						},
+						new int[] { 10000 }, 
 						120 * 20, // Time in ticks
 						500); // EU
+
+
+				FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1);
+				
+				if (aGregtechHydro != null || Utils.getGregtechVersionAsInt() >= 50929) {
+					CORE.RA.addDehydratorRecipe(
+							new ItemStack[] { 
+									ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
+									CI.emptyCells(9)
+							},
+							FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144),
+							aHydrogenChloride,
+							new ItemStack[] { 
+									FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) 
+							},						
+							new int[] { 10000 },
+							120 * 20, // Time in ticks
+							500); // EU
+				}
 			}
+			
+			
 
 
 		}
@@ -1458,22 +1492,27 @@ public class RECIPES_GREGTECH {
 		// CaF2 + H2SO4 → CaSO4(solid) + 2 HF
 		try {
 
+
+			FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 16000);
+			if (aGregtechHydro == null) {
+				aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid", 16000);
+			}
+			
 			CORE.RA.addDehydratorRecipe(
 					new ItemStack[] { 
-							ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37),
-							CI.emptyCells(16)
+							CI.getNumberedAdvancedCircuit(5),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37),							
 					},
 					FluidUtils.getFluidStack("sulfuricacid", 56 * 144),
-					null, // Fluid output (slot 2)
+					aGregtechHydro, // Fluid output (slot 2)
 					new ItemStack[] {
 							ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30),
-							ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2)
 					}, 
-					new int[] { 0, 0, 100, 100, 300, 200 },
+					new int[] { 10000, 100, 100, 300, 200 },
 					10 * 60 * 20, 
 					230); // EU
 
@@ -1486,16 +1525,15 @@ public class RECIPES_GREGTECH {
 		try {
 			CORE.RA.addDehydratorRecipe(
 					new ItemStack[] {
-							ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2),
+							CI.getNumberedAdvancedCircuit(6),
 							ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4)
 					}, 
-					null, // Fluid input (slot 1)
+					FluidUtils.getFluidStack("berylliumhydroxide", 2000), // Fluid input (slot 1)
 					FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), 
 					new ItemStack[] {
-							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4),
-							CI.emptyCells(2)
+							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4)
 					}, 
-					new int[] { 0, 0, 0 }, 
+					new int[] { 10000}, 
 					32 * 20, // Time in ticks
 					64); // EU
 
@@ -1505,35 +1543,42 @@ public class RECIPES_GREGTECH {
 		}
 
 		// (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2
-		try {
+		try {			
 			CORE.RA.addDehydratorRecipe(
 					new ItemStack[] {
-							CI.emptyCells(5) 
-					},
+							CI.getNumberedAdvancedCircuit(17),
+							CI.emptyCells(5)
+							}, 
 					FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), 
-					null, // Fluid output (slot 2)
-					new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2),
+					null, 
+					new ItemStack[] {
+							ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2),
 							ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
-							ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, 
-					new int[] { 0, 0, 0 }, 
-					5 * 60 * 20, // Time in ticks
-					120); // EU
-
+							ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1)						
+					},
+					new int[] {10000, 10000, 10000}, 
+					5 * 60 * 20,
+					120);
 		}
 		catch (final NullPointerException e) {
 			Logger.INFO("[cellBerylliumFluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
 		}
 
-		// Makes Styrene
 		CORE.RA.addDehydratorRecipe(
-				CI.emptyCells(3), // Item Input
-				FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), // Fluid
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(18),
+						CI.emptyCells(3)
+						}, 
+				FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), 
+				null, 
 				new ItemStack[] {
 						ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) }, // Output		
-				3 * 20, // Time in ticks
-				30); // EU
-
+						ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2)						
+				},
+				new int[] {10000, 10000}, 
+				3 * 20,
+				30);
+		
 		/*
 		 * Try Add custom Recipe for drying leather
 		 */		
@@ -1542,11 +1587,16 @@ public class RECIPES_GREGTECH {
 			aLeather1 = ItemUtils.getCorrectStacktype("harvestcraft:hardenedleatherItem", 1);
 			aLeather2 = ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1);			
 			CORE.RA.addDehydratorRecipe(
-					aLeather1,
-					GT_Values.NF,
 					new ItemStack[] {
-							aLeather2
+							CI.getNumberedAdvancedCircuit(18),
+							aLeather1
+							}, 
+					FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), 
+					null, 
+					new ItemStack[] {
+							aLeather2						
 					},
+					new int[] {10000}, 
 					5 * 20,
 					180);
 		}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
index 902806e026..0156031a95 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
@@ -14,40 +14,40 @@ import net.minecraft.item.ItemStack;
 
 public class RECIPES_SeleniumProcessing {
 
-    public static void init() {
-        
-        //We need this
-        MaterialUtils.generateSpecialDustAndAssignToAMaterial(MISC_MATERIALS.SELENIUM_DIOXIDE, false);       
-        
-        // Makes Selenium Dioxide        
-        processCopperRecipes();
-        
-        //Liquify the Dried Dioxide
-        AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), 13, FluidUtils.getSteam(500), null, MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(1000), 20, 1024);
-        
-        // Produce Selenious Acid        
-        AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1), 14, FluidUtils.getHotWater(4000), CI.emptyCells(1), MISC_MATERIALS.SELENIOUS_ACID.getFluid(1000), 20, 2048);
-        
-        // Make Selenium        
-        CORE.RA.addBlastSmelterRecipe(
-                new ItemStack[] { 
-                        ItemUtils.getGregtechCircuit(14),
-                        ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 8),
-                        ELEMENT.getInstance().CARBON.getDust(16),
-                },
-                MISC_MATERIALS.SELENIOUS_ACID.getFluid(750),
-                ELEMENT.getInstance().SELENIUM.getFluid(144 * 1),
-                new ItemStack[] {
-                        CI.emptyCells(8),
-                        ELEMENT.getInstance().SELENIUM.getIngot(1),
-                        ELEMENT.getInstance().SELENIUM.getIngot(1),    
-                },
-                new int[] {10000, 2000, 2000},
-                20 * 300,
-                7200);  
-        
-        
-        /*// Old recipes for Selenium Roasting
+	public static void init() {
+
+		//We need this
+		MaterialUtils.generateSpecialDustAndAssignToAMaterial(MISC_MATERIALS.SELENIUM_DIOXIDE, false);       
+
+		// Makes Selenium Dioxide        
+		processCopperRecipes();
+
+		//Liquify the Dried Dioxide
+		AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), 13, FluidUtils.getSteam(500), null, MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(1000), 20, 1024);
+
+		// Produce Selenious Acid        
+		AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1), 14, FluidUtils.getHotWater(4000), CI.emptyCells(1), MISC_MATERIALS.SELENIOUS_ACID.getFluid(1000), 20, 2048);
+
+		// Make Selenium        
+		CORE.RA.addBlastSmelterRecipe(
+				new ItemStack[] { 
+						ItemUtils.getGregtechCircuit(14),
+						ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 8),
+						ELEMENT.getInstance().CARBON.getDust(16),
+				},
+				MISC_MATERIALS.SELENIOUS_ACID.getFluid(750),
+				ELEMENT.getInstance().SELENIUM.getFluid(144 * 1),
+				new ItemStack[] {
+						CI.emptyCells(8),
+						ELEMENT.getInstance().SELENIUM.getIngot(1),
+						ELEMENT.getInstance().SELENIUM.getIngot(1),    
+				},
+				new int[] {10000, 2000, 2000},
+				20 * 300,
+				7200);  
+
+
+		/*// Old recipes for Selenium Roasting
         CORE.RA.addBlastSmelterRecipe(
                 new ItemStack[] { 
                         ItemUtils.getGregtechCircuit(16),
@@ -81,138 +81,142 @@ public class RECIPES_SeleniumProcessing {
                 0,
                 20 * 300,
                 2000);*/   
-    }
-    
-    
-    public static void processCopperRecipes() {
-        
-        //Copper 
-        CORE.RA.addDehydratorRecipe(
-                new ItemStack[]{
-                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1), // Item Input
-                },
-                FluidUtils.getHotWater(1000), // Fluid
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(20), // Fluid
-                new ItemStack[] {
-                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        }, // Output     
-                new int[] {
-                       10000,
-                       100,
-                       100,
-                       500,
-                       500,
-                       500,
-                       1000,
-                       1000,
-                       1000
-                },
-                40 * 20, // Time in ticks
-                1024); // EU        
-        
-        //Tetra
-        CORE.RA.addDehydratorRecipe(
-                new ItemStack[]{
-                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1), // Item Input
-                },
-                FluidUtils.getHotWater(1000), // Fluid
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
-                new ItemStack[] {
-                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        }, // Output     
-                new int[] {
-                       10000,
-                       100,
-                       100,
-                       300,
-                       300,
-                       300,
-                       800,
-                       800,
-                       800
-                },
-                40 * 20, // Time in ticks
-                1024); // EU
-        
-        //Chalco
-        CORE.RA.addDehydratorRecipe(
-                new ItemStack[]{
-                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), // Item Input
-                },
-                FluidUtils.getHotWater(1000), // Fluid
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
-                new ItemStack[] {
-                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        }, // Output     
-                new int[] {
-                       10000,
-                       100,
-                       100,
-                       300,
-                       300,
-                       300,
-                       800,
-                       800,
-                       800
-                },
-                40 * 20, // Time in ticks
-                1024); // EU
-        
-        //Malachite
-        CORE.RA.addDehydratorRecipe(
-                new ItemStack[]{
-                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1), // Item Input
-                },
-                FluidUtils.getHotWater(1000), // Fluid
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
-                new ItemStack[] {
-                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                        }, // Output     
-                new int[] {
-                       10000,
-                       100,
-                       100,
-                       300,
-                       300,
-                       300,
-                       800,
-                       800,
-                       800
-                },
-                40 * 20, // Time in ticks
-                1024); // EU
-    }
+	}
+
+
+	public static void processCopperRecipes() {
+
+		//Copper 
+		CORE.RA.addDehydratorRecipe(
+				new ItemStack[]{
+						CI.getNumberedAdvancedCircuit(23),
+						ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1), // Item Input
+				},
+				FluidUtils.getHotWater(1000), // Fluid
+				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(20), // Fluid
+				new ItemStack[] {
+						ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+				}, // Output     
+				new int[] {
+						10000,
+						100,
+						100,
+						500,
+						500,
+						500,
+						1000,
+						1000,
+						1000
+				},
+				40 * 20, // Time in ticks
+				1024); // EU        
+
+		//Tetra
+		CORE.RA.addDehydratorRecipe(
+				new ItemStack[]{
+						CI.getNumberedAdvancedCircuit(23),
+						ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1), // Item Input
+				},
+				FluidUtils.getHotWater(1000), // Fluid
+				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
+				new ItemStack[] {
+						ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+				}, // Output     
+				new int[] {
+						10000,
+						100,
+						100,
+						300,
+						300,
+						300,
+						800,
+						800,
+						800
+				},
+				40 * 20, // Time in ticks
+				1024); // EU
+
+		//Chalco
+		CORE.RA.addDehydratorRecipe(
+				new ItemStack[]{
+						CI.getNumberedAdvancedCircuit(23),
+						ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), // Item Input
+				},
+				FluidUtils.getHotWater(1000), // Fluid
+				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
+				new ItemStack[] {
+						ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+				}, // Output     
+				new int[] {
+						10000,
+						100,
+						100,
+						300,
+						300,
+						300,
+						800,
+						800,
+						800
+				},
+				40 * 20, // Time in ticks
+				1024); // EU
+
+		//Malachite
+		CORE.RA.addDehydratorRecipe(
+				new ItemStack[]{
+	                	CI.getNumberedAdvancedCircuit(23),
+						ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1), // Item Input
+				},
+				FluidUtils.getHotWater(1000), // Fluid
+				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
+				new ItemStack[] {
+						ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+						MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+				}, // Output     
+				new int[] {
+						10000,
+						100,
+						100,
+						300,
+						300,
+						300,
+						800,
+						800,
+						800
+				},
+				40 * 20, // Time in ticks
+				1024); // EU
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index 077b397f88..07118b7c7b 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -23,7 +23,11 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.*;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.core.util.minecraft.OreDictUtils;
+import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -502,14 +506,19 @@ public class BioRecipes {
 				120 * 20,
 				60,
 				1);
-
+		
 		CORE.RA.addDehydratorRecipe(
-				CI.emptyCells(1),
-				FluidUtils.getFluidStack(mFermentationBase, 4000),
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(14),
+						CI.emptyCells(1)
+						}, 
+				FluidUtils.getFluidStack(mFermentationBase, 4000), 
+				null, 
 				new ItemStack[] {
 						ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("cellAceticAcid", 1)						
 				},
+				new int[] {10000, 10000}, 
 				60 * 20,
 				16);
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 229bc234e9..b4091cb42f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -62,7 +62,7 @@ public interface IGregtech_RecipeAdder {
 	 * @return true if the Recipe got added, otherwise false.
 	 */
 
-	public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);
+	//public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);
 	/*public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);*/
 	/*public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt);
     public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[] aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt);*/
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index a346464eeb..773480104a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -47,7 +47,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 
 	private void generateRecipes(final Material material, final boolean disableOptional){
 
-		Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName());
+		Logger.INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName());
 
 		final ItemStack normalDust = material.getDust(1);
 		final ItemStack smallDust = material.getSmallDust(1);
@@ -59,14 +59,14 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 
 		if (ItemUtils.checkForInvalidItems(tinyDust) && ItemUtils.checkForInvalidItems(normalDust)) {
 			if (RecipeUtils.addShapedRecipe(
-					tinyDust,	tinyDust, tinyDust,
+					tinyDust, tinyDust, tinyDust,
 					tinyDust, tinyDust, tinyDust,
 					tinyDust, tinyDust, tinyDust,
 					normalDust)){
-				Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 
 			if (RecipeUtils.addShapedRecipe(
@@ -74,10 +74,10 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 					null, null, null,
 					null, null, null,
 					material.getTinyDust(9))){
-				Logger.WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.INFO("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 		}
 
@@ -87,20 +87,20 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 					smallDust, smallDust, null,
 					null, null, null,
 					normalDust)){
-				Logger.WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.INFO("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 			if (RecipeUtils.addShapedRecipe(
 					null, normalDust, null,
 					null, null, null,
 					null, null, null,
 					material.getSmallDust(4))){
-				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.INFO("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 		}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
index 90bd1d8f1a..f8108852f4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
@@ -18,6 +18,7 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -186,7 +187,7 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
 
 				ItemStack emptyCell = null;
 				if (mCellCount > 0){
-					emptyCell = ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", mCellCount);
+					emptyCell = CI.emptyCells(mCellCount);
 					Logger.MATERIALS("[Dehydrator] Recipe now requires "+mCellCount+" empty cells as input.");
 				}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 0b4649e414..58f9f1d12c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -332,7 +332,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 	 * aOutputItems, aDuration, aEUt); return true; }
 	 */
 
-	@Override
+	/*@Override
 	public boolean addDehydratorRecipe(final ItemStack aInput, final FluidStack aFluid, final ItemStack[] aOutput,
 			int aDuration, final int aEUt) {
 		Logger.WARNING("Trying to add a Dehydrator recipe.");
@@ -363,7 +363,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 			Logger.WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
 			return false;
 		}
-	}
+	}*/
 
 	@Override
 	public boolean addDehydratorRecipe(final ItemStack[] aInput, final FluidStack aFluidInput,