mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-20 03:59:37 +00:00
Merge branch 'master' into development
This commit is contained in:
commit
6e422151be
2 files changed
+3
-1
No files matched your search
@@ -124,6 +124,8 @@ public class BlockPlastic extends Block
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public int getRenderType()
|
||||
{
|
||||
return ClientProxy.PLASTIC_RENDER_ID;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user