+ Added Trinium Titanium Cable/wires.

+ Redid material components to better use GT texture assets.
% Gave all 32 ore types new TextureSets.
% Doubled capacity of all fluid pipes.
% Moved Item/Block creation from init() to preInit().
$ Fixed Sludge fluid texture.
$ Moved Darkworld from being a child mod into it's own mod, Renamed to Toxic Everglades.
$ Bundled SegmentHelper.java, for future development ease.

13 files changed, 335 insertions, 256 deletions

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 532da59515..191f81cef5 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -73,6 +73,12 @@ public class CommonProxy {
 		registerTileEntities();
 		Logger.INFO("[Proxy] Calling Render registrator.");
 		registerRenderThings();
+		
+		//Moved from Init after Debug Loading.
+		//29/01/18 - Alkalus
+		ModItems.init();
+		ModBlocks.init();
+		CI.Init();
 
 
 	}
@@ -82,9 +88,6 @@ public class CommonProxy {
 		if (CORE.DEBUG){
 			DEBUG_INIT.registerHandlers();
 		}
-		ModItems.init();
-		ModBlocks.init();
-		CI.Init();
 
 		/**
 		 * Register the Event Handlers.
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 97cf3310ea..98043d9775 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -274,7 +274,7 @@ public final class ModItems {
 
 	public static Item itemRope;
 	public static Item itemFiber;
-	
+
 	public static Item itemDragonJar;
 
 	public static final void init(){
@@ -346,27 +346,27 @@ public final class ModItems {
 
 
 		try{
-			
+
 			/**
 			 * Try generate dusts for missing rare earth materials if they don't exist
 			 */
 
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1) == null){
-		    	ItemUtils.generateSpecialUseDusts("Gadolinium", "Gadolinium", Materials.Gadolinium.mElement.name(), Utils.rgbtoHexValue(226, 172, 9));
+				ItemUtils.generateSpecialUseDusts("Gadolinium", "Gadolinium", Materials.Gadolinium.mElement.name(), Utils.rgbtoHexValue(226, 172, 9));
 			}
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustYtterbium", 1) == null){
-		    	ItemUtils.generateSpecialUseDusts("Ytterbium", "Ytterbium", Materials.Ytterbium.mElement.name(), Utils.rgbtoHexValue(Materials.Yttrium.mRGBa[0]-60, Materials.Yttrium.mRGBa[1]-60, Materials.Yttrium.mRGBa[2]-60));
+				ItemUtils.generateSpecialUseDusts("Ytterbium", "Ytterbium", Materials.Ytterbium.mElement.name(), Utils.rgbtoHexValue(Materials.Yttrium.mRGBa[0]-60, Materials.Yttrium.mRGBa[1]-60, Materials.Yttrium.mRGBa[2]-60));
 			}
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSamarium", 1) == null){
-		    	ItemUtils.generateSpecialUseDusts("Samarium", "Samarium", Materials.Samarium.mElement.name(), Utils.rgbtoHexValue(161, 168, 114));
+				ItemUtils.generateSpecialUseDusts("Samarium", "Samarium", Materials.Samarium.mElement.name(), Utils.rgbtoHexValue(161, 168, 114));
 			}
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLanthanum", 1) == null){
-		    	ItemUtils.generateSpecialUseDusts("Lanthanum", "Lanthanum", Materials.Lanthanum.mElement.name(), Utils.rgbtoHexValue(106, 127, 163));
+				ItemUtils.generateSpecialUseDusts("Lanthanum", "Lanthanum", Materials.Lanthanum.mElement.name(), Utils.rgbtoHexValue(106, 127, 163));
 			}
 			/*if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1) == null){
 		    	ItemUtils.generateSpecialUseDusts("Gadolinium", "Gadolinium", "", Utils.rgbtoHexValue(Materials.Gadolinium.mRGBa[0], Materials.Gadolinium.mRGBa[1], Materials.Gadolinium.mRGBa[2]));
 			}*/
-			
+
 
 			//Elements generate first so they can be used in compounds.
 			//Missing Elements
@@ -513,16 +513,18 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.HG1223, false, false);
 
 			//Generate Fictional Materials
-			MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false);
-			MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false);
+			if (!CORE.GTNH) {
+				MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false);
+				MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false);
+			}
 			MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM);
 			MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false);
 			MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON);			
 
 			//Must be the final Alloy to Generate
 			MaterialGenerator.generate(ALLOY.QUANTUM);
-			
-			
+
+
 			//Ores
 			MaterialGenerator.generateOreMaterial(FLUORIDES.FLUORITE);
 			GTplusplus_Secondary.GenerateOreMaterials();
