+ Added config for the Large Extruder.

+ Added config for machine component assemblers.
+ Added recipes for Large Extruder and its casings.
% Changed default config value for custom circuits. It was true, now it is false.
$ Tweaked ASM class handling when conditions are not met.

14 files changed, 176 insertions, 50 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus_Secondary.java b/src/Java/gtPlusPlus/GTplusplus_Secondary.java
index 8b06a2371a..41288f24c2 100644
--- a/src/Java/gtPlusPlus/GTplusplus_Secondary.java
+++ b/src/Java/gtPlusPlus/GTplusplus_Secondary.java
@@ -25,7 +25,7 @@ import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.config.Configuration;
 
 @MCVersion(value = "1.7.10")
-@Mod(modid = Everglades.MODID, name = Everglades.NAME, version = Everglades.VERSION, dependencies = "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; required-after:miscutils;")
+@Mod(modid = Everglades.MODID, name = Everglades.NAME, version = Everglades.VERSION, dependencies = "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; after:miscutils;")
 public class GTplusplus_Secondary implements ActionListener {
 
 	//Mod Instance
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 421a522945..f895cd60d9 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -75,14 +75,15 @@ public class CommonProxy {
 		registerEntities();
 		Logger.INFO("[Proxy] Calling Tile Entity registrator.");
 		registerTileEntities();
-		Logger.INFO("[Proxy] Calling Render registrator.");
-		registerRenderThings();
 		
 		//Moved from Init after Debug Loading.
 		//29/01/18 - Alkalus
 		ModItems.init();
 		ModBlocks.init();
 		CI.preInit();
+		
+		Logger.INFO("[Proxy] Calling Render registrator.");
+		registerRenderThings();
 
 
 	}
diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
index a9fbec55de..02b2d0366a 100644
--- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
@@ -47,8 +47,8 @@ public class ConfigHandler {
 		boilerSteamPerSecond = config.getInt("boilerSteamPerSecond", "machines", 750, 0, 10000, "Sets the steam per second value in LV,MV,HV boilers (respectively 1x,2x,3x this number for the tiers)");
 	
 		//Circuits
-		enableCustomCircuits = config.getBoolean("enableCustomCircuits", "gregtech", true,
-				"Adds custom circuits to expand past the Master Tier.");
+		enableCustomCircuits = config.getBoolean("enableCustomCircuits", "gregtech", false,
+				"Adds custom circuits to expand past the Master Tier. Only really recommended to enable if enableOldGTcircuits is enabled.");
 		enableOldGTcircuits = config.getBoolean("enableOldGTcircuits", "gregtech", false,
 				"Restores circuits and their recipes from Pre-5.09.28 times.");
 	
@@ -76,7 +76,9 @@ public class ConfigHandler {
 	
 		// Single machines
 		enableMachine_SolarGenerators = config.getBoolean("enableSolarGenerators", "gregtech",
-				false, "These may be overpowered, Consult a local electrician.");
+				false, "These may be overpowered, Consult a local electrician.");		
+		enableMachine_ComponentAssemblers = config.getBoolean("enableComponentAssemblers", "gregtech",
+				true, "These construct machine components.");		
 		enableMachine_Safes = config.getBoolean("enableMachineSafes", "gregtech", true,
 				"These protect your goodies/rare stuff.");
 		enableMachine_Dehydrators = config.getBoolean("enableMachineDehydrators", "gregtech", true,
@@ -144,6 +146,9 @@ public class ConfigHandler {
 				"gregtech", true, "Very fast and efficient Cutting Machine.");
 		enableMultiblock_IndustrialFishingPort = config.getBoolean("enableMultiblock_IndustrialFishingPort",
 				"gregtech", true, "Fish the seas, except on land.");
+		
+		enableMultiblock_IndustrialExtrudingMachine = config.getBoolean("enableMultiblock_IndustrialExtrudingMachine",
+				"gregtech", true, "Very fast and efficient Extruding Machine.");
 	
 		// Options
 		rfPerEU = config.getInt("rfUsedPerEUForUniversalBatteries", "configurables", 4, 1, 1000,
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index c93353459e..5f85b1193a 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -50,7 +50,6 @@ import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion;
 import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion;
 import gtPlusPlus.core.item.init.ItemsFoods;
 import gtPlusPlus.core.item.init.ItemsMultiTools;
-import gtPlusPlus.core.item.tool.misc.ConnectedBlockFinder;
 import gtPlusPlus.core.item.tool.misc.SandstoneHammer;
 import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
 import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
@@ -277,6 +276,10 @@ public final class ModItems {
 	public static Item itemFiber;
 
 	public static Item itemDragonJar;
+	
+	static {
+		Logger.INFO("Items!");
+	}
 
 	public static final void init(){
 
@@ -702,9 +705,9 @@ public final class ModItems {
 		CoalTar.run();
 
 		//Only used for debugging.
-		if (CORE.DEVENV) {
+		/*if (CORE.DEVENV) {
 			new ConnectedBlockFinder();
-		}
+		}*/
 
 		//Misc Items
 		@SuppressWarnings("unused")
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index dd4b55f048..b40ea8b8f4 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -186,6 +186,7 @@ public class CORE {
 		public static boolean enableMachine_Tesseracts = true;
 		public static boolean enableMachine_SimpleWasher = true;
 		public static boolean enableMachine_Pollution = true;
+		public static boolean enableMachine_ComponentAssemblers = false;
 		public static boolean enableCustom_Pipes = true;
 		public static boolean enableCustom_Cables = true;
 
@@ -211,6 +212,7 @@ public class CORE {
 		public static boolean enableMultiblock_ThermalBoiler = true;
 		public static boolean enableMultiblock_IndustrialCuttingMachine = true;
 		public static boolean enableMultiblock_IndustrialFishingPort = true;
+		public static boolean enableMultiblock_IndustrialExtrudingMachine = true;
 
 		//Visuals
 		public static boolean enableTreeFarmerParticles = true;
@@ -220,6 +222,7 @@ public class CORE {
 
 
 
+
 	}
 
 	public static class Everglades{
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index c380303e58..0a6e6afef8 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -144,6 +144,7 @@ public class RECIPES_Machines {
 	public static ItemStack EV_MACHINE_Macerator;
 	public static ItemStack EV_MACHINE_Cutter;
 	public static ItemStack EV_MACHINE_MassFabricator;
+	public static ItemStack EV_MACHINE_Extruder;
 
 
 	//Cables
@@ -216,6 +217,7 @@ public class RECIPES_Machines {
 			EV_MACHINE_MassFabricator= ItemList.Machine_EV_Massfab.get(1);
 			EV_MACHINE_Centrifuge= ItemList.Machine_EV_Centrifuge.get(1);
 			EV_MACHINE_Cutter = ItemList.Machine_EV_Cutter.get(1);
+			EV_MACHINE_Extruder = ItemList.Machine_EV_Extruder.get(1);
 
 
 		}
@@ -1101,6 +1103,22 @@ public class RECIPES_Machines {
 						GregtechItemList.Industrial_CuttingFactoryController.get(1));
 			}
 			
+			//EV_MACHINE_Extruder
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine){
+				ItemStack plate = ALLOY.INCONEL_690.getPlate(1);
+				RecipeUtils.recipeBuilder(
+						plate, CI.craftingToolHammer_Hard, plate,
+						"plateTalonite", "frameGtStaballoy", "plateTalonite",
+						plate, CI.craftingToolWrench, plate,
+						GregtechItemList.Casing_Extruder.get(Casing_Amount));
+
+				RecipeUtils.recipeBuilder( 
+						plate,CI.getTieredCircuit(4),plate,
+						CI.electricPiston_EV, EV_MACHINE_Extruder, CI.electricPiston_EV,
+						plate,CI.getTieredCircuit(4),plate,
+						GregtechItemList.Industrial_Extruder.get(1));
+			}
+			
 			if (CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort){
 				ItemStack plate = ALLOY.INCONEL_792.getPlate(1);
 				RecipeUtils.recipeBuilder(
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 5642b4f3e9..62cb3f147e 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1,7 +1,9 @@
 package gtPlusPlus.core.util.minecraft;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
@@ -254,31 +256,44 @@ public class ItemUtils {
 	}
 
 	public static ItemStack getItemStackOfAmountFromOreDict(final String oredictName, final int amount){
-
 		String mTemp = oredictName;
-
 		//Banned Materials and replacements for GT5.8 compat.		
 		if (oredictName.toLowerCase().contains("rutile")){
 			mTemp = oredictName.replace("Rutile", "Titanium");
 		}
 		if (oredictName.toLowerCase().contains("vanadiumsteel")){
 			mTemp = oredictName.replace("VanadiumSteel", "StainlessSteel");
-		}
+		}	
 		
-		ItemStack mTempItem = getItemStackOfAmountFromOreDictNoBroken(mTemp, amount);
-		if (mTempItem != null) {
-			return mTempItem;
+		//Use Cache
+		if (mDustCache.containsKey(oredictName)) {
+			return getSimpleStack(mDustCache.get(oredictName), amount);
+		}		
+		if (mOreDictCache.containsKey(mTemp)) {
+			return getCachedValue(mTemp, amount);
 		}
 
 		final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(mTemp);
 		if (!oreDictList.isEmpty()){
 			final ItemStack returnValue = oreDictList.get(0).copy();
 			returnValue.stackSize = amount;
+			setCachedValue(mTemp, returnValue);
 			return returnValue;
 		}
+		setCachedValue(oredictName, getSimpleStack(ModItems.AAA_Broken));
 		return getSimpleStack(ModItems.AAA_Broken, amount);
 	}
 
+	private static Map<String, ItemStack> mOreDictCache = new HashMap();
+
+	private static ItemStack getCachedValue(String string, int amount) {
+		return getSimpleStack(mOreDictCache.get(string), amount);
+	}
+
+	private static void setCachedValue(String string, ItemStack stack) {
+		mOreDictCache.put(string, stack);
+	}
+
 	public static ItemStack getItemStackOfAmountFromOreDictNoBroken(final String oredictName, final int amount){
 		if (CORE.DEBUG){
 			Logger.WARNING("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(1));
@@ -286,7 +301,17 @@ public class ItemUtils {
 			Logger.WARNING("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(3));
 			Logger.WARNING("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(4));
 			Logger.WARNING("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(5));
+		}	
+		
+		//Use Cache
+		if (mDustCache.containsKey(oredictName)) {
+			return getSimpleStack(mDustCache.get(oredictName), amount);
+		}	
+		if (mOreDictCache.containsKey(oredictName)) {
+			return getCachedValue(oredictName, amount);
 		}
+		
+
 		try{
 
 			//Adds a check to grab dusts using GT methodology if possible.
@@ -296,28 +321,26 @@ public class ItemUtils {
 				final Materials m = Materials.get(MaterialName);
 				returnValue = getGregtechDust(m, amount);
 				if (returnValue != null){
+					setCachedValue(oredictName, returnValue);
 					return returnValue;
 				}
-				else {
-					returnValue = getGregtechDust(oredictName, amount);
-					if (returnValue != null) {
-						return returnValue;						
-					}
-				}
 			}
 
 			if (returnValue == null){
 				returnValue = getItemStackOfAmountFromOreDict(oredictName, amount);
 				if (returnValue != null){
-					if ((returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass()) || (returnValue.getItem() != ModItems.AAA_Broken)){						
+					if ((returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass()) || (returnValue.getItem() != ModItems.AAA_Broken)){
+						setCachedValue(oredictName, returnValue);
 						return returnValue.copy();
 					}
 				}
 			}
 			Logger.WARNING(oredictName+" was not valid.");
+			setCachedValue(oredictName, null);
 			return null;
 		}
 		catch (final Throwable t){
+			setCachedValue(oredictName, null);
 			return null;
 		}
 	}
@@ -625,29 +648,50 @@ public class ItemUtils {
 		return outputs;
 	}
 
-	private static String getModId(final Item item) {
+	private static Map<Item, String> mModidCache = new HashMap<Item, String>();
+
+	private static String getModId(final Item item) {		
+		if (mModidCache.containsKey(item)) {
+			return mModidCache.get(item);
+		}
+		String value = "";
 		try {
 			final GameRegistry.UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor(item);
-			final String modname = (id.modId == null ? id.name : id.modId);
-			return (id == null) || id.modId.equals("") ? "minecraft" : modname;
+			if (id != null) {
+				final String modname = (id.modId == null ? id.name : id.modId);
+				value = ((id == null) || id.modId.equals("")) ? "minecraft" : modname;
+			}
 		} catch (final Throwable t){
 			try {
 				final UniqueIdentifier t2 = GameRegistry.findUniqueIdentifierFor(Block.getBlockFromItem(item));
-				final String modname = (t2.modId == null ? t2.name : t2.modId);
-				return (t2 == null) || t2.modId.equals("") ? "minecraft" : modname;
+				if (t2 != null) {
+					final String modname = (t2.modId == null ? t2.name : t2.modId);
+					value = ((t2 == null) || t2.modId.equals("")) ? "minecraft" : modname;
+				}
 			}
 			catch (final Throwable t3){
-				return "bad modid";
+				value = "bad modid";
 			}
 		}
+		if (!mModidCache.containsKey(item)) {
+			return mModidCache.put(item, value);
+		}
+		return value;
 	}
 
 	public static String getModId(final ItemStack key) {
 		return getModId(key.getItem());
 	}
 
+	private static Map<String, ItemStack> mDustCache = new HashMap<String, ItemStack>();
+	
 	//Take 2 - GT/GT++ Dusts
 	public static ItemStack getGregtechDust(final String oredictName, final int amount){
+		
+		if (mDustCache.containsKey(oredictName)) {
+			return getSimpleStack(mDustCache.get(oredictName), amount);
+		}
+		
 		final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
 		if (!oreDictList.isEmpty()){
 			ItemStack returnvalue;
@@ -655,6 +699,7 @@ public class ItemUtils {
 				final String modid = getModId(oreDictList.get(xrc).getItem());
 				if (modid.equals("gregtech") || modid.equals(CORE.MODID)){
 					returnvalue = oreDictList.get(xrc).copy();
+					mDustCache.put(oredictName, returnvalue);
 					returnvalue.stackSize = amount;
 					return returnvalue;
 				}
@@ -665,6 +710,11 @@ public class ItemUtils {
 
 	//Anything But Tinkers Dust
 	public static ItemStack getNonTinkersDust(final String oredictName, final int amount){
+		
+		if (mDustCache.containsKey(oredictName)) {
+			return getSimpleStack(mDustCache.get(oredictName), amount);
+		}
+		
 		final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
 		if (!oreDictList.isEmpty()){
 			ItemStack returnvalue;
@@ -672,6 +722,7 @@ public class ItemUtils {
 				final String modid = getModId(oreDictList.get(xrc).getItem());
 				if (!modid.equals("tconstruct")){
 					returnvalue = oreDictList.get(xrc).copy();
+					mDustCache.put(oredictName, returnvalue);
 					returnvalue.stackSize = amount;
 					return returnvalue;
 				}
@@ -694,7 +745,7 @@ public class ItemUtils {
 		//Utils.LOG_INFO("[Component Maker] Found "+mItemName+".");
 		return (gregstack);
 	}
-	
+
 
 	public static ItemStack getOrePrefixStack(OrePrefixes mPrefix, Material mMat, int mAmount) {
 
diff --git a/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java b/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
index ae3e6242ed..3f465aa30f 100644
--- a/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
+++ b/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
@@ -6,10 +6,12 @@ import java.net.*;
 import org.apache.http.client.utils.URIBuilder;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
 
 public class GeoUtils {
 
 	public static String determineUsersCountry(){
+		if (!CORE.DEBUG && !CORE.DEVENV) {
 		try {
 		if (NetworkUtils.checkNetworkIsAvailableWithValidInterface()){
 			return getUsersCountry();			
@@ -21,6 +23,10 @@ public class GeoUtils {
 			Logger.INFO("Failed to initialise GeoUtils.");
 			return "Failed.";
 		}
+		}
+		else {
+			return "Debug/Dev";
+		}
 	}
 
 	private static String getUsersIPAddress() {
diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
index e03e955336..f146b39eb7 100644
--- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
+++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
@@ -11,6 +11,11 @@ import net.minecraft.item.ItemStack;
 public class Preloader_GT_OreDict {
 
 	public static boolean shouldPreventRegistration(final String string, final ItemStack bannedItem) {
+		
+		if (bannedItem == null || (!CORE_Preloader.enableOldGTcircuits && !LoadedMods.Mekanism)) {
+			return false;
+		}
+		
 		try {
 			if (CORE_Preloader.enableOldGTcircuits){
 				if ((bannedItem != null) && ItemUtils.getModId(bannedItem).toLowerCase().equals("gregtech")){
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index 9163b54709..3f65e5d102 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -4,7 +4,10 @@ import org.apache.logging.log4j.Level;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor;
 import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer2.GT_MetaTile_Visitor;
 import net.minecraft.launchwrapper.IClassTransformer;
@@ -14,12 +17,16 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 	private final boolean mEnabled = false;
 
 	public byte[] transform(String name, String transformedName, byte[] basicClass) {
-		if(transformedName.equals("net.minecraftforge.oredict.OreDictionary")) {
-			FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Transforming %s", transformedName);
-			ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-			new ClassReader(basicClass).accept(new OreDictionaryVisitor(classWriter), 0);
-			return classWriter.toByteArray();
+		
+		if (CORE_Preloader.enableOldGTcircuits || Loader.isModLoaded("Mekanism")){
+			if(transformedName.equals("net.minecraftforge.oredict.OreDictionary")) {
+				FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Transforming %s", transformedName);
+				ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+				new ClassReader(basicClass).accept(new OreDictionaryVisitor(classWriter), 0);
+				return classWriter.toByteArray();
+			}
 		}
+		
 		if (mEnabled) {
 			if(transformedName.equals("gregtech.api.metatileentity.BaseMetaTileEntity")) {
 				FMLRelaunchLog.log("[GT++ ASM] NBTFixer", Level.INFO, "Transforming %s", transformedName);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 090d841e8b..d0b6be3a47 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -244,10 +244,12 @@ GT_MetaTileEntity_MultiBlockBase {
 		this.mLastRecipe = tRecipe;
 
 		if (tRecipe == null) {
+			Logger.WARNING("BAD RETURN - 1");
 			return false;
 		}
 
 		if (!this.canBufferOutputs(tRecipe, aMaxParallelRecipes)) {
+			Logger.WARNING("BAD RETURN - 2");
 			return false;
 		}
 
@@ -257,15 +259,23 @@ GT_MetaTileEntity_MultiBlockBase {
 
 		int parallelRecipes = 0;
 
+		Logger.WARNING("parallelRecipes: "+parallelRecipes);
+		Logger.WARNING("aMaxParallelRecipes: "+aMaxParallelRecipes);
+		Logger.WARNING("tTotalEUt: "+tTotalEUt);
+		Logger.WARNING("tVoltage: "+tVoltage);
+		Logger.WARNING("tRecipeEUt: "+tRecipeEUt);
 		// Count recipes to do in parallel, consuming input items and fluids and considering input voltage limits
 		for (; parallelRecipes < aMaxParallelRecipes && tTotalEUt < (tVoltage - tRecipeEUt); parallelRecipes++) {
 			if (!tRecipe.isRecipeInputEqual(true, aFluidInputs, aItemInputs)) {
+				Logger.WARNING("Broke at "+parallelRecipes+".");
 				break;
 			}
+			Logger.WARNING("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+".");
 			tTotalEUt += tRecipeEUt;
 		}
 
 		if (parallelRecipes == 0) {
+			Logger.WARNING("BAD RETURN - 3");
 			return false;
 		}
 
@@ -362,6 +372,7 @@ GT_MetaTileEntity_MultiBlockBase {
 		// Play sounds (GT++ addition - GT multiblocks play no sounds)
 		startProcess();
 
+		Logger.WARNING("GOOD RETURN - 1");
 		return true;
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java
index c8b6b3a716..9f8b89f0d0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java
@@ -45,10 +45,10 @@ extends GregtechMeta_MultiBlockBase {
 	@Override
 	public String[] getDescription() {
 		return new String[]{"Controller Block for the Material Extruder",
-				"500% faster than using single block machines of the same voltage",
+				"250% faster than using single block machines of the same voltage",
 				"Processes four items per voltage tier",
 				"Extrusion Shape for recipe goes in the Input Bus",
-				"Each Input Bus can have a different Circuit!",
+				"Each Input Bus can have a different shape!",
 				"You can use several input busses per multiblock",
 				"Size: 3x3x5 [WxHxL] (Hollow)", "Controller (front centered)",
 				"Controller (front centered)",
@@ -104,11 +104,21 @@ extends GregtechMeta_MultiBlockBase {
 					if (tBus.getBaseMetaTileEntity().getStackInSlot(i) != null)
 						tBusItems.add(tBus.getBaseMetaTileEntity().getStackInSlot(i));
 				}
-			}
-
-			if (checkRecipeGeneric(tBusItems.toArray(new ItemStack[]{}), new FluidStack[]{}, (4*Utils.calculateVoltageTier(this.getMaxInputVoltage())), 100, 500, 10000)) {
-				return true;
-			}
+			}			
+			ItemStack[] inputs = new ItemStack[tBusItems.size()];
+			int slot = 0;
+			for (ItemStack g : tBusItems) {
+				inputs[slot++] = g;
+			}			
+			if (inputs.length > 0) {				
+				int para = (4*Utils.calculateVoltageTier(this.getMaxInputVoltage()));
+				Logger.WARNING("Recipe. ["+inputs.length+"]["+para+"]");				
+				if (checkRecipeGeneric(inputs, new FluidStack[]{}, para, 100, 250, 10000)) {
+					Logger.WARNING("Recipe 2.");
+					return true;
+				}
+			}			
+			
 		}
 		return false;
 	}
@@ -133,7 +143,7 @@ extends GregtechMeta_MultiBlockBase {
 				}
 			}
 			if (tAirCount != 10) {
-				Logger.INFO("False 1");
+				Logger.WARNING("False 1");
 				return false;
 			}
 			for (byte i = 2; i < 6; i = (byte) (i + 1)) {
@@ -156,14 +166,14 @@ extends GregtechMeta_MultiBlockBase {
 								if ((this.getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == this.getCasingBlock()) && (this.getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == this.getCasingMeta())) {
 								}
 								else if (!this.addToMachineList(this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)), getCasingTextureIndex()) && (!this.addEnergyInputToMachineList(this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)), getCasingTextureIndex()))) {
-									Logger.INFO("False 2");
+									Logger.WARNING("False 2");
 									return false;
 								}
 							}
 							else if ((this.getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == this.getCasingBlock()) && (this.getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == this.getCasingMeta())) {
 							}
 							else {
-								Logger.INFO("False 3");
+								Logger.WARNING("False 3");
 								return false;
 							}
 						}
@@ -171,7 +181,7 @@ extends GregtechMeta_MultiBlockBase {
 				}
 			}
 			if ((this.mInputBusses.size() == 0) || (this.mOutputBusses.size() == 0)) {
-				Logger.INFO("Incorrect amount of Input & Output busses.");
+				Logger.WARNING("Incorrect amount of Input & Output busses.");
 				return false;
 			}
 			this.mMaintenanceHatches.clear();
@@ -181,19 +191,19 @@ extends GregtechMeta_MultiBlockBase {
 					this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity());
 					((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = this.getCasingTextureIndex();
 				} else {
-					Logger.INFO("Maintenance hatch must be in the middle block on the back.");
+					Logger.WARNING("Maintenance hatch must be in the middle block on the back.");
 					return false;
 				}
 			}
 			if ((this.mMaintenanceHatches.size() != 1)) {
-				Logger.INFO("Incorrect amount of Maintenance hatches.");
+				Logger.WARNING("Incorrect amount of Maintenance hatches.");
 				return false;
 			}
 		} else {
-			Logger.INFO("False 5");
+			Logger.WARNING("False 5");
 			return false;
 		}
-		Logger.INFO("True");
+		Logger.WARNING("True");
 		return true;
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
index f6a604f94f..1226b695da 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_ComponentAssemblers;
+
 import java.util.ArrayList;
 
 import gregtech.api.enums.GT_Values;
@@ -21,6 +23,10 @@ public class GregtechComponentAssembler {
 
 	public static void run() {
 		
+		if (!enableMachine_ComponentAssemblers) {
+			return;
+		}
+		
 		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 			Logger.INFO("Component Assemblers cannot be created in 5.08.33 during the pre-release. Please wait for 1.7.0 release.");
 			return;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java
index 400be32978..685b096a51 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java
@@ -11,7 +11,7 @@ public class GregtechIndustrialExtruder {
 	public static void run() {
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Logger.INFO("Gregtech5u Content | Registering Industrial Extrusion Multiblock.");
-			if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) {
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) {
 				run1();
 			}
 		}