+ Added conversion recipe for phtalic acids. Closes #540.

+ Multiblock Mixer now has separate recipe processing for each input bus. Closes #560.
% Buffed Dehydrator input tanks. Closes #537.
% Buffed Algae Farm output to be 6-8x.
$ Fixed Algae Farm not consuming compost.
$ Adjusted Large Sifter Tooltip. Closes #535.
$ Fixed Waste collector recipes. Closes #545.
$ Fixed casing count in Volcanus structure check.

9 files changed, 172 insertions, 75 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 8428328f37..981bfed479 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -272,6 +272,8 @@ public class CoalTar extends ItemPackage {
 		recipePhthalicAcidToPhthalicAnhydride();
 		
 		recipeEthylBenzineFuelsIntoHeavyFuel();		
+		
+		recipePhthalicAcidConversion();
 
 		//Burn the coal gas!
 		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1), null, 96, 1);
@@ -282,6 +284,14 @@ public class CoalTar extends ItemPackage {
 		return true;
 	}
 
+	private void recipePhthalicAcidConversion() {
+		FluidStack aMyAcid = FluidUtils.getFluidStack(Phthalic_Acid, 500);
+		FluidStack aGtAcid = FluidUtils.getFluidStack("phtalicacid", 500);
+		if (aMyAcid != null && aGtAcid != null) {
+			CORE.RA.addDistilleryRecipe(CI.getNumberedBioCircuit(8), aMyAcid, aGtAcid, null, 50, 16, false);
+		}
+	}
+
 	@Override
 	public void items() {
 		//Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
@@ -347,7 +357,7 @@ public class CoalTar extends ItemPackage {
 		Naphthalene = FluidUtils.generateFluidNonMolten("Naphthalene", "Naphthalene", 115, new short[]{210, 185, 135, 100}, null, null);
 		// v - Oxidize with mercury and nitric acid
 		//Create Phthalic Acid
-		Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
+		Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phtalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
 		// v - Dehydrate at 180C+
 		//Create Phthalic Anhydride
 		//ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O", Utils.rgbtoHexValue(175, 175, 175));
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 8225a40c29..d703bb9637 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -22,6 +22,7 @@ import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
 import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
 import net.minecraft.block.Block;
@@ -540,13 +541,15 @@ public class RECIPES_Machines {
 					20 * 30, 
 					30);
 
+			ItemStack aFluidRegulator1 = ItemUtils.getItemListObject("FluidRegulator_MV", "Pump_HV", GTNH ? 4 : 2);
+			ItemStack aFluidRegulator2 = ItemUtils.getItemListObject("FluidRegulator_IV", "Pump_LuV", GTNH ? 4 : 2);
+			
 			//Poo Collector		
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
 							CI.machineHull_MV,
-							CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 4 : 2),
+							aFluidRegulator1,
 							CI.getTieredComponent(OrePrefixes.pipeMedium, 2, GTNH ? 4 : 2),
-							CI.getElectricPump(2, GTNH ? 4 : 2),
 							ALLOY.EGLIN_STEEL.getPlate(GTNH ? 8 : 4),
 							ALLOY.POTIN.getScrew(GTNH ? 12 : 6)
 					}, 
@@ -560,9 +563,8 @@ public class RECIPES_Machines {
 					new ItemStack[] {
 							CI.getTieredMachineHull(-1),
 							ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
-							CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 8 : 4),
+							aFluidRegulator2,
 							CI.getTieredComponent(OrePrefixes.pipeHuge, 6, GTNH ? 8 : 4),
-							CI.getElectricPump(5, GTNH ? 12 : 6),
 							CI.getTieredComponent(OrePrefixes.screw, 6, GTNH ? 32 : 16)
 					}, 
 					CI.getAlternativeTieredFluid(5, 144 * 9), 
@@ -886,6 +888,7 @@ public class RECIPES_Machines {
 						"plateDoubleGrisium", "rotorGrisium", "plateDoubleGrisium",
 						RECIPE_IndustrialMultiTankController);
 			}
+			//TODO
 
 			//Semi-Fluid Generators
 			ItemStack mSemiFluidgen = ItemUtils.getItemStackFromFQRN("IC2:blockGenerator:7", 1);
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 720da1692b..485436011f 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1268,5 +1268,40 @@ public class ItemUtils {
 		}
 		return getNullStack();
 	}
