Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-01-19 17:57:19 +00:00
commit 39dc016908
23 files changed
+499 -97

No files matched your search

@@ -80,7 +80,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png"));
hydrogenGenerator.render(0.0625F);
}
else if(metadata == GeneratorType.WIND_TURBINE.meta)
else if(metadata == GeneratorType.WIND_GENERATOR.meta)
{
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F);