some fixes, upgrade retexture

src/main/java/com/hbm/main/ModEventHandlerClient.java

@@ -585,7 +585,7 @@ public class ModEventHandlerClient {
 	private ResourceLocation ashes = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_ash.png");
 	
 	@SideOnly(Side.CLIENT)
-	@SubscribeEvent
+	//@SubscribeEvent
 	public void onRenderStorm(RenderHandEvent event) {
 		
 		if(BlockAshes.ashes == 0)

src/main/java/com/hbm/main/ModEventHandlerRenderer.java

@@ -1,15 +1,26 @@
 package com.hbm.main;
 
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.blocks.generic.BlockAshes;
 import com.hbm.items.armor.IArmorDisableModel;
 import com.hbm.items.armor.IArmorDisableModel.EnumPlayerPart;
+import com.hbm.lib.RefStrings;
 
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderPlayerEvent;
+import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
 
 public class ModEventHandlerRenderer {
 	
@@ -69,4 +80,74 @@ public class ModEventHandlerRenderer {
 		default:		return null;
 		}
 	}
+	
+	private ResourceLocation ashes = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_ash.png");
+	public static int currentBrightness = 0;
+	public static int lastBrightness = 0;
+	
+	@SubscribeEvent
+	public void onOverlayRender(RenderGameOverlayEvent.Pre event) {
+		
+		if(event.type == ElementType.AIR) {
+			
+			Minecraft mc = Minecraft.getMinecraft();
+			
+			ScaledResolution resolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
+
+			GL11.glPushMatrix();
+			GL11.glDisable(GL11.GL_DEPTH_TEST);
+			GL11.glDepthMask(false);
+			GL11.glEnable(GL11.GL_BLEND);
+			OpenGlHelper.glBlendFunc(770, 771, 1, 0);
+			GL11.glEnable(GL11.GL_ALPHA_TEST);
+			GL11.glAlphaFunc(GL11.GL_GEQUAL, 0.0F);
+			
+			int w = resolution.getScaledWidth();
+			int h = resolution.getScaledHeight();
+			double off = System.currentTimeMillis() / 10000D % 10000D;
+			double aw = 1;
+			
+			Tessellator tessellator = Tessellator.instance;
+
+			int cX = currentBrightness % 65536;
+			int cY = currentBrightness / 65536;
+			int lX = lastBrightness % 65536;
+			int lY = lastBrightness / 65536;
+			float interp = (mc.theWorld.getTotalWorldTime() % 20) * 0.05F;
+			
+			if(mc.theWorld.getTotalWorldTime() == 1)
+				lastBrightness = currentBrightness;
+			
+			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)(lX + (cX - lX) * interp) / 1.0F, (float)(lY + (cY - lY) * interp) / 1.0F);
+
+			//mc.entityRenderer.enableLightmap((double)event.partialTicks);
+			
+			mc.getTextureManager().bindTexture(ashes);
+			
+			for(int i = 1; i < 3; i++) {
+				
+				GL11.glTranslated(w, h, 0);
+				GL11.glRotatef(-15, 0, 0, 1);
+				GL11.glTranslated(-w, -h, 0);
+				GL11.glColor4f(1.0F, 1.0F, 1.0F, BlockAshes.ashes / 256F * 0.98F / i);
+				
+				tessellator.startDrawingQuads();
+				tessellator.addVertexWithUV(-w * 1.25, 	h * 1.25, 	aw, 0.0D + off * i, 1.0D);
+				tessellator.addVertexWithUV(w * 1.25, 	h * 1.25, 	aw, 1.0D + off * i, 1.0D);
+				tessellator.addVertexWithUV(w * 1.25, 	-h * 1.25, 	aw, 1.0D + off * i, 0.0D);
+				tessellator.addVertexWithUV(-w * 1.25, 	-h * 1.25, 	aw, 0.0D + off * i, 0.0D);
+				tessellator.draw();
+			}
+
+			mc.entityRenderer.disableLightmap((double)event.partialTicks);
+			
+			GL11.glDepthMask(true);
+			GL11.glEnable(GL11.GL_DEPTH_TEST);
+			GL11.glDisable(GL11.GL_BLEND);
+			GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+			GL11.glAlphaFunc(GL11.GL_GEQUAL, 0.1F);
+
+			GL11.glPopMatrix();
+		}
+	}
 }

src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java

@@ -30,7 +30,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
 		super(0);
 		tanks = new FluidTank[2];
 		tanks[0] = new FluidTank(Fluids.WATER, 1000, 0);
-		tanks[1] = new FluidTank(Fluids.HEAVYWATER, 100, 0);
+		tanks[1] = new FluidTank(Fluids.HEAVYWATER, 100, 1);
 	}
 
 	@Override

src/main/resources/assets/hbm/lang/de_DE.lang

@@ -3488,7 +3488,7 @@ tile.pink_stairs.name=Pinke Holztreppen
 tile.plant_flower.foxglove.name=Roter Fingerhut
 tile.plant_flower.nightshade.name=Schwarze Tollkirsche
 tile.plant_flower.tobacco.name=Tabakpflanze
-tile.plant_flower.weed.name=Weed Version 420(0)
+tile.plant_flower.weed.name=Hanf
 tile.plasma.name=Plasma
 tile.plasma_heater.name=Plasmaerhitzer
 tile.pole_satellite_receiver.name=Satellitenschüssel

src/main/resources/assets/hbm/lang/en_US.lang

@@ -3862,7 +3862,7 @@ tile.pink_stairs.name=Pink Wood Stairs
 tile.plant_flower.foxglove.name=Foxglove
 tile.plant_flower.nightshade.name=Deadly Nightshade
 tile.plant_flower.tobacco.name=Tobacco Plant
-tile.plant_flower.weed.name=Weed Version 420(0)
+tile.plant_flower.weed.name=Hemp
 tile.plasma.name=Plasma
 tile.plasma_heater.name=Plasma Heater
 tile.pole_satellite_receiver.name=Satellite Dish