+ Added more 'Special Behaviour' items for my multiblocks as Examples.

+ Added '/gtpp hand' command.
+ Added TungstenSteel & Neutronium tool variants to NEI while in dev.
+ Added Large Semifluid Generator and a crafting recipe for it.
+ Added Placeholder for Adv. Assembly Line.
+ Added Distillus Upgrade Chip and a crafting recipe for it.
% Updated build.gradle.
% Reworked a few recipes.
$ Fixed ULV Overflow Covers using 0L Water in assembler. (https://github.com/GTNewHorizons/NewHorizons/issues/5700)
$ Fixed Integral Encasement I using 0L Steel in assembler. (https://github.com/GTNewHorizons/NewHorizons/issues/5617)
$ Fixed Thaumcraft based FakePlayer's triggering Fluorite drops. (https://github.com/GTNewHorizons/NewHorizons/issues/5744)
$ Fixed bad handling of hatch textures on a few multiblocks.
$ Semi-Fixed Distillus.
$ Fixed Semifluid Generator recipes.
$ Fixed Semifluid Generators crashing the game when mined.
$ Fixed bad handling of calls to ItemList.java.
$ Began work fixing all ASM to be more compatible with ProGuard.
$ Fixed compiler complaining about varargs.
^ Bumped version to 1.7.05.x.

11 files changed, 344 insertions, 276 deletions

diff --git a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index 06b6f14822..adcaa1db70 100644
--- a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -2,15 +2,22 @@ package gtPlusPlus.core.commands;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.preloader.asm.AsmConfig;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
 
@@ -84,6 +91,27 @@ public class CommandEnableDebugWhileRunning implements ICommand
 			AsmConfig.disableAllLogging = Utils.invertBoolean(AsmConfig.disableAllLogging);
 			PlayerUtils.messagePlayer(P, "Toggled GT++ Logging - Enabled: "+(!AsmConfig.disableAllLogging));
 		}
+		/*		else if (argString[0].toLowerCase().equals("test")) {
+					ItemStack mSemiFluidgen = ItemUtils.simpleMetaStack("IC2:blockGenerator", 7, 1);		
+					final EntityPlayer P = CommandUtils.getPlayer(S);
+					if(mSemiFluidgen != null) {
+						PlayerUtils.messagePlayer(P, ItemUtils.getItemName(mSemiFluidgen));
+					}			
+				}*/
+		else if (argString[0].toLowerCase().equals("hand")) {
+			final EntityPlayer P = CommandUtils.getPlayer(S);	
+			if (P != null) {
+				ItemStack aHeldItem = PlayerUtils.getItemStackInPlayersHand(P);
+				if (aHeldItem != null) {
+					String aItemDisplayName = ItemUtils.getItemName(aHeldItem);
+					String aNbtString = tryIterateNBTData(aHeldItem);	
+					PlayerUtils.messagePlayer(P, "["+aItemDisplayName+"] "+aNbtString);				
+				}
+				else {
+					PlayerUtils.messagePlayer(P, "No item held.");
+				}
+			}
+		}
 		else {		
 			final EntityPlayer P = CommandUtils.getPlayer(S);	
 			PlayerUtils.messagePlayer(P, "Invalid command, use '?' as an argument for help.'");
@@ -117,5 +145,35 @@ public class CommandEnableDebugWhileRunning implements ICommand
 	public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost){
 		return true;
 	}
+	
+	public static String tryIterateNBTData(ItemStack aStack) {
+		try {
+			AutoMap<String> aItemDataTags = new AutoMap<String>();
+			NBTTagCompound aNBT = NBTUtils.getNBT(aStack);
+			if (aNBT != null) {
+				if (!aNBT.hasNoTags()) {
+					Map<?, ?> mInternalMap = ReflectionUtils.getField(aNBT, "tagMap");
+					if (mInternalMap != null) {
+						for (Map.Entry<?, ?> e : mInternalMap.entrySet()) {
+							aItemDataTags.add(e.getKey().toString()+":"+e.getValue());
+						}
+						int a = 0;
+						String data = "";
+						for (String tag : aItemDataTags) {
+							data += (tag+",");
+						}
+						if (data.endsWith(",")) {
+							data = data.substring(0, data.length()-2);
+						}
+						return data;
+					} else {
+						Logger.INFO("Data map reflected from NBTTagCompound was not valid.");
+						return "Bad NBT";
+					}
+				} 
+			} 
+		} catch (Throwable t) {}
+		return "";
+	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 71a7b37cfc..0398b1619f 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -110,7 +110,7 @@ public class CommonProxy {
 		Logger.INFO("[Proxy] Calling Render registrator.");
 		registerRenderThings();
 
-		if (!mFluidsGenerated && ItemList.valueOf("Cell_Empty").hasBeenSet()) {
+		if (!mFluidsGenerated && ItemList.Cell_Empty.hasBeenSet()) {
 			Material.generateQueuedFluids();
 			mFluidsGenerated = true;
 		}
@@ -126,7 +126,7 @@ public class CommonProxy {
 		registerCustomItemsForMaterials();
 		ModBlocks.blockCustomMobSpawner = new BlockGenericSpawner();
 
-		if (!mFluidsGenerated && ItemList.valueOf("Cell_Empty").hasBeenSet()) {
+		if (!mFluidsGenerated && ItemList.Cell_Empty.hasBeenSet()) {
 			Material.generateQueuedFluids();
 			mFluidsGenerated = true;
 		} else {
diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index ee6c15fa67..b3738e6ea2 100644
--- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -16,17 +16,28 @@ import net.minecraft.util.ChunkCoordinates;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.oredict.OreDictionary;
+import thaumcraft.common.lib.FakeThaumcraftPlayer;
 
 public class BlockEventHandler {
 	public static ArrayList<ItemStack> oreLimestone;
 	public static ArrayList<ItemStack> blockLimestone;
 	public static ItemStack fluoriteOre;
+	
+	public static void init() {
+		//Set Variables for Fluorite Block handling
+		Logger.INFO("Setting some Variables for the block break event handler.");
+		BlockEventHandler.oreLimestone = OreDictionary.getOres("oreLimestone");
+		BlockEventHandler.blockLimestone = OreDictionary.getOres("limestone");
+		BlockEventHandler.fluoriteOre = FLUORIDES.FLUORITE.getOre(1);
+	}
 
 	@SubscribeEvent
 	public void onBlockLeftClicked(final PlayerInteractEvent event) {
@@ -90,7 +101,7 @@ public class BlockEventHandler {
 					ChunkCoordinates aChunkLocation = p.getPlayerCoordinates();
 
 					// Cache Fake Player
-					if (p instanceof FakePlayer
+					if (p instanceof FakePlayer || p instanceof FakeThaumcraftPlayer 
 							|| (event.harvester.getCommandSenderName() == null
 									|| event.harvester.getCommandSenderName().length() <= 0)
 							|| (p.isEntityInvulnerable() && !p.canCommandSenderUseCommand(0, "")
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java
index 4abb84a33c..d98b27d163 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java
@@ -4,6 +4,14 @@ import static gtPlusPlus.core.lib.CORE.RANDOM;
 
 import java.util.List;
 
+import gregtech.api.enums.ItemList;
+import gtPlusPlus.core.entity.item.ItemEntityGiantEgg;
+import gtPlusPlus.core.item.base.BaseItemBurnable;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.NBTUtils;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
@@ -14,16 +22,6 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
-import gregtech.api.enums.ItemList;
-
-import gtPlusPlus.core.entity.item.ItemEntityGiantEgg;
-import gtPlusPlus.core.item.base.BaseItemBurnable;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.NBTUtils;
-
 public class ItemGiantEgg extends BaseItemBurnable {
 
 	public ItemGiantEgg(String unlocalizedName, String displayName, CreativeTabs creativeTab, int stackSize, int maxDmg,
@@ -138,7 +136,7 @@ public class ItemGiantEgg extends BaseItemBurnable {
 					if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() > 28) {
 						
 
-						ItemList xl = Utils.getValueOfItemList("Circuit_Chip_Stemcell", ItemList.Circuit_Elite);						
+						ItemList xl = ItemUtils.getValueOfItemList("Circuit_Chip_Stemcell", ItemList.Circuit_Elite);						
 						if (xl != null && xl.hasBeenSet()) {
 							mCorrectStemCells = xl.get(1);
 						}
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 34d7475df3..41a21bb642 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -55,7 +55,7 @@ public class CORE {
 
 	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.7.03.45";
+	public static final String VERSION = "1.7.05";
 	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 69bd414d9c..f766e8d768 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -597,6 +597,16 @@ public class RECIPES_GREGTECH {
 				ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1),
 				20 * 60 * 5,
 				MaterialUtils.getVoltageForTier(5));
+		
+		// Distillus Upgrade Chip
+		GT_Values.RA.addLaserEngraverRecipe(
+				GregtechItemList.Laser_Lens_WoodsGlass.get(0),
+				ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, 20, 1),
+				GregtechItemList.Distillus_Upgrade_Chip.get(1),
+				20 * 60 * 5,
+				MaterialUtils.getVoltageForTier(5));
+		
+		
 
 
 	}
@@ -1493,10 +1503,10 @@ public class RECIPES_GREGTECH {
 		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {ItemUtils.getSimpleStack(Items.nether_star), ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 8), ItemUtils.getItemStackOfAmountFromOreDict("stickBlackSteel", 8)}, null, ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 32), 30*20, 500);
 
 
-		ItemStack aFluidReg1 = Utils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
-		ItemStack aFluidReg2 = Utils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
-		ItemStack aFluidReg3 = Utils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
-		ItemStack aFluidReg4 = Utils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
+		ItemStack aFluidReg1 = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
+		ItemStack aFluidReg2 = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
+		ItemStack aFluidReg3 = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
+		ItemStack aFluidReg4 = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
 
 		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 				aFluidReg1,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 2165f27ec7..ebc2c07a63 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -2,9 +2,14 @@ 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.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
 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;
@@ -15,16 +20,17 @@ 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.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
-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.RecipeUtils;
 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 gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -241,29 +247,29 @@ public class RECIPES_Machines {
 		distillus();
 		algaeFarm();
 		chemPlant();
-		
+
 	}
 
 	private static void chemPlant() {
-		
+
 		CORE.RA.addSixSlotAssemblingRecipe(
 				new ItemStack[] {
-					CI.getNumberedBioCircuit(19),
-					CI.getTieredGTPPMachineCasing(1, 6),
-					CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGt, 6),
-					CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plate, 32),
-					CI.getTieredComponentOfMaterial(Materials.CobaltBrass, OrePrefixes.dust, 16),
-					CI.getTieredComponent(OrePrefixes.frameGt, 2, 4),
+						CI.getNumberedBioCircuit(19),
+						CI.getTieredGTPPMachineCasing(1, 6),
+						CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGt, 6),
+						CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plate, 32),
+						CI.getTieredComponentOfMaterial(Materials.CobaltBrass, OrePrefixes.dust, 16),
+						CI.getTieredComponent(OrePrefixes.frameGt, 2, 4),
 				}, 
 				ALLOY.STEEL.getFluid(2 * (144 * 4)), 
 				GregtechItemList.ChemicalPlant_Controller.get(1), 
 				120 * 20, 
 				MaterialUtils.getVoltageForTier(2));
-		
+
 	}
 
 	private static void algaeFarm() {
-		
+
 		// Give the shitty algae a use :)
 		CORE.RA.addDistilleryRecipe(
 				ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 32),
@@ -273,26 +279,26 @@ public class RECIPES_Machines {
 				20 * 15,
 				16, 
 				false);
-		
+
 		CORE.RA.addSixSlotAssemblingRecipe(
 				new ItemStack[] {
-					CI.getNumberedBioCircuit(21),
-					CI.getTieredGTPPMachineCasing(0, 4),
-					CI.getTieredComponentOfMaterial(Materials.Iron, OrePrefixes.rod, 12),
-					CI.getTieredComponentOfMaterial(Materials.Wood, OrePrefixes.plate, 32),
-					CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.bolt, 16),
-					CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32),
+						CI.getNumberedBioCircuit(21),
+						CI.getTieredGTPPMachineCasing(0, 4),
+						CI.getTieredComponentOfMaterial(Materials.Iron, OrePrefixes.rod, 12),
+						CI.getTieredComponentOfMaterial(Materials.Wood, OrePrefixes.plate, 32),
+						CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.bolt, 16),
+						CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32),
 				}, 
 				ALLOY.POTIN.getFluid(2 * (144 * 4)), 
 				GregtechItemList.AlgaeFarm_Controller.get(1), 
 				60 * 20, 
 				MaterialUtils.getVoltageForTier(1));	
-		
-		
+
+
 	}
 
 	private static void distillus() {
-		
+
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						CI.getNumberedBioCircuit(19),
@@ -310,44 +316,44 @@ public class RECIPES_Machines {
 						GregtechItemList.Machine_Adv_DistillationTower.get(1)
 				}, 
 				new FluidStack[] {
-						
+
 				},
 				20 * 600, 
 				MaterialUtils.getVoltageForTier(6), 
 				3);
-		
+
 	}
 
 	private static void chunkloaders() {
-		
+
 		ItemStack aOutputs[] = new ItemStack[] {
 				GregtechItemList.GT_Chunkloader_HV.get(1L),
 				GregtechItemList.GT_Chunkloader_IV.get(1L),
 				GregtechItemList.GT_Chunkloader_ZPM.get(1L),
 		};
-		
+
 		int aIndex = 0;
-		
+
 		for (int i=3;i<8;i++) {	
 			if (i == 4 || i == 6) {
 				continue;
 			}			
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
-						CI.getNumberedBioCircuit(21),
-						CI.getElectricPiston(i, 10),
-						CI.getFieldGenerator(i + 1, 6),
-						CI.getPlate(i, 16),
-						CI.getTransmissionComponent(i - 1, 8),
-						CI.getTieredComponent(OrePrefixes.cableGt08, i, 16)
+							CI.getNumberedBioCircuit(21),
+							CI.getElectricPiston(i, 10),
+							CI.getFieldGenerator(i + 1, 6),
+							CI.getPlate(i, 16),
+							CI.getTransmissionComponent(i - 1, 8),
+							CI.getTieredComponent(OrePrefixes.cableGt08, i, 16)
 					}, 
 					ALLOY.EGLIN_STEEL.getFluid(i * (144 * 4)), 
 					aOutputs[aIndex++].copy(), 
 					300 * 20, 
 					MaterialUtils.getVoltageForTier(i));			
 		}
-		
-		
+
+
 	}
 
 	private static void overflowValveCovers() {
@@ -359,25 +365,25 @@ public class RECIPES_Machines {
 				GregtechItemList.Cover_Overflow_EV.get(1L),
 				GregtechItemList.Cover_Overflow_IV.get(1L),	
 		};
-		
+
 		for (int i=0;i<6;i++) {			
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
-						CI.getNumberedBioCircuit(19),
-						CI.getElectricPump(i, 2),
-						CI.getElectricMotor(i, 2),
-						CI.getPlate(i, 4)
+							CI.getNumberedBioCircuit(19),
+							CI.getElectricPump(i, 2),
+							CI.getElectricMotor(i, 2),
+							CI.getPlate(i, 4)
 					}, 
-					FluidUtils.getWater(i * 1500), 
+					FluidUtils.getWater((i+1) * 750), 
 					aOutputs[i].copy(), 
 					20 * 20, 
 					MaterialUtils.getVoltageForTier(i));			
 		}
