Merge branch 'development' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-04-29 16:52:22 +01:00
commit 2e2f4ce390
27 files changed
+228 -159

No files matched your search

@@ -1,7 +1,5 @@
package mekanism.client.model;
import org.lwjgl.opengl.GL11;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
@@ -9,6 +7,9 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -104,9 +105,11 @@ public class ModelSecurityDesk extends ModelBase
public void render(float size, TextureManager manager)
{
GL11.glPushMatrix();
MekanismRenderer.blendOn();
doRender(size);
GL11.glPushMatrix();
manager.bindTexture(OVERLAY);
GL11.glScalef(1.001F, 1.001F, 1.001F);
GL11.glTranslatef(0, -0.0011F, 0);
@@ -115,6 +118,7 @@ public class ModelSecurityDesk extends ModelBase
doRender(size);
MekanismRenderer.glowOff();
MekanismRenderer.blendOff();
GL11.glPopMatrix();
}