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/parts/CableBusContainer.java
+2 -2
View File
@@ -321,7 +321,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
return null;
}
private static final ThreadLocal<Boolean> isLoading = new ThreadLocal();
private static final ThreadLocal<Boolean> isLoading = new ThreadLocal<Boolean>();
public static boolean isLoading()
{
@@ -916,7 +916,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
{
if ( getCenter() == null )
{
List<ItemStack> facades = new LinkedList();
List<ItemStack> facades = new LinkedList<ItemStack>();
IFacadeContainer fc = getFacadeContainer();
for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS)