+ 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.

2 files changed, 68 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 1e3cb0ffbb..a00d1ea152 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -22,6 +22,9 @@ import gtPlusPlus.core.recipe.*;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaGarbageCollector;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionCreator;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.*;
 import net.minecraft.item.ItemStack;
@@ -49,6 +52,14 @@ public class COMPAT_HANDLER {
 	public static void registerGregtechMachines() {
 		if (Gregtech) {			
 
+			//Debug
+			GregtechItemList.Garbage_Collector_Debug_Machine.set(
+					new GregtechMetaGarbageCollector(							 
+							"garbagecollector.01.tier.single",
+							"JVM Garbage Collector",
+							"Useful for debugging or smoother performance on local servers").getStackForm(1L));
+			
+			
 			//Free IDs
 			/*
 			---
diff --git a/src/Java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java b/src/Java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
new file mode 100644
index 0000000000..c1c2341dd6
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
@@ -0,0 +1,57 @@
+package gtPlusPlus.core.handler.events;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.entity.boss.EntityDragon;
+import net.minecraftforge.event.entity.living.LivingDropsEvent;
+
+public class EnderDragonDeathHandler {
+
+	private static final String mDragonClassName = "chylex.hee.entity.boss.EntityBossDragon";
+	private static final boolean mHEE;
+	private static final Class mHardcoreDragonClass;
+	
+	static {
+		mHEE = ReflectionUtils.doesClassExist(mDragonClassName);
+		mHardcoreDragonClass = (mHEE ? ReflectionUtils.getClass(mDragonClassName) : null);
+	}
+
+	@SubscribeEvent
+	public void onEntityDrop(LivingDropsEvent event) {
+		
+		boolean aDidDrop = false;
+		
+		//HEE Dragon
+		if (mHEE) {
+			if (mHardcoreDragonClass != null) {
+				if (mHardcoreDragonClass.isInstance(event.entityLiving)) {
+						for (int y = 0; y < MathUtils.randInt(100, 250); y++) {
+							int aAmount = MathUtils.randInt(5, 25);
+							event.entityLiving.entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1));
+							aDidDrop = true;
+						}					
+				}
+			}
+		}
+		//Vanilla Dragon or any other dragon that extends it
+		else {
+			if (event.entityLiving instanceof EntityDragon) {
+				for (int y = 0; y < MathUtils.randInt(25, 50); y++) {
+					int aAmount = MathUtils.randInt(1, 10);
+					event.entityLiving.entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1));
+					aDidDrop = true;
+				}
+			}
+		}
+		
+		if (aDidDrop) {
+			PlayerUtils.messageAllPlayers("Small quantities of Dragonsblood has crystalized after the death of the Ender Dragon!");
+		}
+		
+	}
+
+}