@@ -692,7 +694,7 @@ public final class ModItems {
 		itemLavaFilter = new ItemLavaFilter();
 
 		itemGrindleTablet = new BaseItemGrindle();
-		
+
 		itemDragonJar = new ItemEntityCatcher();
 
 		//Chemistry
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 235d50ae36..4e22fb959b 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -3,6 +3,9 @@ package gtPlusPlus.core.item.base;
 import java.util.List;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.TextureSet;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
@@ -10,13 +13,16 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.entity.EntityUtils;
+import gtPlusPlus.core.util.input.KeyboardUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 public class BaseItemComponent extends Item{
@@ -28,6 +34,9 @@ public class BaseItemComponent extends Item{
 	public final int componentColour;
 	public Object extraData;
 
+	protected IIcon base;
+	protected IIcon overlay;
+
 	public BaseItemComponent(final Material material, final ComponentTypes componentType) {
 		this.componentMaterial = material;
 		this.unlocalName = "item"+componentType.COMPONENT_NAME+material.getUnlocalizedName();
@@ -36,7 +45,7 @@ public class BaseItemComponent extends Item{
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(this.unlocalName);
 		this.setMaxStackSize(64);
-		this.setTextureName(this.getCorrectTextures());
+		//this.setTextureName(this.getCorrectTextures());
 		this.componentColour = material.getRgbAsHex();
 		GameRegistry.registerItem(this, this.unlocalName);
 		GT_OreDictUnificator.registerOre(componentType.getOreDictName()+material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
@@ -62,46 +71,19 @@ public class BaseItemComponent extends Item{
 		if (!CORE.ConfigSwitches.useGregtechTextures){
 			return CORE.MODID + ":" + "item"+this.componentType.COMPONENT_NAME;
 		}
-		if (this.componentType == ComponentTypes.GEAR){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGt";
-		}
-		else if (this.componentType == ComponentTypes.SMALLGEAR){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGtSmall";
-		}
-		else if (this.componentType == ComponentTypes.ROD){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "stick";
-		}
-		else if (this.componentType == ComponentTypes.RODLONG){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "stickLong";
-		}
-		else if (this.componentType == ComponentTypes.PLATEDOUBLE){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "plateDouble";
-		}
-		else if (this.componentType == ComponentTypes.CELL){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "cell";
-		}
-		else if (this.componentType == ComponentTypes.PLASMACELL){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "cellPlasma";
-		}
-		else if (this.componentType == ComponentTypes.BOLT){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "bolt";
-		}
-		else if (this.componentType == ComponentTypes.RING){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "ring";
-		}
-		else if (this.componentType == ComponentTypes.ROTOR){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "rotor";
-		}
-		else if (this.componentType == ComponentTypes.SCREW){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "screw";
-		}
-		else if (this.componentType == ComponentTypes.INGOT){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "ingot";
-		}
-		else if (this.componentType == ComponentTypes.HOTINGOT){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot";
-		}
-		return "gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME.toLowerCase();
+		String metType = "9j4852jyo3rjmh3owlhw9oe"; 
+		if (this.componentMaterial != null) {
+			TextureSet u = this.componentMaterial.getTextureSet();
+			if (u != null) {
+				metType = u.mSetName;				
+			}
+		}		
+		metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType);		
+		return "gregtech" + ":" + "materialicons/"+metType+"/" + this.componentType.getOreDictName();
+
+
+
+		//return "gregtech" + ":" + "materialicons/"+metType+"/" + this.componentType.COMPONENT_NAME.toLowerCase();
 	}
 
 	@Override
@@ -128,42 +110,6 @@ public class BaseItemComponent extends Item{
 		if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && (this.componentMaterial != null)){
 
 
-			if (this.componentType == ComponentTypes.DUST){
-				//list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust.");
-			}
-			if (this.componentType == ComponentTypes.INGOT){
-				//list.add(EnumChatFormatting.GRAY+"A solid ingot of " + materialName + ".");
-				if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && this.unlocalName.toLowerCase().contains("ingothot")){
-					list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling..");
-				}
-			}
-			if (this.componentType == ComponentTypes.PLATE){
-				//list.add(EnumChatFormatting.GRAY+"A flat plate of " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.PLATEDOUBLE){
-				//list.add(EnumChatFormatting.GRAY+"A double plate of " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.ROD){
-				//list.add(EnumChatFormatting.GRAY+"A 40cm Rod of " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.RODLONG){
-				//list.add(EnumChatFormatting.GRAY+"A 80cm Rod of " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.ROTOR){
-				//list.add(EnumChatFormatting.GRAY+"A Rotor made out of " + materialName + ". ");
-			}
-			if (this.componentType == ComponentTypes.BOLT){
-				//list.add(EnumChatFormatting.GRAY+"A small Bolt, constructed from " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.SCREW){
-				//list.add(EnumChatFormatting.GRAY+"A 8mm Screw, fabricated out of some " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.GEAR){
-				//list.add(EnumChatFormatting.GRAY+"A large Gear, constructed from " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.RING){
-				//list.add(EnumChatFormatting.GRAY+"A " + materialName + " Ring.");
-			}
 			if (this.componentMaterial != null){
 				if (!this.componentMaterial.vChemicalFormula.equals("??") && !this.componentMaterial.vChemicalFormula.equals("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
 					list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula));
@@ -172,19 +118,33 @@ public class BaseItemComponent extends Item{
 				if (this.componentMaterial.isRadioactive){
 					list.add(CORE.GT_Tooltip_Radioactive);
 				}
+
+				if (this.componentType == ComponentTypes.INGOT){
+					if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && this.unlocalName.toLowerCase().contains("ingothot")){
+						list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling..");
+					}
+				}
+			}
+
+			//Hidden Tooltip
+			if (KeyboardUtils.isCtrlKeyDown()) {
+				if (this.componentMaterial != null) {
+					String type = this.componentMaterial.getTextureSet().mSetName;
+					String output = type.substring(0, 1).toUpperCase() + type.substring(1);
+					list.add(EnumChatFormatting.GRAY+"Material Type: "+output+".");
+					list.add(EnumChatFormatting.GRAY+"Material State: "+this.componentMaterial.getState().name()+".");
+					list.add(EnumChatFormatting.GRAY+"Radioactivity Level: "+this.componentMaterial.vRadiationLevel+".");
+				}
 			}
+			else {
+				list.add(EnumChatFormatting.DARK_GRAY+"Hold Ctrl to show additional info.");				
+			}			
 
 		}
 
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
-
-	@Override
-	public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) {
-		return this.componentColour;
-	}
-
 	@Override
 	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) {
 		if (this.componentMaterial != null){
@@ -197,8 +157,52 @@ public class BaseItemComponent extends Item{
 	}
 
 
+	/**
+	 * 
+	 * Handle Custom Rendering
+	 *
+	 */
 
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean requiresMultipleRenderPasses(){
+		return (CORE.ConfigSwitches.useGregtechTextures ? true : false);
+	}
 
+	@Override
+	public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
+		if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures){
+			return Utils.rgbtoHexValue(255, 255, 255);
+		}
+		if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures){
+			return Utils.rgbtoHexValue(255, 255, 255);
+		}
+		return this.componentColour;
+	}
+
+	@Override
+	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
+		if (CORE.ConfigSwitches.useGregtechTextures) {
+			if(pass == 0) {
+				return this.base;
+			}
+			return this.overlay;			
+		}
+		return this.base;
+	}
+
+	@Override
+	public void registerIcons(final IIconRegister i) {
+
+		if (CORE.ConfigSwitches.useGregtechTextures){
+			this.base = i.registerIcon(getCorrectTextures());
+			this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY");
+		}
+		else {
+			this.base = i.registerIcon(getCorrectTextures());
+			//this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY");
+		}
+	}
 
 
 
