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

Conflicts:
	items/materials/MaterialType.java
	util/Platform.java

tile/networking/TileCableBus.java

@@ -26,6 +26,7 @@ import appeng.api.parts.SelectedPart;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEColor;
 import appeng.api.util.DimensionalCoord;
+import appeng.block.networking.BlockCableBus;
 import appeng.helpers.AEMultiTile;
 import appeng.helpers.ICustomCollision;
 import appeng.hooks.TickHandler;
@@ -74,6 +75,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
 				// worldObj.updateAllLightTypes( xCoord, yCoord, zCoord );
 			}
 
+			updateTileSetting();
 			return ret;
 		}
 
@@ -85,6 +87,32 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
 
 	};
 
+	protected void updateTileSetting()
+	{
+		if ( cb.requiresDynamicRender )
+		{
+			TileCableBus tcb;
+			try
+			{
+				tcb = (TileCableBus) BlockCableBus.tesrTile.newInstance();
+				tcb.copyFrom( this );
+				getWorldObj().setTileEntity( xCoord, yCoord, zCoord, tcb );
+			}
+			catch (Throwable t)
+			{
+
+			}
+		}
+	}
+
+	protected void copyFrom(TileCableBus oldTile)
+	{
+		CableBusContainer tmpCB = cb;
+		cb = oldTile.cb;
+		oldLV = oldTile.oldLV;
+		oldTile.cb = tmpCB;
+	}
+
 	@Override
 	public void onReady()
 	{
@@ -128,6 +156,12 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
 		return false;
 	}
 
+	@Override
+	public double getMaxRenderDistanceSquared()
+	{
+		return 900.0;
+	}
+
 	@Override
 	public void getDrops(World w, int x, int y, int z, ArrayList drops)
 	{

tile/networking/TileCableBusTESR.java

@@ -0,0 +1,27 @@
+package appeng.tile.networking;
+
+import appeng.block.networking.BlockCableBus;
+
+public class TileCableBusTESR extends TileCableBus
+{
+
+	@Override
+	protected void updateTileSetting()
+	{
+		if ( !cb.requiresDynamicRender )
+		{
+			TileCableBus tcb;
+			try
+			{
+				tcb = (TileCableBus) BlockCableBus.noTesrTile.newInstance();
+				tcb.copyFrom( this );
+				getWorldObj().setTileEntity( xCoord, yCoord, zCoord, tcb );
+			}
+			catch (Throwable t)
+			{
+
+			}
+		}
+	}
+
+}

tile/powersink/RedstoneFlux.java

@@ -34,8 +34,13 @@ public abstract class RedstoneFlux extends RotaryCraft implements IEnergyHandler
 		return 0;
 	}
 
-	@Override
+	@Deprecated
 	final public boolean canInterface(ForgeDirection from)
+	{
+		return canConnectEnergy(from);
+	}
+	
+	final public boolean canConnectEnergy(ForgeDirection from)
 	{
 		return internalCanAcceptPower && getPowerSides().contains( from );
 	}