fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	core/localization/GuiText.java
This commit is contained in:
AlgorithmX2
2014-05-31 20:58:52 -05:00
parent 8183becfd4 baf5e66144
commit 900a278ec2
21 changed files with 861 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
me/helpers/AENetworkProxy.java
+7 -2
View File
@@ -36,7 +36,7 @@ public class AENetworkProxy implements IGridBlock
final private IGridProxyable gp;
final private boolean worldNode;
final private ItemStack myRepInstance;
private ItemStack myRepInstance;
private boolean isReady = false;
private IGridNode node = null;
@@ -57,7 +57,12 @@ public class AENetworkProxy implements IGridBlock
{
return myRepInstance;
}
public void setVisualRepresentation( ItemStack is )
{
myRepInstance = is;
}
public AENetworkProxy(IGridProxyable te, String nbtName, ItemStack visual, boolean inWorld) {
this.gp = te;
this.nbtName = nbtName;