Merge branch 'development' into v8

This commit is contained in:
Ben Spiers 2014-12-16 20:35:55 +00:00
commit b5e289b504
2 changed files with 3 additions and 1 deletions
src/main/java/mekanism/common

View file

@ -125,6 +125,8 @@ public class BlockPlastic extends Block
return false;
}
@Override
@SideOnly(Side.CLIENT)
public int getRenderType()
{
return ClientProxy.PLASTIC_RENDER_ID;

View file

@ -542,7 +542,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
if(!world().isRemote)
{
if(getAllCurrentConnections() != (possibleAcceptors | possibleAcceptors))
if(getAllCurrentConnections() != (possibleTransmitters | possibleAcceptors))
{
sendDesc = true;
}