-		
+
 	}
 
 	private static void tieredMachineHulls() {
-		
+
 		GregtechItemList[] aHulls = new GregtechItemList[] {
 				GregtechItemList.GTPP_Casing_ULV,
 				GregtechItemList.GTPP_Casing_LV,
@@ -390,7 +396,7 @@ public class RECIPES_Machines {
 				GregtechItemList.GTPP_Casing_UV,
 				GregtechItemList.GTPP_Casing_MAX
 		};
-		
+
 		for (int i=0;i<10;i++) {			
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
@@ -401,12 +407,12 @@ public class RECIPES_Machines {
 							CI.getTieredComponent(OrePrefixes.cableGt02, i, 4),
 							CI.getTieredComponent(OrePrefixes.circuit, i, 2)
 					},
-					CI.getAlternativeTieredFluid(i, 144 * i * 2), 
+					CI.getAlternativeTieredFluid(i, 144 * (i+1) * 2), 
 					aHulls[i].get(1), 
 					20 * 20, 
 					MaterialUtils.getVoltageForTier(i));			
 		}
-		
+
 	}
 
 	private static void initModItems(){
@@ -443,7 +449,7 @@ public class RECIPES_Machines {
 				EV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1);
 				HV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1);
 				EV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1);			
-				EV_MACHINE_MassFabricator= CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? gtPlusPlus.core.util.Utils.getValueOfItemList("Machine_LuV_Massfab", ItemList.Machine_IV_Massfab).get(1) : ItemList.Machine_IV_Massfab.get(1);
+				EV_MACHINE_MassFabricator= CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemUtils.getValueOfItemList("Machine_LuV_Massfab", ItemList.Machine_IV_Massfab).get(1) : ItemList.Machine_IV_Massfab.get(1);
 				EV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1);
 				EV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1);
 				EV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1);
