Fix merge

This commit is contained in:
Ben Spiers 2014-12-15 17:20:13 +00:00
parent 9a47f800f9
commit e51307d68f

View file

@ -3,6 +3,7 @@ package mekanism.client.render.block;
import mekanism.client.ClientProxy;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
@ -25,7 +26,7 @@ public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
{
boolean flag = false;
if(block == Mekanism.BlockGlowHDPE)
if(block == MekanismBlocks.GlowPlasticBlock)
{
Tessellator tessellator = Tessellator.instance;
tessellator.setBrightness(240);