tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge branch 'master' into development

Browse source
This commit is contained in:
Ben Spiers 2014-12-16 20:34:55 +00:00
commit 6e422151be
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/common/block/BlockPlastic.java
View file

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

2
src/main/java/mekanism/common/multipart/PartSidedPipe.java
View file

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