Also Cables no longer glow in the dark :P

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	core/localization/GuiText.java
This commit is contained in:
AlgorithmX2
2014-06-08 21:13:53 -05:00
24 changed files with 226 additions and 70 deletions
+13 -1
View File
@@ -87,6 +87,12 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
};
@Override
public boolean isInWorld()
{
return cb.isInWorld();
}
protected void updateTileSetting()
{
if ( cb.requiresDynamicRender )
@@ -283,7 +289,13 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
@Override
public void partChanged()
{
if ( worldObj != null )
notifyNeighbors();
}
@Override
public void notifyNeighbors()
{
if ( worldObj != null && worldObj.blockExists( xCoord, yCoord, zCoord ) )
worldObj.notifyBlocksOfNeighborChange( xCoord, yCoord, zCoord, Platform.air );
}