@@ -541,9 +547,9 @@ 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);
-			
+			ItemStack aFluidRegulator1 = ItemUtils.getValueOfItemList("FluidRegulator_MV",GTNH ? 4 : 2, ItemList.Electric_Pump_HV);
+			ItemStack aFluidRegulator2 = ItemUtils.getValueOfItemList("FluidRegulator_IV", GTNH ? 4 : 2, ItemUtils.getValueOfItemList("Electric_Pump_LuV", GTNH ? 8 : 4, ItemList.Electric_Pump_IV));
+
 			//Poo Collector		
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
@@ -605,7 +611,7 @@ public class RECIPES_Machines {
 						plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy,
 						RECIPE_SteamCondenser);
 			}
-			
+
 
 			//Steam Condenser
 			if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor){
@@ -900,25 +906,47 @@ public class RECIPES_Machines {
 			}
 			//TODO
 
-			//Semi-Fluid Generators
-			ItemStack mSemiFluidgen = ItemUtils.getItemStackFromFQRN("IC2:blockGenerator:7", 1);
-			mSemiFluidgen.setItemDamage(7);
+			//Semi-Fluid Generators			
+			ItemStack[][] aSemiFluidInputs = new ItemStack[3][6];
+			aSemiFluidInputs[0] = new ItemStack[]{
+					CI.getNumberedBioCircuit(14),
+					CI.getTieredMachineHull(1, 1),
+					CI.getElectricPiston(1, GTNH ? 4 : 2),
+					CI.getTieredComponent(OrePrefixes.circuit, 1, GTNH ? 4 : 2),
+					CI.getPlate(1, GTNH ? 8 : 4),
+					CI.getGear(1, GTNH ? 4 : 2)
+			};
+			aSemiFluidInputs[1] = new ItemStack[]{
+					CI.getNumberedBioCircuit(14),
+					CI.getTieredMachineHull(2, 1),
+					CI.getElectricPiston(2, GTNH ? 4 : 2),
+					CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 4 : 2),
+					CI.getPlate(2, GTNH ? 8 : 4),
+					CI.getGear(2, GTNH ? 4 : 2)
+			};
+			aSemiFluidInputs[2] = new ItemStack[]{
+					CI.getNumberedBioCircuit(14),
+					CI.getTieredMachineHull(3, 1),
+					CI.getElectricPiston(3, GTNH ? 4 : 2),
+					CI.getTieredComponent(OrePrefixes.circuit, 3, GTNH ? 4 : 2),
+					CI.getPlate(3, GTNH ? 8 : 4),
+					CI.getGear(3, GTNH ? 4 : 2)
+			};
+			FluidStack[] aSemiFluidFluidInputs = new FluidStack[] {
+					ALLOY.BRONZE.getFluid(144 * 8),
+					ALLOY.STEEL.getFluid(144 * 8),
+					ELEMENT.getInstance().ALUMINIUM.getFluid(144 * 8),
+			};
+
 			//ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);			
