Merge branch '1.7.10' of https://github.com/sor1n/Modjam-Mod.git into 1.7.10

Conflicts:
	build.gradle

1 files changed, 19 insertions, 0 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java
new file mode 100644
index 0000000..e570da6
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java
@@ -0,0 +1,19 @@
+package darkknight.jewelrycraft.events;
+
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import darkknight.jewelrycraft.block.BlockList;
+import net.minecraftforge.client.event.TextureStitchEvent;
+
+public class TextureEvent
+{
+    @SubscribeEvent
+    @SideOnly(Side.CLIENT)
+    public void textureFix(TextureStitchEvent.Post e)
+    {
+        if (e.map.getTextureType() == 0)
+            BlockList.moltenMetalFluid.setIcons(BlockList.moltenMetal.getBlockTextureFromSide(0));
+    }
+}
\ No newline at end of file