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

Merge remote-tracking branch 'upstream/rv2' into rv2

Browse Source 
Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java
This commit is contained in:
Andrew
2014-09-29 00:26:15 -07:00
parent fd18393a8b 72106c877d
commit 5c5aaa21ee
113 changed files with 410 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
+3 -3
View File
@@ -39,14 +39,14 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
IItemList<IAEItemStack> active = AEApi.instance().storage().createItemList();
IItemList<IAEItemStack> pending = AEApi.instance().storage().createItemList();
List<IAEItemStack> visual = new ArrayList();
List<IAEItemStack> visual = new ArrayList<IAEItemStack>();
public void clearItems()
{
storage = AEApi.instance().storage().createItemList();
active = AEApi.instance().storage().createItemList();
pending = AEApi.instance().storage().createItemList();
visual = new ArrayList();
visual = new ArrayList<IAEItemStack>();
}
protected GuiCraftingCPU(ContainerCraftingCPU container) {
@@ -269,7 +269,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
int viewEnd = viewStart + 3 * 6;
String dspToolTip = "";
List<String> lineList = new LinkedList();
List<String> lineList = new LinkedList<String>();
int toolPosX = 0;
int toolPosY = 0;