Merge branch 'development' into v8

This commit is contained in:
Ben Spiers committed 2014-12-18 23:01:31 +00:00
commit 5dc0e5dca1
6 files changed
+64 -6

No files matched your search

@@ -230,7 +230,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
@Override
public boolean isValidAcceptor(TileEntity acceptor, ForgeDirection side)
{
return CableUtils.getConnections(tile())[side.ordinal()];
return CableUtils.isValidAcceptorOnSide(tile(), acceptor, side);
}
@Override