Merge branch 'master' into imgbot

# Conflicts:
#	src/resources/assets/miscutils/textures/items/itemBufferCore.png

24 files changed, 1348 insertions, 439 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 8ae48f3b3f..7b340dc798 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -1,6 +1,8 @@
 package gtPlusPlus;
 
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*;
+import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAnimatedTurbines;
+import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes;
+import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableUpdateChecker;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -9,18 +11,24 @@ import java.util.Collection;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.*;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.util.*;
+import gregtech.api.util.FishPondFakeRecipe;
+import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gregtech.api.util.Recipe_GT;
+import gregtech.api.util.SemiFluidFuelHandler;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.commands.CommandDebugChunks;
 import gtPlusPlus.core.commands.CommandMath;
 import gtPlusPlus.core.common.CommonProxy;
@@ -28,16 +36,22 @@ import gtPlusPlus.core.config.ConfigHandler;
 import gtPlusPlus.core.handler.BookHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
 import gtPlusPlus.core.handler.chunkloading.ChunkLoading;
-import gtPlusPlus.core.handler.events.*;
+import gtPlusPlus.core.handler.events.BlockEventHandler;
+import gtPlusPlus.core.handler.events.LoginEventHandler;
+import gtPlusPlus.core.handler.events.MissingMappingsEvent;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.LocaleUtils;
-import gtPlusPlus.core.util.minecraft.*;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.core.util.sys.*;
+import gtPlusPlus.core.util.sys.GeoUtils;
+import gtPlusPlus.core.util.sys.NetworkUtils;
+import gtPlusPlus.core.util.sys.SystemUtils;
 import gtPlusPlus.plugin.manager.Core_Manager;
 import gtPlusPlus.xmod.gregtech.api.objects.GregtechBufferThread;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
@@ -46,7 +60,6 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
 import gtPlusPlus.xmod.gregtech.loaders.GT_Material_Loader;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT_GTNH;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechMiniRaFusion;
-import gtPlusPlus.xmod.ob.SprinklerHandler;
 import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.util.IIcon;
@@ -420,69 +433,4 @@ public class GTplusplus implements ActionListener {
 		mGregMatLoader.enableMaterial(Materials.Force);		
 	}
 