-			ItemStack[] aSemifluids = new ItemStack[] {mSemiFluidgen, GregtechItemList.Generator_SemiFluid_LV.get(1), GregtechItemList.Generator_SemiFluid_MV.get(1), GregtechItemList.Generator_SemiFluid_HV.get(1)};
-			for (int o=1;o<4;o++) {
+			ItemStack[] aSemifluids = new ItemStack[] {GregtechItemList.Generator_SemiFluid_LV.get(1), GregtechItemList.Generator_SemiFluid_MV.get(1), GregtechItemList.Generator_SemiFluid_HV.get(1)};
+			for (int o=0;o<3;o++) {
 				CORE.RA.addSixSlotAssemblingRecipe(
-						new ItemStack[] {
-								aSemifluids[o-1],
-								CI.getElectricPiston(o, GTNH ? 4 : 2),
-								CI.getElectricMotor(o, GTNH ? 2 : 1),
-								CI.getTieredComponent(OrePrefixes.circuit, o, GTNH ? 4 : 2),
-								CI.getPlate(o, GTNH ? 8 : 4),
-								CI.getGear(o-1, GTNH ? 4 : 2)
-						},
-						CI.getAlternativeTieredFluid(o, 144 * 4),
+						aSemiFluidInputs[o],
+						aSemiFluidFluidInputs[o],
 						aSemifluids[o],
 						20 * 30,
-						(int) GT_Values.V[o]);
+						MaterialUtils.getVoltageForTier(o+1));
 			}			
 
 			if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter){
@@ -955,9 +983,9 @@ public class RECIPES_Machines {
 
 				//Matter Fabricator CPU
 				RecipeUtils.addShapedGregtechRecipe(
-						"plateDoubleQuantum", CI.circuitTier5, "plateDoubleQuantum",
+						CI.getDoublePlate(8, 1), CI.circuitTier5, CI.getPlate(8, 1),
 						cableTier8, CI.machineCasing_LuV, cableTier8,
-						"plateDoubleQuantum", CI.circuitTier5, "plateDoubleQuantum",
+						CI.getPlate(8, 1), CI.circuitTier5, CI.getPlate(8, 1),
 						RECIPE_IndustrialMatterFabController);
 				//Matter Fabricator Frame Casing
 				RecipeUtils.addShapedGregtechRecipe(
@@ -967,9 +995,9 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialMatterFabFrame);
 				//Matter Fabricator Coil
 				RecipeUtils.addShapedGregtechRecipe(
-						"plateQuantum", "plateQuantum", "plateQuantum",
+						CI.getPlate(6, 1), CI.getPlate(7, 1), CI.getPlate(6, 1),
 						"frameGtStellite", CI.machineCasing_UV, "frameGtStellite",
-						"plateQuantum", "plateQuantum", "plateQuantum",
+						CI.getPlate(6, 1), CI.getPlate(7, 1), CI.getPlate(6, 1),
 						RECIPE_IndustrialMatterFabCoil);
 			}
 
@@ -1120,12 +1148,6 @@ public class RECIPES_Machines {
 					aSimpleWasherTier += 2;
 					aSlot++;
 				}
-
-
-
-
-
-
 			}
 
 			if (CORE.ConfigSwitches.enableMachine_Pollution && PollutionUtils.isPollutionEnabled()){
@@ -1149,20 +1171,6 @@ public class RECIPES_Machines {
 						CI.getTieredCircuit(1), CI.machineHull_LV, CI.getTieredCircuit(0),
 						GregtechItemList.Pollution_Detector.get(1));
 
-				//Air Intake Hatch
-
-
-
-				ItemList FluidRegulator_IV = Utils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV);				
-				ItemStack aTieredFluidRegulator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? FluidRegulator_IV.get(1) : ItemList.Pump_IV.get(1);
-
-
-				RecipeUtils.addShapedGregtechRecipe(
-						CI.component_Plate[6], ItemList.Casing_Grate.get(1), CI.component_Plate[6],
-						CI.component_Plate[6], aTieredFluidRegulator, CI.component_Plate[6],
-						CI.getTieredCircuit(4), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(4),
-						GregtechItemList.Hatch_Air_Intake.get(1));
-
 				//ULV
 				RecipeUtils.addShapedGregtechRecipe(
 						CI.component_Plate[0], ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), CI.component_Plate[0],
