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

Conflicts: core/localization/GuiText.java
2014-05-31 20:58:52 -05:00
parent 8183becfd4 baf5e66144
commit 900a278ec2
21 changed files with 861 additions and 21 deletions
@@ -31,6 +31,8 @@ import appeng.util.Platform;
 public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
 {

+	final private static ItemStack ring = AEApi.instance().blocks().blockQuantumRing.stack(1);
+	
 	final int sidesRing[] = new int[] {};
 	final int sidesLink[] = new int[] { 0 };

@@ -147,6 +149,14 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
 	{
 		return !isInvalid();
 	}
+	
+	@Override
+	public void onReady()
+	{
+		super.onReady();
+		if ( worldObj.getBlock( xCoord, yCoord, zCoord) == AEApi.instance().blocks().blockQuantumRing.block() )
+			gridProxy.setVisualRepresentation( ring );
+	}

 	public void updateStatus(QuantumCluster c, byte flags)
 	{