+ Added High Quality Industrial Diamond.

+ Added various material components.
+ Added a debug machine used for calling the Garbage Collector.
+ Added recipe to obtain Hot Water.
+ Added way to obtain Dragonsblood.
+ Added lots of quick access fluids directly to FluidUtils.
% Updated English Locale.
$ Fixed issue preventing all Multiblocks from forming.
$ Fixed some minor texture issues.

3 files changed, 61 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 33198e8d41..90e831cbb4 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -248,12 +248,17 @@ public class BaseItemComponent extends Item{
 	public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
 
 
+		if (this.componentType == ComponentTypes.CELL || this.componentType == ComponentTypes.PLASMACELL) {
 		if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures){
 			return Utils.rgbtoHexValue(255, 255, 255);
 		}
 		if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures){
 			return Utils.rgbtoHexValue(255, 255, 255);
 		}
+		}
+		if (this.componentType == ComponentTypes.PLATEHEAVY) {
+			
+		}
 
 
 
@@ -495,7 +500,10 @@ public class BaseItemComponent extends Item{
 		PLASMACELL("CellPlasma", " Plasma Cell", "cellPlasma", OrePrefixes.cellPlasma),
 		CELL("Cell", " Cell", "cell", OrePrefixes.cell),
 		NUGGET("Nugget", " Nugget", "nugget", OrePrefixes.nugget),
-		PLATEHEAVY("HeavyPlate", " Heavy Plate", "plateHeavy", OrePrefixes.plateDense);
+		PLATEHEAVY("HeavyPlate", "Heavy@Plate", "plateHeavy", OrePrefixes.plateDense),
+		SPRING("Spring", " Spring", "spring", OrePrefixes.spring),
+		SMALLSPRING("SmallSpring", "Small@Spring", "springSmall", OrePrefixes.springSmall),
+		FINEWIRE("FineWire", "Fine@Wire", "wireFine", OrePrefixes.wireFine),;
 
 		private String COMPONENT_NAME;
 		private String DISPLAY_NAME;
diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
index 376be7bac8..7ce96b2a88 100644
--- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
@@ -17,6 +17,7 @@ import net.minecraft.world.World;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class CoreItem extends Item
 {
@@ -221,6 +222,10 @@ public class CoreItem extends Item
 	public boolean isRepairable() {
 		return false;
 	}
+	
+	public ItemStack getStack() {
+		return ItemUtils.getSimpleStack(this);
+	}
 
 /*	@Override
 	public String getItemStackDisplayName(final ItemStack tItem) {
diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java
new file mode 100644
index 0000000000..c9072b0d82
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java
@@ -0,0 +1,47 @@
+package gtPlusPlus.core.item.base.plates;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.base.BaseItemComponent;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public class BaseItemPlateHeavy extends BaseItemComponent{
+
+	final static ComponentTypes HEAVY = ComponentTypes.PLATEHEAVY;
+
+	public BaseItemPlateHeavy(final Material material) {
+		super(material, HEAVY);
+	}
+
+	@Override
+	public String getCorrectTextures(){
+		return CORE.MODID + ":" + "itemHeavyPlate";
+	}	
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean requiresMultipleRenderPasses(){
+		return true;
+	}
+
+	@Override
+	public void registerIcons(final IIconRegister i) {
+		this.base = i.registerIcon(CORE.MODID + ":" + "itemHeavyPlate");
+		this.overlay = i.registerIcon(CORE.MODID + ":" + "itemHeavyPlate_Overlay");
+	}
+	
+	@Override
+	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {		
+		
+		if (pass == 0) {
+			return this.base;			
+		}
+		else {
+			return this.overlay;			
+		}
+		
+	}
+}