@@ -1267,6 +1275,15 @@ public class RECIPES_Machines {
 						);
 			}
 
+			//Air Intake Hatch
+			ItemList FluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV);				
+			ItemStack aTieredFluidRegulator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? FluidRegulator_IV.get(1) : ItemList.Pump_IV.get(1);
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.component_Plate[6], ItemList.Casing_Grate.get(1), CI.component_Plate[6],
+					CI.component_Plate[6], aTieredFluidRegulator, CI.component_Plate[6],
+					CI.getTieredCircuit(4), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(4),
+					GregtechItemList.Hatch_Air_Intake.get(1));
+
 			if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor){
 
 				//Thorium Reactor
@@ -1342,15 +1359,6 @@ public class RECIPES_Machines {
 						CI.craftingToolHammer_Hard, "frameGtHastelloyC276", CI.craftingToolWrench,
 						CI.component_Plate[5], CI.getTieredMachineCasing(4), "ringInconel792",
 						GregtechItemList.Casing_Refinery_Structural.get(Casing_Amount));
-
-
-
-
-
-
-
-
-
 			}
 
 			//Shelves
@@ -1419,15 +1427,25 @@ public class RECIPES_Machines {
 						RECIPE_CyclotronController,					
 						60 * 20 * 5, 
 						MaterialUtils.getVoltageForTier(5));
