= Added recipe for Zyngen.

+ Added recipes for 2 new volumetric flasks.
- Removed Alloy Smelting recipes form the Alloy Blast Smelter. (Obsoleted by the Multi Alloy Smelter)
% Refactored a lot of NEI handling code.
$ Fixed the last few minor NEI issues.

2 files changed, 49 insertions, 15 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index ce2d7bb105..6c77dfa4b6 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -18,13 +18,13 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.core.util.minecraft.*;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
+import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -183,7 +183,32 @@ public class RECIPES_General {
 
 
 
-
+		if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
+			CORE.RA.addSixSlotAssemblingRecipe(
+					new ItemStack[] {
+							CI.getNumberedAdvancedCircuit(4),
+							ItemUtils.getSimpleStack(Blocks.glass, 16),
+							ItemUtils.getSimpleStack(Blocks.glowstone, 16),
+							ItemList.Large_Fluid_Cell_Steel.get(1)
+					}, 
+					FluidUtils.getFluidStack("molten.borosilicateglass", 2000), 
+					VolumetricFlaskHelper.getLargeVolumetricFlask(2),
+					20 * 15, 
+					MaterialUtils.getVoltageForTier(3));
+			
+			CORE.RA.addSixSlotAssemblingRecipe(
+					new ItemStack[] {
+							CI.getNumberedAdvancedCircuit(5),
+							ItemUtils.getSimpleStack(Blocks.glass, 64),
+							ItemUtils.getSimpleStack(Blocks.glowstone, 64),
+							ItemList.Large_Fluid_Cell_TungstenSteel.get(1)
+					}, 
+					FluidUtils.getFluidStack("molten.borosilicateglass", 8000), 
+					VolumetricFlaskHelper.getGiganticVolumetricFlask(2),
+					20 * 15, 
+					MaterialUtils.getVoltageForTier(5));
+			
+		}
 
 
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 9d6cffdde3..0b0bf56a1c 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -2,15 +2,10 @@ package gtPlusPlus.core.recipe;
 
 import static gtPlusPlus.core.lib.CORE.GTNH;
 
-import codechicken.nei.api.API;
 import cpw.mods.fml.common.Loader;
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
@@ -21,10 +16,7 @@ import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.core.util.minecraft.*;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.dimension.Dimension_Everglades;
@@ -33,7 +25,6 @@ import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
-import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -250,9 +241,27 @@ public class RECIPES_Machines {
 		distillus();
 		algaeFarm();
 		chemPlant();
+		zyngen();
 
 	}
 
+	private static void zyngen() {
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(6),
+						CI.getTieredMachineHull(4),
+						ItemList.Machine_EV_AlloySmelter.get(1),
+						CI.getGear(3, 16),
+						CI.getBolt(3, 64),
+						CI.getPlate(4, 16)
+				}, 
+				CI.getAlternativeTieredFluid(4, 144 * 8), 
+				GregtechItemList.Industrial_AlloySmelter.get(1),
+				20 * 30, 
+				MaterialUtils.getVoltageForTier(4));
+				
+	}
+
 	private static void chemPlant() {
 
 		CORE.RA.addSixSlotAssemblingRecipe(