@@ -211,7 +215,7 @@ public class BaseItemComponent extends Item{
 		PLATEDOUBLE("PlateDouble", " Double Plate", "plateDouble"),
 		ROD("Rod", " Rod", "stick"),
 		RODLONG("RodLong", " Long Rod", "stickLong"),
-		GEAR("Gear", " Gear", "gear"),
+		GEAR("Gear", " Gear", "gearGt"),
 		SMALLGEAR("SmallGear", " Gear", "gearGtSmall"), //TODO
 		SCREW("Screw", " Screw", "screw"),
 		BOLT("Bolt", " Bolt", "bolt"),
diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
index 8baf909af7..3b0fa7b621 100644
--- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
@@ -155,7 +155,7 @@ public class CoreItem extends Item
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		list.add(this.descColour+this.itemDescription);
+		//list.add(this.descColour+this.itemDescription);
 		//super.addInformation(stack, aPlayer, list, bool);
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
index f2228afb78..275e7bbb3a 100644
--- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
+++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
@@ -17,8 +17,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 
 public class BaseItemCell extends BaseItemComponent{
 
-	private IIcon base;
-	private IIcon overlay;
 	ComponentTypes Cell = ComponentTypes.CELL;
 
 	public BaseItemCell(final Material material) {
@@ -40,12 +38,6 @@ public class BaseItemCell extends BaseItemComponent{
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
-	public boolean requiresMultipleRenderPasses(){
-		return true;
-	}
-
-	@Override
 	public void registerIcons(final IIconRegister i) {
 
 		if (CORE.ConfigSwitches.useGregtechTextures){
@@ -73,13 +65,4 @@ public class BaseItemCell extends BaseItemComponent{
 		return this.componentColour;
 	}
 
-
-	@Override
-	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
-		if(pass == 0) {
-			return this.base;
-		}
-		return this.overlay;
-	}
-
 }
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index a681baaa98..d81e6fd280 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -76,146 +76,152 @@ public class CORE {
 	public static boolean BRC = false;
 
 
-	
+
 	/**
 	 * Lists/Maps
 	 */
 
-	 //Burnables List
-	 public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>();
+	//Burnables List
+	public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>();
+
+
+	//TesseractMapss
+	public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>();
+	public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>();
 
+	//BookMap
+	public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>();
 
-	 //TesseractMapss
-	 public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>();
-	 public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>();
 
-	 //BookMap
-	 public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>();
 
 
-	 
-	 
 	/**
 	 * Some Gregtech Material and Recipe Variables
 	 */
-	 
-	 @Deprecated
-	 public static IGregtech_RecipeAdder sRecipeAdder;
-	 public static GregtechRecipe GT_Recipe = new GregtechRecipe();
-	 public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000];
-
-	 /**
-	  * File Paths and Resource Paths
-	  */
-
-	 public static final String
-	 TEX_DIR = "textures/",
-	 TEX_DIR_GUI = TEX_DIR + "gui/",
-	 TEX_DIR_ITEM = TEX_DIR + "items/",
-	 TEX_DIR_BLOCK = TEX_DIR + "blocks/",
-	 TEX_DIR_ENTITY = TEX_DIR + "entity/",
-	 TEX_DIR_ASPECTS = TEX_DIR + "aspects/",
-	 TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/",
-	 RES_PATH = MODID + ":" + TEX_DIR,
-	 RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI,
-	 RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM,
-	 RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK,
-	 RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY,
-	 RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS,
-	 RES_PATH_FLUIDS = MODID + ":" + TEX_DIR_FLUIDS;
-
-
-
-
-
-
-
-
-
-
-
-	 /*
-	  * Config Switch Class
-	  */
-
-	 public static class ConfigSwitches {
-
-		 //Updates
-		 public static boolean enableUpdateChecker = true;
-
-		 //Debug
-		 public static boolean disableEnderIOIntegration = false;
-		 public static boolean MACHINE_INFO = true;
-		 public static boolean showHiddenNEIItems = false;
-
-		 //Tools
-		 public static boolean enableSkookumChoochers = true;
-		 public static boolean enableMultiSizeTools = true;
-
-		 //Block Drops
-		 public static int chanceToDropDrainedShard = 196;
-		 public static int chanceToDropFluoriteOre = 32;
-
-		 //Machine Related
-		 public static boolean enableAlternativeBatteryAlloy = false;
-		 public static boolean enableThaumcraftShardUnification = false;
-		 public static boolean disableIC2Recipes = false;
-		 public static boolean enableAlternativeDivisionSigilRecipe = false;
-		 public static int boilerSteamPerSecond = 750;
-
-		 //Feature Related
-		 public static boolean enableCustomCapes = false;
-		 public static boolean enableCustomCircuits = true;
-		 public static boolean enableOldGTcircuits = false;
-		 public static boolean disableZombieReinforcement = false;
-
-		 //GT Fixes
-		 public static boolean enableNitroFix = false;
-
-		 //Single Block Machines
-		 public static boolean enableMachine_SolarGenerators = false;
-		 public static boolean enableMachine_Safes = true;
-		 public static boolean enableMachine_Dehydrators = true;
-		 public static boolean enableMachine_SteamConverter = true;
-		 public static boolean enableMachine_FluidTanks = true;
-		 public static boolean enableMachine_RocketEngines = true;
-		 public static boolean enableMachine_GeothermalEngines = true;
-		 public static boolean enableMachine_WorldAccelerators = true;
-		 public static boolean enableMachine_Tesseracts = true;
-		 public static boolean enableMachine_SimpleWasher = true;
-		 public static boolean enableMachine_Pollution = true;
-		 public static boolean enableCustom_Pipes = true;
-		 public static boolean enableCustom_Cables = true;
-
-		 //Multiblocks
-		 public static boolean enableMultiblock_AlloyBlastSmelter = true;
-		 public static boolean enableMultiblock_IndustrialCentrifuge = true;
-		 public static boolean enableMultiblock_IndustrialCokeOven = true;
-		 public static boolean enableMultiblock_IndustrialElectrolyzer = true;
-		 public static boolean enableMultiblock_IndustrialMacerationStack = true;
-		 public static boolean enableMultiblock_IndustrialPlatePress = true;
-		 public static boolean enableMultiblock_IndustrialWireMill = true;
-		 public static boolean enableMultiblock_IronBlastFurnace = true;
-		 public static boolean enableMultiblock_MatterFabricator = true;
-		 public static boolean enableMultiblock_MultiTank = true;
-		 public static boolean enableMultiblock_PowerSubstation = true;
-		 public static boolean enableMultiblock_LiquidFluorideThoriumReactor = true;
-		 public static boolean enableMultiblock_NuclearFuelRefinery = true;
-		 public static boolean enableMultiblock_TreeFarmer = true;
-		 public static boolean enableMultiblock_IndustrialSifter = true;
-		 public static boolean enableMultiblock_IndustrialThermalCentrifuge = true;
-		 public static boolean enableMultiblock_IndustrialWashPlant = true;
-		 public static boolean enableMultiblock_LargeAutoCrafter = true;
-		 public static boolean enableMultiblock_ThermalBoiler = true;
-		 public static boolean enableMultiblock_IndustrialCuttingMachine = true;
-
-		 //Visuals
-		 public static boolean enableTreeFarmerParticles = true;
-		 public static boolean useGregtechTextures = true;
+
+	@Deprecated
+	public static IGregtech_RecipeAdder sRecipeAdder;
+	public static GregtechRecipe GT_Recipe = new GregtechRecipe();
+	public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000];
+
+	/**
+	 * File Paths and Resource Paths
+	 */
+
+	public static final String
+	TEX_DIR = "textures/",
+	TEX_DIR_GUI = TEX_DIR + "gui/",
+	TEX_DIR_ITEM = TEX_DIR + "items/",
+	TEX_DIR_BLOCK = TEX_DIR + "blocks/",
+	TEX_DIR_ENTITY = TEX_DIR + "entity/",
+	TEX_DIR_ASPECTS = TEX_DIR + "aspects/",
+	TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/",
+	RES_PATH = MODID + ":" + TEX_DIR,
+	RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI,
+	RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM,
+	RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK,
+	RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY,
+	RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS,
+	RES_PATH_FLUIDS = MODID + ":" + TEX_DIR_FLUIDS;
+
 
 
 
 
-	 }
+
+
+
+
+
+
+	/*
+	 * Config Switch Class
+	 */
+
+	public static class ConfigSwitches {
+
+		//Updates
+		public static boolean enableUpdateChecker = true;
+
+		//Debug
+		public static boolean disableEnderIOIntegration = false;
+		public static boolean MACHINE_INFO = true;
+		public static boolean showHiddenNEIItems = false;
+
+		//Tools
+		public static boolean enableSkookumChoochers = true;
+		public static boolean enableMultiSizeTools = true;
+
+		//Block Drops
+		public static int chanceToDropDrainedShard = 196;
+		public static int chanceToDropFluoriteOre = 32;
+
+		//Machine Related
+		public static boolean enableAlternativeBatteryAlloy = false;
+		public static boolean enableThaumcraftShardUnification = false;
+		public static boolean disableIC2Recipes = false;
+		public static boolean enableAlternativeDivisionSigilRecipe = false;
+		public static int boilerSteamPerSecond = 750;
+
+		//Feature Related
+		public static boolean enableCustomCapes = false;
+		public static boolean enableCustomCircuits = true;
+		public static boolean enableOldGTcircuits = false;
+		public static boolean disableZombieReinforcement = false;
+
+		//GT Fixes
+		public static boolean enableNitroFix = false;
+
+		//Single Block Machines
+		public static boolean enableMachine_SolarGenerators = false;
+		public static boolean enableMachine_Safes = true;
+		public static boolean enableMachine_Dehydrators = true;
+		public static boolean enableMachine_SteamConverter = true;
+		public static boolean enableMachine_FluidTanks = true;
+		public static boolean enableMachine_RocketEngines = true;
+		public static boolean enableMachine_GeothermalEngines = true;
+		public static boolean enableMachine_WorldAccelerators = true;
+		public static boolean enableMachine_Tesseracts = true;
+		public static boolean enableMachine_SimpleWasher = true;
+		public static boolean enableMachine_Pollution = true;
+		public static boolean enableCustom_Pipes = true;
+		public static boolean enableCustom_Cables = true;
+
+		//Multiblocks
+		public static boolean enableMultiblock_AlloyBlastSmelter = true;
+		public static boolean enableMultiblock_IndustrialCentrifuge = true;
+		public static boolean enableMultiblock_IndustrialCokeOven = true;
+		public static boolean enableMultiblock_IndustrialElectrolyzer = true;
+		public static boolean enableMultiblock_IndustrialMacerationStack = true;
+		public static boolean enableMultiblock_IndustrialPlatePress = true;
+		public static boolean enableMultiblock_IndustrialWireMill = true;
+		public static boolean enableMultiblock_IronBlastFurnace = true;
+		public static boolean enableMultiblock_MatterFabricator = true;
+		public static boolean enableMultiblock_MultiTank = true;
+		public static boolean enableMultiblock_PowerSubstation = true;
+		public static boolean enableMultiblock_LiquidFluorideThoriumReactor = true;
+		public static boolean enableMultiblock_NuclearFuelRefinery = true;
+		public static boolean enableMultiblock_TreeFarmer = true;
+		public static boolean enableMultiblock_IndustrialSifter = true;
+		public static boolean enableMultiblock_IndustrialThermalCentrifuge = true;
+		public static boolean enableMultiblock_IndustrialWashPlant = true;
+		public static boolean enableMultiblock_LargeAutoCrafter = true;
+		public static boolean enableMultiblock_ThermalBoiler = true;
+		public static boolean enableMultiblock_IndustrialCuttingMachine = true;
+
+		//Visuals
+		public static boolean enableTreeFarmerParticles = true;
+		public static boolean useGregtechTextures = true;
+
+
+
+
+	}
+
+	public static class Everglades{
+		public static final String MODID = "ToxicEverglades";
+		public static final String NAME = "GT++ Toxic Everglades";
+		public static final String VERSION = "0.1";
+	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index ee3759e2cb..eb20e831ac 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -542,7 +542,7 @@ public class Material {
 			}
 		}
 		catch (Throwable t){
-			t.printStackTrace();
+			//t.printStackTrace();
 		}
 		Logger.MATERIALS("Failed getting the Ore Block for "+this.getLocalizedName()+".");
 		return Blocks.stone;
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index 22e43a0aef..2f0eb72fcc 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.material;
 
+import gregtech.api.enums.TextureSet;
 import gtPlusPlus.core.material.state.MaterialState;
 
 public final class ORES {
@@ -7,6 +8,7 @@ public final class ORES {
 	public static final Material GEIKIELITE = new Material(
 			"Geikielite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_GEM_HORIZONTAL, //Texture Set
 			new short[]{187, 193, 204, 0}, //Material Colour
 			500,
 			1500,
@@ -22,6 +24,7 @@ public final class ORES {
 	public static final Material ZIMBABWEITE = new Material(
 			"Zimbabweite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_FINE, //Texture Set
 			new short[]{193, 187, 131, 0}, //Material Colour
 			500,
 			1500,
@@ -42,6 +45,7 @@ public final class ORES {
 	public static final Material TITANITE = new Material(
 			"Titanite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{184, 198, 105, 0}, //Material Colour
 			500,
 			1500,
@@ -59,6 +63,7 @@ public final class ORES {
 	public static final Material ZIRCONILITE = new Material(
 			"Zirconolite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_FINE, //Texture Set
 			new short[]{45, 26, 0, 0}, //Material Colour
 			500,
 			1500,
@@ -76,6 +81,7 @@ public final class ORES {
 	public static final Material CROCROITE = new Material(
 			"Crocoite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_GEM_VERTICAL, //Texture Set
 			new short[]{255, 143, 84, 0}, //Material Colour
 			500,
 			1500,
@@ -91,6 +97,7 @@ public final class ORES {
 	public static final Material NICHROMITE = new Material(
 			"Nichromite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{22, 19, 19, 0}, //Material Colour
 			500,
 			1500,
@@ -106,9 +113,10 @@ public final class ORES {
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
 			});	
 
-	public static final Material YTTRIAITE = new Material(
+	public static final Material YTTRIAITE = new Material( //TODO
 			"Yttriaite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{255, 143, 84, 0}, //Material Colour
 			500,
 			1500,
@@ -124,6 +132,7 @@ public final class ORES {
 	public static final Material SAMARSKITE_Y = new Material(
 			"Samarskite (Y)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_FINE, //Texture Set
 			new short[]{65, 163, 164, 0}, //Material Colour
 			500,
 			1500,
@@ -143,6 +152,7 @@ public final class ORES {
 	public static final Material SAMARSKITE_YB = new Material(
 			"Samarskite (Yb)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_FINE, //Texture Set
 			new short[]{95, 193, 194, 0}, //Material Colour
 			500,
 			1500,
@@ -161,6 +171,7 @@ public final class ORES {
 	public static final Material ZIRCON = new Material(
 			"Zircon", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_GEM_VERTICAL, //Texture Set
 			new short[]{195, 19, 19, 0}, //Material Colour
 			500,
 			1500,
@@ -177,6 +188,7 @@ public final class ORES {
 	public static final Material GADOLINITE_CE = new Material(
 			"Gadolinite (Ce)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_FINE, //Texture Set
 			new short[]{15, 159, 59, 0}, //Material Colour
 			500,
 			1500,
@@ -198,6 +210,7 @@ public final class ORES {
 	public static final Material GADOLINITE_Y = new Material(
 			"Gadolinite (Y)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_FINE, //Texture Set
 			new short[]{35, 189, 99, 0}, //Material Colour
 			500,
 			1500,
@@ -218,6 +231,7 @@ public final class ORES {
 	public static final Material LEPERSONNITE = new Material(
 			"Lepersonnite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_EMERALD, //Texture Set
 			new short[]{175, 175, 20, 0}, //Material Colour
 			500,
 			1500,
@@ -236,6 +250,7 @@ public final class ORES {
 	public static final Material XENOTIME = new Material(
 			"Xenotime", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_OPAL, //Texture Set
 			new short[]{235, 89, 199, 0}, //Material Colour
 			500,
 			1500,
@@ -251,6 +266,7 @@ public final class ORES {
 	public static final Material YTTRIALITE = new Material(
 			"Yttrialite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_RUBY, //Texture Set
 			new short[]{35, 189, 99, 0}, //Material Colour
 			500,
 			1500,
@@ -267,6 +283,7 @@ public final class ORES {
 	public static final Material YTTROCERITE = new Material(
 			"Yttrocerite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_DIAMOND, //Texture Set
 			new short[]{35, 19, 199, 0}, //Material Colour
 			500,
 			1500,
@@ -283,6 +300,7 @@ public final class ORES {
 	public static final Material POLYCRASE = new Material(
 			"Polycrase", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_ROUGH, //Texture Set
 			new short[]{51, 0, 11, 0}, //Material Colour
 			500,
 			1500,
@@ -304,6 +322,7 @@ public final class ORES {
 	public static final Material ZIRCOPHYLLITE = new Material(
 			"Zircophyllite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_FIERY, //Texture Set
 			new short[]{30, 0, 6, 0}, //Material Colour
 			500,
 			1500,
@@ -326,6 +345,7 @@ public final class ORES {
 	public static final Material ZIRKELITE = new Material(
 			"Zirkelite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_GEM_HORIZONTAL, //Texture Set
 			new short[]{229, 208, 48, 0}, //Material Colour
 			500,
 			1500,
@@ -345,6 +365,7 @@ public final class ORES {
 	public static final Material LANTHANITE_LA = new Material(
 			"Lanthanite (La)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{219, 160, 214, 0}, //Material Colour
 			500,
 			1500,
@@ -362,6 +383,7 @@ public final class ORES {
 	public static final Material LANTHANITE_CE = new Material(
 			"Lanthanite (Ce)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{186, 113, 179, 0}, //Material Colour
 			500,
 			1500,
@@ -379,6 +401,7 @@ public final class ORES {
 	public static final Material LANTHANITE_ND = new Material(
 			"Lanthanite (Nd)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{153, 76, 145, 0}, //Material Colour
 			500,
 			1500,
@@ -396,6 +419,7 @@ public final class ORES {
 	public static final Material HIBONITE = new Material(
 			"Hibonite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{58, 31, 0, 0}, //Material Colour
 			500,
 			1500,
@@ -414,6 +438,7 @@ public final class ORES {
 	public static final Material CERITE = new Material(
 			"Cerite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{68, 13, 0, 0}, //Material Colour
 			500,
 			1500,
@@ -434,6 +459,7 @@ public final class ORES {
 	public static final Material AGARDITE_Y = new Material(
 			"Agardite (Y)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{210, 232, 44, 0}, //Material Colour
 			500,
 			1500,
@@ -452,6 +478,7 @@ public final class ORES {
 	public static final Material AGARDITE_CD = new Material(
 			"Agardite (Cd)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{170, 188, 33, 0}, //Material Colour
 			500,
 			1500,
@@ -470,6 +497,7 @@ public final class ORES {
 	public static final Material AGARDITE_LA = new Material(
 			"Agardite (La)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_FINE, //Texture Set
 			new short[]{206, 232, 9, 0}, //Material Colour
 			500,
 			1500,
@@ -488,6 +516,7 @@ public final class ORES {
 	public static final Material AGARDITE_ND = new Material(
 			"Agardite (Nd)", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{225, 244, 78, 0}, //Material Colour
 			500,
 			1500,
@@ -506,6 +535,7 @@ public final class ORES {
 	public static final Material FLUORCAPHITE = new Material(
 			"Fluorcaphite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_FINE, //Texture Set
 			new short[]{255, 255, 30, 0}, //Material Colour
 			500,
 			1500,
@@ -525,6 +555,7 @@ public final class ORES {
 	public static final Material FLORENCITE = new Material(
 			"Florencite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_METALLIC, //Texture Set
 			new short[]{249, 249, 124, 0}, //Material Colour
 			500,
 			1500,
@@ -542,6 +573,7 @@ public final class ORES {
 	public static final Material CRYOLITE = new Material(
 			"Cryolite", //Material Name
 			MaterialState.ORE, //State
+			TextureSet.SET_SHINY, //Texture Set
 			new short[]{205, 205, 255, 0}, //Material Colour
 			500,
 			1500,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index a09a865743..86be02faed 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -636,7 +636,7 @@ public class RECIPES_GREGTECH {
 						230); //EU
 
 			}catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
-			
+
 			//Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O
 			try {
 				CORE.RA.addDehydratorRecipe(
@@ -653,7 +653,7 @@ public class RECIPES_GREGTECH {
 						new int[]{0, 0, 0},
 						32*20, //Time in ticks
 						64); //EU				
-				
+
 
 			}catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
 
@@ -903,7 +903,7 @@ public class RECIPES_GREGTECH {
 				chances,
 				30*20,
 				240);
-		
+
 		GT_Values.RA.addChemicalBathRecipe(
 				FLUORIDES.FLUORITE.getCrushed(2), 
 				FluidUtils.getFluidStack("hydrogen", 2000),
@@ -1166,6 +1166,7 @@ public class RECIPES_GREGTECH {
 	}
 
 	private static void electroMagneticSeperatorRecipes(){
+		//Bauxite
 		GT_Values.RA.addElectromagneticSeparatorRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1),
@@ -1174,6 +1175,28 @@ public class RECIPES_GREGTECH {
 				new int[]{10000, 2500, 4000},
 				20*20,
 				24);
+
+		
+		
+		/*//Trinium
+		GT_Values.RA.addElectromagneticSeparatorRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1),
+				new int[]{10000, 2500, 4000},
+				20*20,
+				24);
+
+		//Trinium
+		GT_Values.RA.addElectromagneticSeparatorRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1),
+				new int[]{10000, 2500, 4000},
+				20*20,
+				24);*/
 	}
 
 	private static void advancedMixerRecipes(){
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index b4a3e23997..8a99edac5f 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -442,14 +442,17 @@ public class FluidUtils {
 					ItemList.Cell_Empty.get(1L, new Object[0]),
 					1000);
 
-			GT_Values.RA.addFluidExtractionRecipe(
+			//Disable this, not sure why it exists //TODO
+			/*GT_Values.RA.addFluidExtractionRecipe(
 					ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1), //Input
 					null, //Input 2
 					FluidUtils.getFluidStack(gtFluid, 144), //Fluid Output
 					0, //Chance
 					1*20, //Duration
 					16 //Eu Tick
-					);
+					);*/
+			
+			
 			return gtFluid;
 		}
 		Logger.INFO("FLUID GENERATION FAILED FOR "+localizedName);
diff --git a/src/Java/gtPlusPlus/core/util/input/KeyboardUtils.java b/src/Java/gtPlusPlus/core/util/input/KeyboardUtils.java
new file mode 100644
index 0000000000..3b5dc3b5d8
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/input/KeyboardUtils.java
@@ -0,0 +1,23 @@
+package gtPlusPlus.core.util.input;
+
+import org.lwjgl.input.Keyboard;
+
+import net.minecraft.client.Minecraft;
+
+public class KeyboardUtils {
+
+	public static boolean isCtrlKeyDown(){
+		// prioritize CONTROL, but allow OPTION as well on Mac (note: GuiScreen's isCtrlKeyDown only checks for the OPTION key on Mac)
+		boolean isCtrlKeyDown = Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
+		if (!isCtrlKeyDown && Minecraft.isRunningOnMac)
+			isCtrlKeyDown = Keyboard.isKeyDown(Keyboard.KEY_LMETA) || Keyboard.isKeyDown(Keyboard.KEY_RMETA);
+	
+		return isCtrlKeyDown;
+	}
+
+	public static boolean isShiftKeyDown(){
+		return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
+		
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
index 0eab691720..e74fe1e1a5 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
@@ -38,16 +38,15 @@ public class DarkWorldContentLoader {
 	}
 
 	public synchronized static boolean initItems(){
-		portalItem = (itemDarkWorldPortalTrigger) (new itemDarkWorldPortalTrigger().setUnlocalizedName("dimensionDarkWorld_trigger"));
-		GameRegistry.registerItem(portalItem, "dimensionDarkWorld_trigger");	
-
+		portalItem = (itemDarkWorldPortalTrigger) (new itemDarkWorldPortalTrigger().setUnlocalizedName("everglades.trigger"));
+		GameRegistry.registerItem(portalItem, "everglades.trigger");	
 		return true;
 	}
 
 	public synchronized static boolean initBlocks(){		
 
 		//Create Block Instances
-		blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, blockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f).setLightOpacity(1).setBlockName("blockDarkWorldSludgeFluid");
+		blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, blockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f).setLightOpacity(1).setBlockName("fluidSludge");
 		portalBlock = new blockDarkWorldPortal();
 		blockTopLayer = new blockDarkWorldGround();
 		blockSecondLayer = new blockDarkWorldPollutedDirt();
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
index 44d62663bd..65184b6f35 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
@@ -137,7 +137,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 			this.mIsGenerating = true;
 			Logger.WORLD("Setting Generation to true.");
 			int mList_sS = WorldGen_GT_Base.mList.size();
-			mList_sS = Math.min(mList_sS, 5); // Run a maximum of 5 chunks at a
+			mList_sS = Math.min(mList_sS, 3); // Run a maximum of 3 chunks at a
 												// time through worldgen. Extra
 												// chunks get done later.
 			for (int i = 0; i < mList_sS; i++) {
@@ -377,6 +377,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 					case WorldGen_GT_Ore_Layer.NO_OVERLAP:
 						if (debugWorldGen)
 							GT_Log.out.println(" No overlap");
+						break;
 				}
 			}
 		}
@@ -391,11 +392,11 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 			// For now, manually reducing oreveinMaxSize when not in the
 			// Underdark for performance
 			if (this.mWorld.provider.getDimensionName().equals("Underdark")) {
-				oreveinMaxSize = 32; // Leave Deep Dark/Underdark max oregen at
+				oreveinMaxSize = 24; // Leave Deep Dark/Underdark max oregen at
 										// 32, instead of 64
 			}
 			else {
-				oreveinMaxSize = 32;
+				oreveinMaxSize = 24;
 			}
 
 			int wXbox = this.mX - (oreveinMaxSize / 16);