+			}
 
+			// Mazut
+			GT_ModHandler.addCraftingRecipe(
+					GregtechItemList.Controller_LargeSemifluidGenerator.get(1L),
+					CI.bitsd, 
+					new Object[]{
+							"PCP", 
+							"EME", 
+							"GWG",
+							'M', ItemList.Hull_EV, 
+							'P', ItemList.Electric_Piston_EV, 
+							'E', ItemList.Electric_Pump_EV, 
+							'C', OrePrefixes.circuit.get(Materials.Data), 
+							'W', OrePrefixes.cableGt08.get(Materials.Electrum), 
+							'G', ALLOY.INCONEL_792.getGear(1)
+					});
 
 
-
-
-
-
-			}
-
 			if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){
 				RecipeUtils.recipeBuilder(
 						"screwTitanium", "plateIncoloy020", "screwTitanium",
@@ -1475,8 +1493,7 @@ public class RECIPES_Machines {
 			if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter) {
 
 				ItemStack aCoreBlock = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK
-						? ItemList.valueOf("Block_IridiumTungstensteel").get(1,
-								ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1))
+						? ItemUtils.getValueOfItemList("Block_IridiumTungstensteel", 1, ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1))
 								: ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1);
 
 						aCoreBlock.stackSize = GTNH ? 2 : 1;