+	
+	public static ItemStack getItemListObject(String aObjectFromExperimentalName, String aReplacementName, int aAmount) {
+		ItemList aItemListObject = getItemListObject(aReplacementName, aReplacementName);
+		if (aItemListObject == ItemList.NULL || aItemListObject == null) {
+			return null;
+		}
+		else {
+			return aItemListObject.get(aAmount);
+		}
+	}
+	
+	public static ItemStack getItemListObject(ItemList aItemListObject, int aAmount) {
+		if (aItemListObject == ItemList.NULL || aItemListObject == null) {
+			return null;
+		}
+		else {
+			return aItemListObject.get(aAmount);
+		}
+	}
+
+	public static ItemList getItemListObject(String aObjectFromExperimentalName, String aReplacementName) {
+		ItemList aVal = ItemList.valueOf(aObjectFromExperimentalName);
+		if (aVal != null) {
+			return aVal;
+		}
+		else {
+			aVal = ItemList.valueOf(aReplacementName);
+			if (aVal != null) {
+				return aVal;
+			}
+			else {
+				return ItemList.NULL;
+			}
+		}		
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
index e721761d82..6e4c071ecb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
@@ -112,7 +112,30 @@ extends GregtechMeta_MultiBlockBase {
 
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
-		return checkRecipeGeneric(getMaxParallelRecipes(), getEuDiscountForParallelism(), 250);		
+		for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) {
+			ArrayList<ItemStack> tBusItems = new ArrayList<ItemStack>();
+			tBus.mRecipeMap = getRecipeMap();
+			if (isValidMetaTileEntity(tBus)) {
+				for (int i = tBus.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) {
+					if (tBus.getBaseMetaTileEntity().getStackInSlot(i) != null)
+						tBusItems.add(tBus.getBaseMetaTileEntity().getStackInSlot(i));
+				}
+			}			
+			ItemStack[] inputs = new ItemStack[tBusItems.size()];
+			int slot = 0;
+			for (ItemStack g : tBusItems) {
+				inputs[slot++] = g;
+			}			
+			if (inputs.length > 0) {				
+				log("Recipe. ["+inputs.length+"]["+getMaxParallelRecipes()+"]");				
+				if (checkRecipeGeneric(inputs, new FluidStack[]{}, getMaxParallelRecipes(), getEuDiscountForParallelism(), 250, 10000)) {
+					log("Recipe 2.");
+					return true;
+				}
+			}			
+
+		}
+		return false;
 	}
 	
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
index 8c62937bae..c99a6e286b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
@@ -53,8 +53,6 @@ extends GregtechMeta_MultiBlockBase {
 				"Controller (Center Bottom)",
 				"1x Input Bus (Any top or bottom edge casing)",
 				"4x Output Bus (Any top or bottom edge casing)",
-				"1x Maintenance Hatch (Any top or bottom edge casing)",
-				"1x Muffler Hatch (Any top or bottom edge casing)",
 				"1x Energy Hatch (Any top or bottom edge casing)",
 				"18x Sieve Grate (Top and Middle 3x3)",
 				"Sieve Casings for the rest (35 min)"
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
index cdfa078a1e..133e10d6f6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
@@ -152,9 +152,14 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
 		Block tUsedBlock = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 2, zDir);
 		byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 2, zDir);
 		this.mHeatingCapacity = StaticFields59.getHeatingCapacityForCoil(tUsedBlock, tUsedMeta);
+		
+		int aCasingCount = 0;
 
 		for (int i = -1; i < 2; i++) {
 			for (int j = -1; j < 2; j++) {
+				
+				
+				
 				if ((i != 0) || (j != 0)) {					
 					//Coils 1
 					if (!isValidBlockForStructure(null, CASING_TEXTURE_ID, false, aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j), (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j), StaticFields59.getBlockCasings5(), tUsedMeta)) {
@@ -170,8 +175,15 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
 				}
 				
 				//Top Layer
+				
+				Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, 3, zDir + j);
+				int aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 3, zDir + j);
+				if (aCurrentBlock == ModBlocks.blockCasings3Misc && aCurrentMeta == 11) {
+					aCasingCount++;
+				}
+				
 				final IGregTechTileEntity tTileEntity2 = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 3, zDir + j);					
-				if (!isValidBlockForStructure(tTileEntity2, CASING_TEXTURE_ID, true, aBaseMetaTileEntity.getBlockOffset(xDir + i, 3, zDir + j), (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 3, zDir + j), ModBlocks.blockCasings3Misc, 11)) {
+				if (!isValidBlockForStructure(tTileEntity2, CASING_TEXTURE_ID, true, aCurrentBlock, aCurrentMeta, ModBlocks.blockCasings3Misc, 11)) {
 					Logger.INFO("Top Layer missing.");
 					return false;
 				}
@@ -179,9 +191,16 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
 		}
 		for (int i = -1; i < 2; i++) {
 			for (int j = -1; j < 2; j++) {
+
+				
+				Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j);
+				int aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 0, zDir + j);
+				if (aCurrentBlock == ModBlocks.blockCasings3Misc && aCurrentMeta == 11) {
+					aCasingCount++;
+				}
 				if ((xDir + i != 0) || (zDir + j != 0)) {
 					IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0,zDir + j);					