-	/**
-	 * Capes
-	 */
-
-	public static final AutoMap<Pair<String, String>> mOrangeCapes = new AutoMap<Pair<String, String>>();
-	public static final AutoMap<Pair<String, String>> mMiscCapes = new AutoMap<Pair<String, String>>();
-	public static final AutoMap<Pair<String, String>> mBetaTestCapes = new AutoMap<Pair<String, String>>();
-	public static final AutoMap<Pair<String, String>> mDevCapes = new AutoMap<Pair<String, String>>();
-	public static final AutoMap<Pair<String, String>> mPatreonCapes = new AutoMap<Pair<String, String>>();
-
-	public static void BuildCapeList() {
-		//Basic Orange Cape (I give these away at times, just because)
-		mOrangeCapes.put(new Pair<String, String>("ImmortalPharaoh7", "c8c479b2-7464-4b20-adea-b43ff1c10c53"));
-		mOrangeCapes.put(new Pair<String, String>("Walmart_Employee", "7a56602b-9a67-44e3-95a5-270f887712c6"));
-		mOrangeCapes.put(new Pair<String, String>("ArchonCerulean", "f773e61f-261f-41e7-a221-5dcace291ced"));
-		mOrangeCapes.put(new Pair<String, String>("netmc", "c3ecbcc3-0d83-4da6-bb89-69f3f1a6e38b"));
-		mOrangeCapes.put(new Pair<String, String>("twinsrock8", "c1239b45b-b3a3-4282-8143-c73778897dda"));
-		mOrangeCapes.put(new Pair<String, String>("Ajes", "b1781fc7-35ca-4255-a21c-cdb1b7ea1853"));
-		mOrangeCapes.put(new Pair<String, String>("LAGIdiot", "44f38ff8-aad7-49c3-acb3-d92317af9078"));
-		mOrangeCapes.put(new Pair<String, String>("Snaggerr", "7e553c3b-b259-4c16-992a-c8c107401e74"));
-		mOrangeCapes.put(new Pair<String, String>("Semmelx4", "651b3963-038f-4769-9f75-0eaca0c4e748"));
-		//mOrangeCapes.put(new Pair<String, String>("aaaa", "1234"));
-		//mOrangeCapes.put(new Pair<String, String>("aaaa", "1234"));
-		//mOrangeCapes.put(new Pair<String, String>("aaaa", "1234"));
-
-		//Misc
-		mMiscCapes.put(new Pair<String, String>("doomsquirter", "3aee80ab-d982-4e6d-b8d0-7912bbd75f5d"));
-		mMiscCapes.put(new Pair<String, String>("ukdunc", "17d57521-3a1e-4eb9-91e6-901a65c15e07"));
-		mMiscCapes.put(new Pair<String, String>("q009", "520aebe6-4cd9-46cd-bc7a-d47e5e648e38"));	
-		mMiscCapes.put(new Pair<String, String>("JaidenC", "00b157e5-cd97-43a2-a080-460f550e93cd"));
-		mMiscCapes.put(new Pair<String, String>("TheGiggitygoo", "9f996c78-bddc-4dec-a522-0df7267f11f3"));
-
-		//Beta/Dev Tester Capes
-		mBetaTestCapes.put(new Pair<String, String>("fobius", "ca399a5b-d1bb-46e3-af5b-5939817b5cf8"));
-		mBetaTestCapes.put(new Pair<String, String>("cantankerousrex", ""));
-		mBetaTestCapes.put(new Pair<String, String>("stephen_2015", "004ae3d8-ecaf-48eb-9e4e-224d42d31c78"));
-		mBetaTestCapes.put(new Pair<String, String>("Dyonovan", "2f3a7dff-b1ec-4c05-8eed-63ad2a3ba73f"));
-		mBetaTestCapes.put(new Pair<String, String>("Bear989Sr", "1964e3d1-6500-40e7-9ff2-e6161d41a8c2"));
-		mBetaTestCapes.put(new Pair<String, String>("CrazyJ1984", "d84f9654-87ea-46a9-881f-c6aa45dd5af8"));
-		mBetaTestCapes.put(new Pair<String, String>("AndreyKV", "9550c173-a8c5-4e7f-bf8d-b5ded56921ef"));
-		mBetaTestCapes.put(new Pair<String, String>("Piky", "7822ae35-9d5a-4fe7-bd5f-d03006932a65"));
-
-		//GTNH Beta Testers
-		mBetaTestCapes.put(new Pair<String, String>("bartimaeusnek", "578c2d13-9358-4ae8-95e7-a30ab9f9f3c7"));
-		mBetaTestCapes.put(new Pair<String, String>("Prewf", "634433ec-6256-44aa-97b3-a615be18ce23"));
-		mBetaTestCapes.put(new Pair<String, String>("FallDark", "86aa136e-9b5e-45e3-8273-6684fd7c537d"));
-		mBetaTestCapes.put(new Pair<String, String>("0lafe", "8b06bcf9-7a94-45f9-a01f-2fff73e7582d"));
-		mBetaTestCapes.put(new Pair<String, String>("Dogehog", "499b751e-f106-41ae-8dfe-3b88a73958e0"));
-		//mBetaTestCapes.put(new Pair<String, String>("cantankerousrex", ""));
-
-		//Dev Capes
-		mDevCapes.put(new Pair<String, String>("draknyte1", "5652713c-668e-47f3-853a-3fa959a9dfd3"));
-		mDevCapes.put(new Pair<String, String>("crimsonhood17", "c4773470-2585-4bd7-82b3-8764ca6acd08"));
-
-
-		/**
-		 * Patreons
-		 */
-
-		mPatreonCapes.put(new Pair<String, String>("Baxterzz", "e8aa5500-7319-4453-822c-b96b29ab5981"));
-		mPatreonCapes.put(new Pair<String, String>("leagris", "09752aa3-8b9c-4f8f-b04f-5421e799547d"));
-		mPatreonCapes.put(new Pair<String, String>("Traumeister", "fd3f46ac-801a-4566-90b5-75cb362d261e"));
-		mPatreonCapes.put(new Pair<String, String>("asturrial", "26c4881f-c708-4c5d-aa76-4419c3a1265b"));
-	}
-
 }
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 2fd23ec88d..a14073e569 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -292,11 +292,12 @@ public final class ModItems {
 	public static Item boxFood;
 	public static Item boxMagic;
 
-	private static DustDecayable dustMolybdenum99;
+	public static DustDecayable dustMolybdenum99;
+	public static DustDecayable dustTechnetium99;
+	public static DustDecayable dustTechnetium99M;
 
-	private static DustDecayable dustTechnetium99;
-
-	private static DustDecayable dustTechnetium99M;
+	public static IonParticles itemIonParticleBase;
+	public static StandardBaseParticles itemStandarParticleBase;
 
 	static {
 		Logger.INFO("Items!");
@@ -580,7 +581,7 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.ABYSSAL);
 			
 
-			MaterialGenerator.generate(ALLOY.TITANSTEEL, false);
+			MaterialGenerator.generate(ALLOY.TITANSTEEL);
 			MaterialGenerator.generate(ALLOY.ARCANITE);
 			MaterialGenerator.generate(ALLOY.OCTIRON);			
 			
@@ -630,7 +631,7 @@ public final class ModItems {
 		dustLithiumPeroxide = ItemUtils.generateSpecialUseDusts("LithiumPeroxide", "Lithium Peroxide", "Li2O2", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_peroxide
 		dustLithiumHydroxide = ItemUtils.generateSpecialUseDusts("LithiumHydroxide", "Lithium Hydroxide", "LiOH", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_hydroxide
 
-		if ((ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() == ModItems.AAA_Broken) || !LoadedMods.IHL){
+		if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1)) && !LoadedMods.IHL){
 			dustQuicklime = ItemUtils.generateSpecialUseDusts("Quicklime", "Quicklime", "CaO", Utils.rgbtoHexValue(255, 255, 175))[0]; //https://en.wikipedia.org/wiki/Calcium_oxide
 		}
 		dustCalciumHydroxide = ItemUtils.generateSpecialUseDusts("CalciumHydroxide", "Hydrated Lime", "Ca(OH)2", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_hydroxide
@@ -814,8 +815,8 @@ public final class ModItems {
 		dustTechnetium99M = new DustDecayable("dustTechnetium99M", ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(), 8570, new String[] {""+StringUtils.superscript("99ᵐTc"), "Result: Technicium 99 ("+StringUtils.superscript("99Tc")+")"}, dustTechnetium99, 4);
 		dustMolybdenum99 = new DustDecayable("dustMolybdenum99", ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), 16450, new String[] {""+StringUtils.superscript("99Mo"), "Result: Technicium 99ᵐ ("+StringUtils.superscript("99ᵐTc")+")"}, dustTechnetium99M, 4);
 		
-		new IonParticles();
-		new StandardBaseParticles();
+		itemIonParticleBase = new IonParticles();
+		itemStandarParticleBase = new StandardBaseParticles();
 		
 		
 		
diff --git a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java
index 89cd1e55ae..b7bbc84757 100644
--- a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java
+++ b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java
@@ -30,7 +30,10 @@ public abstract class BaseItemParticle extends CoreItem {
 	public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) {
 		return aColourMap.get(stack.getItemDamage());
 	}	
-
+	
+	public int getColorFromParentClass(ItemStack stack, int aaa) {
+		return super.getColorFromItemStack(stack, aaa);
+	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
index ff5f67d2da..517a698e80 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
@@ -1,23 +1,42 @@
 package gtPlusPlus.core.item.chemistry;
 
+import java.util.HashMap;
+import java.util.List;
+
 import gregtech.api.enums.Materials;
 import gtPlusPlus.core.item.base.misc.BaseItemParticle;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
 
 public class IonParticles extends BaseItemParticle {
 
+	public static HashMap<String, Integer> NameToMetaMap = new HashMap<String, Integer>();
+	public static HashMap<Integer, String> MetaToNameMap = new HashMap<Integer, String>();
+	
+	
 	public IonParticles() {
 		super("Ion", aElements.length, EnumRarity.rare);
 	}
 	
 	private static final String[] aElements = new String[]{"Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminum", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Cesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
+
+	public static IIcon[] overlays = new IIcon[aElements.length];
+	public static IIcon baseTexture;
 	
 	static {
 		//Generate Ions
 		int key = 0;
 		for (String s : aElements) {
+			//Map names to Meta
+			NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key);
+			MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase()));
 			Materials m = Materials.get(s);
 			int aColour = 0;
 			if (m == null) {
@@ -45,5 +64,103 @@ public class IonParticles extends BaseItemParticle {
     public String getUnlocalizedName(final ItemStack itemStack) {
         return "item.particle.ion" + "." + aElements[itemStack.getItemDamage()];
     }
+	
+	private static boolean createNBT(ItemStack rStack){
+		final NBTTagCompound tagMain = new NBTTagCompound();
+		final NBTTagCompound tagNBT = new NBTTagCompound();
+		tagNBT.setLong("Charge", 0);
+		tagMain.setTag("Ion", tagNBT);		
+		rStack.setTagCompound(tagMain);		
+		return true;
+	}
+	
+	public static final long getChargeState(final ItemStack aStack) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("Ion");
+			if (aNBT != null) {
+				return aNBT.getLong("Charge");
+			}
+		}
+		else {
+		createNBT(aStack);
+		}
+		return 0L;
+	}
+
+	public static final boolean setChargeState(final ItemStack aStack, final long aCharge) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("Ion");
+			if (aNBT != null) {
+				aNBT.setLong("Charge", aCharge);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		if (stack.getTagCompound() == null){
+			createNBT(stack);
+        }
+		double chargeState = getChargeState(stack);	
+        return  chargeState;
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {		
+		long aCharge = getChargeState(stack);
+		String aState = EnumChatFormatting.YELLOW+"Unknown"+EnumChatFormatting.GRAY;		
+		//State not set
+		if (aCharge == 0) {
+			list.add(EnumChatFormatting.GRAY+"A "+MetaToNameMap.get(stack.getItemDamage())+" Ion with an "+aState+" charge state");			
+		}
+		else {
+			if (aCharge > 0) {
+				aState = EnumChatFormatting.GREEN+"Positive"+EnumChatFormatting.GRAY;
+			}
+			else {
+				aState = EnumChatFormatting.RED+"Negative"+EnumChatFormatting.GRAY;
+			}
+
+			list.add(EnumChatFormatting.GRAY+"A "+MetaToNameMap.get(stack.getItemDamage())+" Ion with a "+aState+" charge state of "+aCharge+"");	
+		}		
+		super.addInformation(stack, player, list, bool);
+	}
+	
+	@Override
+	public void registerIcons(IIconRegister reg) {		
+		for (int i = 0; i < IonParticles.overlays.length; i++) {
+			IonParticles.overlays[i] = reg.registerIcon(CORE.MODID + ":" + "ion/"+i);			
+		}
+		IonParticles.baseTexture = reg.registerIcon(CORE.MODID + ":" + "ion/IonBase");
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+		return IonParticles.overlays[meta];
+	}
+
+	@Override
+	public boolean requiresMultipleRenderPasses() {
+		return true;
+	}
+
+	@Override
+	public IIcon getIconFromDamageForRenderPass(int aMeta, int aPass) {
+		if (aPass == 0) {
+			return IonParticles.baseTexture;
+		}
+		else {
+			return IonParticles.overlays[aMeta];
+		}
+	}
+
+	@Override
+	public int getRenderPasses(int metadata) {
+		return 2;
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 9bd8a521ab..a516cb0639 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -404,7 +404,7 @@ public class RocketFuels {
 				480);	
 
 		ItemStack aCell11dimethylhydrazine = ItemUtils.getItemStackOfAmountFromOreDict("cell1,1Dimethylhydrazine", 2);
-		if (aCell11dimethylhydrazine != null && aCell11dimethylhydrazine.getItem() != ModItems.AAA_Broken) {
+		if (ItemUtils.checkForInvalidItems(aCell11dimethylhydrazine)) {
 			GT_Values.RA.addCentrifugeRecipe(
 					CI.getNumberedCircuit(23),
 					aCell11dimethylhydrazine,
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
index dd07d41b3d..1e833a7b00 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
@@ -1,15 +1,26 @@
 package gtPlusPlus.core.item.chemistry;
 
-import gregtech.api.enums.Materials;
+import java.util.HashMap;
+import java.util.List;
+
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.misc.BaseItemParticle;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Particle;
 import gtPlusPlus.core.material.Particle.ElementaryGroup;
 import gtPlusPlus.core.util.Utils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
 
 public class StandardBaseParticles extends BaseItemParticle {
 
+	public static HashMap<String, Integer> NameToMetaMap = new HashMap<String, Integer>();
+	public static HashMap<Integer, String> MetaToNameMap = new HashMap<Integer, String>();
+	
 	public StandardBaseParticles() {
 		super("Base", aTypes.length, EnumRarity.rare);
 	}
@@ -17,13 +28,19 @@ public class StandardBaseParticles extends BaseItemParticle {
 	private static final String[] aTypes = new String[] { "Graviton", "Up", "Down", "Charm", "Strange", "Top",
 			"Bottom", "Electron", "Electron Neutrino", "Muon", "Muon Neutrino", "Tau", "Tau Neutrino", "Gluon",
 			"Photon", "Z Boson", "W Boson", "Higgs Boson", "Proton", "Neutron", "Lambda", "Omega", "Pion",
-			"ETA Meson", };
+			"ETA Meson", "Unknown" };
+	
+	public IIcon[] icons = new IIcon[aTypes.length];
 	
 	static {
 		//Generate Ions
 		int key = 0;
+		
+		
 		for (String s : aTypes) {
-			Particle p;
+			//Map names to Meta
+			NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key);
+			MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase()));
 			for (Particle o : Particle.aMap) {
 				int aColour = 0;
 				if (o.mParticleName.toLowerCase().equals(s.toLowerCase())) {
@@ -73,5 +90,72 @@ public class StandardBaseParticles extends BaseItemParticle {
     public String getUnlocalizedName(final ItemStack itemStack) {
         return "item.particle.base" + "." + aTypes[itemStack.getItemDamage()];
     }
+	
+	public static Particle getParticle(ItemStack aStack) {
+		AutoMap<Particle> g = Particle.aMap;
+		for (Particle p : g) {
+			String aPartName = Utils.sanitizeString(p.mParticleName.toLowerCase());
+			String expectedPart = Utils.sanitizeString(aTypes[aStack.getItemDamage()].toLowerCase());
+			if (aPartName.equals(expectedPart)) {
+				return p;
+			}
+		}
+		return Particle.UNKNOWN;	
+	}
+
+	@Override
+	public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) {
+		//return Utils.rgbtoHexValue(200, 200, 200);
+		return super.getColorFromParentClass(stack, HEX_OxFFFFFF);
+	}	
+	
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {		
+		Particle aCharge = getParticle(stack);
+		EnumChatFormatting aColour = EnumChatFormatting.GRAY;
+		String aState = aColour+"Unknown"+EnumChatFormatting.RESET;			
+		if (aCharge != null) {
+			String aGroup = aCharge.mParticleType.name().toLowerCase();
+			if (aGroup.toLowerCase().contains("quark")) {
+				aColour = EnumChatFormatting.LIGHT_PURPLE;
+			}
+			else if (aGroup.toLowerCase().contains("lepton")) {
+				aColour = EnumChatFormatting.GREEN;
+			}
+			else if (aCharge == Particle.HIGGS_BOSON) {
+				aColour = EnumChatFormatting.YELLOW;
+			}
+			else if (aGroup.toLowerCase().contains("boson")) {
+				aColour = EnumChatFormatting.RED;
+			}
+			else if (aGroup.toLowerCase().contains("baryon")) {
+				aColour = EnumChatFormatting.BLUE;
+			}
+			else if (aGroup.toLowerCase().contains("meson")) {
+				aColour = EnumChatFormatting.WHITE;
+			}
+			else {
+				aColour = EnumChatFormatting.GRAY;
+			}			
+			String aFirstLet = aGroup.substring(0, 1).toUpperCase();
+			aGroup = aGroup.replaceFirst(aGroup.substring(0, 1), aFirstLet);
+			aState = aColour+aGroup+EnumChatFormatting.RESET;
+			list.add(EnumChatFormatting.GRAY + "Type: "+aState);
+		}		
+		super.addInformation(stack, player, list, bool);
+	}
+
+	@Override
+	public void registerIcons(IIconRegister reg) {		
+		for (int i = 0; i < this.icons.length; i++) {
+			this.icons[i] = reg.registerIcon(CORE.MODID + ":" + "particle/"+i);			
+		}
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+		return this.icons[meta];
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/general/BufferCore.java b/src/Java/gtPlusPlus/core/item/general/BufferCore.java
index d3c7d5112f..9b00d3d034 100644
--- a/src/Java/gtPlusPlus/core/item/general/BufferCore.java
+++ b/src/Java/gtPlusPlus/core/item/general/BufferCore.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+import gregtech.api.enums.GT_Values;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -21,7 +21,7 @@ public class BufferCore extends BaseItemWithDamageValue{
 	public BufferCore(final String unlocalizedName, final int i) {
 		super(unlocalizedName+i);
 		this.setTextureName(CORE.MODID + ":" + unlocalizedName);
-		this.setMaxStackSize(2);
+		this.setMaxStackSize(32);
 		this.coreTier = i;
 	}
 
@@ -40,7 +40,7 @@ public class BufferCore extends BaseItemWithDamageValue{
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		list.add(EnumChatFormatting.GRAY+"A key crafting component for making energy buffers.");
+		list.add(EnumChatFormatting.GRAY+"A key crafting component for "+GT_Values.VN[this.coreTier-1]+" Applicances");
 	}
 
 	public final int getCoreTier() {
@@ -48,51 +48,25 @@ public class BufferCore extends BaseItemWithDamageValue{
 	}
 
 	@Override
-	public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {
-		//Figure Out Damage
-		final String s = String.format("%X", HEX_OxFFFFFF);
-		//Utils.LOG_INFO(s);
-		//String rgb = Utils.hex2Rgb(s);
-		//Utils.LOG_INFO(rgb);
-		if (this.coreTier == 1){
-			HEX_OxFFFFFF = 0x4d4d4d;
-		}
-		else if (this.coreTier == 2){
-			HEX_OxFFFFFF = 0x666666;
-		}
-		else if (this.coreTier == 3){
-			HEX_OxFFFFFF = 0x8c8c8c;
-		}
-		else if (this.coreTier == 4){
-			HEX_OxFFFFFF = 0xa6a6a6;
-		}
-		else if (this.coreTier == 5){
-			HEX_OxFFFFFF = 0xcccccc;
-		}
-		else if (this.coreTier == 6){
-			HEX_OxFFFFFF = 0xe6e6e6;
-		}
-		else if (this.coreTier == 7){
-			HEX_OxFFFFFF = 0xffffcc;
-		}
-		else if (this.coreTier == 8){
-			HEX_OxFFFFFF = 0xace600;
-		}
-		else if (this.coreTier == 9){
-			HEX_OxFFFFFF = 0xffff00;
-		}
-		/*else if (coreTier == 10){
-			HEX_OxFFFFFF = 0xff0000;
-		}*/
-		else if (this.coreTier == 10){
-			HEX_OxFFFFFF = Utils.rgbtoHexValue(MathUtils.randInt(220, 250), MathUtils.randInt(221, 251), MathUtils.randInt(220, 250));
-		}
-		else {
-			HEX_OxFFFFFF = 0xffffff;
-		}
+	public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {		
 
+		int[] mTierTypes = new int[] {
+				Utils.rgbtoHexValue(200, 180, 180),
+				Utils.rgbtoHexValue(142, 153, 161),
+				Utils.rgbtoHexValue(230, 121, 75),
+				Utils.rgbtoHexValue(215, 156, 70),
+				Utils.rgbtoHexValue(97, 97, 96), //EV
+				Utils.rgbtoHexValue(202, 202, 201),
+				Utils.rgbtoHexValue(247, 159, 157),
+				Utils.rgbtoHexValue(181, 223, 223),
+				Utils.rgbtoHexValue(187, 219, 185),
+		};
+		
+		if (this.coreTier == 10){
+			return Utils.rgbtoHexValue(MathUtils.randInt(220, 250), MathUtils.randInt(221, 251), MathUtils.randInt(220, 250));
+		}
 
-		return HEX_OxFFFFFF;
+		return mTierTypes[this.coreTier-1];
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java b/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
index 8ad87c0ea8..eb22f8fa07 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
@@ -4,10 +4,13 @@ import java.util.List;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+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 gtPlusPlus.core.lib.CORE;
@@ -57,6 +60,14 @@ public class ItemControlCore extends Item {
 	public String getUnlocalizedName(ItemStack stack) {
 		return this.getUnlocalizedName() + "_" + stack.getItemDamage();
 	}
+	
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		list.add(EnumChatFormatting.GRAY+"Allows a Multiblock to function upto "+GT_Values.VN[stack.getItemDamage()]+"");
+		list.add(EnumChatFormatting.GRAY+"Required Tier is determined by the sum of the eu/t of all Energy Inputs");
+		list.add(EnumChatFormatting.GRAY+"Lower tiers may be used to underclock, which is useful in some situations");
+	}
 
 	@Override
 	public String getItemStackDisplayName(final ItemStack tItem) {
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 1ee02a2654..03e50aa7dd 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -753,7 +753,7 @@ public class Material {
 				}
 			}
 			//Logger.MATERIALS("Unabled to find \"" + aKey + this.unlocalizedName + "\"");
-			return ItemUtils.getErrorStack(stacksize);
+			return ItemUtils.getErrorStack(stacksize, (aKey + this.unlocalizedName+" x"+stacksize));
 		}
 		
 	}
diff --git a/src/Java/gtPlusPlus/core/material/Particle.java b/src/Java/gtPlusPlus/core/material/Particle.java
index 6cc0f878d6..e93129ec58 100644
--- a/src/Java/gtPlusPlus/core/material/Particle.java
+++ b/