@@ -1622,7 +1639,7 @@ public class RECIPES_Machines {
 				cell1 = CI.conveyorModule_EV;
 				cell2 = CI.electricMotor_IV;
 				ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1);
-				ItemStack aTieredUnboxinator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemList.valueOf("Machine_LuV_Unboxinator").get(1, ItemList.Machine_IV_Unboxinator.get(1)) : ItemList.Machine_IV_Unboxinator.get(1);
+				ItemStack aTieredUnboxinator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemUtils.getValueOfItemList("Machine_LuV_Unboxinator", 1, ItemList.Machine_IV_Unboxinator.get(1)) : ItemList.Machine_IV_Unboxinator.get(1);
 
 
 				RecipeUtils.recipeBuilder(
@@ -1768,7 +1785,7 @@ public class RECIPES_Machines {
 
 
 
-				ItemStack aDrillController = Utils.getValueOfItemList("OreDrill4", ItemList.Hull_UV).get(1);				
+				ItemStack aDrillController = ItemUtils.getValueOfItemList("OreDrill4", ItemList.Hull_UV).get(1);				
 
 				//Drilling Platform
 				CORE.RA.addSixSlotAssemblingRecipe(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
index 98ea687747..3ed2f5f168 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
@@ -1,24 +1,24 @@
 package gtPlusPlus.core.recipe;
 
 import cpw.mods.fml.common.Loader;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OreDictNames;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-
-import codechicken.nei.api.API;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import net.minecraft.item.ItemStack;
 
 public class RECIPES_Old_Circuits  implements IOreRecipeRegistrator {
 	public RECIPES_Old_Circuits() {
@@ -445,7 +445,7 @@ public class RECIPES_Old_Circuits  implements IOreRecipeRegistrator {
 
 			for (String component : CircuitToHide){
 				try {
-					API.hideItem(Utils.getValueOfItemList(component, null).get(1L, new Object[0]));
+					ItemUtils.hideItemFromNEI(ItemUtils.getValueOfItemList(component, null).get(1L, new Object[0]));
 				} catch (IllegalArgumentException I){
 					Logger.INFO("Could not find "+component+" in the Gregtech item list.");
 					Logger.INFO("This is NOT an error, simply a notification.");
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 1d3d386da3..d67a372572 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -9,7 +9,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
@@ -17,7 +16,6 @@ import gtPlusPlus.core.recipe.LOADER_Machine_Components;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.eio.material.MaterialEIO;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 import ic2.core.Ic2Items;
@@ -184,7 +182,7 @@ public class CI {
 	public static ItemStack explosiveITNT;
 
 	public static void preInit(){
-		
+
 		//Tiered Components<