-					if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, true, aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j), (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 0, zDir + j), ModBlocks.blockCasings3Misc, 11)) {
+					if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, true, aCurrentBlock, aCurrentMeta, ModBlocks.blockCasings3Misc, 11)) {
 						Logger.INFO("Bottom Layer missing.");
 						return false;
 					}					
@@ -189,8 +208,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
 			}
 		}
 		
-		// TODO - Fix Casing Count
-		return true;
+		return aCasingCount >= 10;
 	}
 
 	public int getMaxEfficiency(ItemStack aStack) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
index 4ec8804041..a7afaa6b56 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
@@ -232,7 +232,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase {
 	}
 
 	public boolean checkForWater() {		
-		
+
 		// Get Facing direction
 		IGregTechTileEntity aBaseMetaTileEntity = this.getBaseMetaTileEntity();
 		int mDirectionX = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
@@ -340,7 +340,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase {
 		if (aBaseMetaTileEntity.isClientSide()) {
 			this.mLevel = getCasingTierOnClientSide();
 		}
-		
+
 	}
 
 	@Override
@@ -383,6 +383,11 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase {
 		if (aMaxParallelRecipes == 0) {
 			return false;
 		}
+		if (tRecipe.mInputs.length > 0) {
+			for (ItemStack aInputToConsume : tRecipe.mInputs) {
+				this.depleteInput(aInputToConsume);			
+			}
+		}
 
 
 		// -- Try not to fail after this point - inputs have already been consumed! --
@@ -476,7 +481,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase {
 		}
 		return false;
 	}
-	
+
 	@SideOnly(Side.CLIENT)
 	private final int getCasingTierOnClientSide() {
 		if (this == null || this.getBaseMetaTileEntity().getWorld() == null) {
@@ -498,7 +503,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase {
 			return 0;
 		}
 	}
-	
+
 
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
index 609d4e0649..1091533a52 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
@@ -125,70 +125,75 @@ public class RecipeLoader_AlgaeFarm {
 		// Create an Automap to dump contents into
 		AutoMap<ItemStack> aOutputMap = new AutoMap<ItemStack>();
 		
-		// Add loot relevant to tier and also add any from lower tiers.
-		if (aTier >= 0) {
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, MathUtils.randInt(16, 32)));
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, MathUtils.randInt(32, 64)));			
-			if (MathUtils.randInt(0, 10) > 9) {
-				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(8, 16)));				
+		// Buff output by yielding 6-8 times more.
+		for (int i=0;i<MathUtils.randInt(4, 8);i++) {
+			// Add loot relevant to tier and also add any from lower tiers.
+			if (aTier >= 0) {
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, MathUtils.randInt(16, 32)));
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, MathUtils.randInt(32, 64)));			
+				if (MathUtils.randInt(0, 10) > 9) {
+					aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(8, 16)));				
+				}
 			}
-		}
-		if (aTier >= 1) {
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, MathUtils.randInt(16, 32)));
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(16, 32)));			
-			if (MathUtils.randInt(0, 10) > 9) {
-				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(4, 8)));				
+			if (aTier >= 1) {
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, MathUtils.randInt(16, 32)));
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(16, 32)));			
+				if (MathUtils.randInt(0, 10) > 9) {
+					aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(4, 8)));				
+				}
 			}
-		}
-		if (aTier >= 2) {
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(8, 16)));
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(16, 32)));			
-			if (MathUtils.randInt(0, 10) > 9) {
-				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(4, 8)));				
+			if (aTier >= 2) {
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(8, 16)));
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(16, 32)));			
+				if (MathUtils.randInt(0, 10) > 9) {
+					aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(4, 8)));				
+				}
 			}
-		}
-		if (aTier >= 3) {
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(16, 32)));
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, MathUtils.randInt(2, 8)));			
-			if (MathUtils.randInt(0, 10) > 9) {
-				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, MathUtils.randInt(8, 16)));				
+			if (aTier >= 3) {
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, MathUtils.randInt(16, 32)));
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, MathUtils.randInt(2, 8)));			
+				if (MathUtils.randInt(0, 10) > 9) {
+					aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, MathUtils.randInt(8, 16)));				
+				}
 			}
