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

2014-04-22 22:03:09 -05:00
parent 85f15e7c06 ea7e4b68bb
commit a5c2c7244d
6 changed files with 24 additions and 24 deletions
@@ -83,7 +83,7 @@ public class TileController extends AENetworkPowerTile implements IAEPowerStorag
 	}

 	@MENetworkEventSubscribe
-	public void onPowerChange(MENetworkControllerChange status)
+	public void onControllerChange(MENetworkControllerChange status)
 	{
 		updateMeta();
 	}