-		}
-		if (aTier >= 4) {
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, MathUtils.randInt(16, 32)));
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, MathUtils.randInt(32, 64)));			
-			if (MathUtils.randInt(0, 10) > 9) {
-				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, MathUtils.randInt(4, 8)));				
+			if (aTier >= 4) {
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, MathUtils.randInt(16, 32)));
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, MathUtils.randInt(32, 64)));			
+				if (MathUtils.randInt(0, 10) > 9) {
+					aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, MathUtils.randInt(4, 8)));				
+				}
 			}
-		}
-		if (aTier >= 5) {
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, MathUtils.randInt(16, 32)));
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, MathUtils.randInt(16, 32)));			
-			if (MathUtils.randInt(0, 10) > 9) {
-				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, MathUtils.randInt(1, 2)));				
+			if (aTier >= 5) {
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, MathUtils.randInt(16, 32)));
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, MathUtils.randInt(16, 32)));			
+				if (MathUtils.randInt(0, 10) > 9) {
+					aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, MathUtils.randInt(1, 2)));				
+				}
 			}
-		}
-		// Tier 6 is Highest for outputs
-		if (aTier >= 6) {
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, MathUtils.randInt(16, 32)));
-			aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, MathUtils.randInt(8, 16)));			
-			if (MathUtils.randInt(0, 10) > 9) {
-				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, MathUtils.randInt(8, 16)));				
+			// Tier 6 is Highest for outputs
+			if (aTier >= 6) {
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, MathUtils.randInt(16, 32)));
+				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, MathUtils.randInt(8, 16)));			
+				if (MathUtils.randInt(0, 10) > 9) {
+					aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, MathUtils.randInt(8, 16)));				
+				}
 			}
-		}
-		
-		// Iterate a special loop at higher tiers to provide more Red/Gold Algae.
-		for (int i=0;i<(9-aTier);i++) {
-			if (aTier >= (6+i)) {
-				int aMulti = i + 1;
-				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, MathUtils.randInt(4, 8*aMulti)));
-				aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, MathUtils.randInt(4, 8*aMulti)));			
-				if (MathUtils.randInt(0, 10) > 8) {
-					aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, MathUtils.randInt(8, 16*aMulti)));				
+			
+			// Iterate a special loop at higher tiers to provide more Red/Gold Algae.
+			for (int i2=0;i2<(9-aTier);i2++) {
+				if (aTier >= (6+i2)) {
+					int aMulti = i2 + 1;
+					aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, MathUtils.randInt(4, 8*aMulti)));
+					aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, MathUtils.randInt(4, 8*aMulti)));			
+					if (MathUtils.randInt(0, 10) > 8) {
+						aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, MathUtils.randInt(8, 16*aMulti)));				
+					}
 				}
 			}
 		}
 		
+		
+		
 		// Map the AutoMap contents to an Itemstack Array.
 		ItemStack[] aOutputs = new ItemStack[aOutputMap.size()];
 		for (int i=0;i<aOutputMap.size();i++) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index a3aa7e5e78..eecbde9804 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -46,34 +46,34 @@ public class GregtechDehydrator {
 		GregtechItemList.GT_Dehydrator_MV
 		.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(911, "machine.dehydrator.tier.00",
 				"Basic Dehydrator I", 2, "This dehydrates your Grapes into Raisins. ",
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png",
+				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 16000, 2, 5, "Dehydrator.png",
 				"", false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
 		GregtechItemList.GT_Dehydrator_HV
 		.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(912, "machine.dehydrator.tier.01",
 				"Basic Dehydrator II", 3, "This dehydrates your Grapes into Raisins. ",
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png",
+				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 32000, 2, 5, "Dehydrator.png",
 				"", false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
 		
 		//Chemical
 		GregtechItemList.GT_Dehydrator_EV
 				.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(813, "advancedmachine.dehydrator.tier.01",
 						"Chemical Dehydrator I", 4, "This dehydrates your Grapes into Raisins. ",
-						Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png",
+						Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 48000, 2, 5, "Dehydrator.png",
 						"", false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
 		GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(814,
 				"advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5,
 				"A hangover is the way your body reacts to dehydration. ",
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "",
+				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 64000, 2, 5, "Dehydrator.png", "",
 				false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
 		GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(815,
 				"advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6,
 				"You could probably make space icecream with this.. ",
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "",
+				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 64000, 2, 5, "Dehydrator.png", "",
 				false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
 		GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(816,
 				"advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7,
 				"You can definitely make space icecream with this.. ",
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "",
+				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 64000, 2, 5, "Dehydrator.png", "",
 				false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
 		
 		//Advanced