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/p2p/PartP2PIC2Power.java
+1 -1
View File
@@ -146,7 +146,7 @@ public class PartP2PIC2Power extends PartP2PTunnel<PartP2PIC2Power> implements i
if ( outs.isEmpty() )
return amount;
LinkedList<PartP2PIC2Power> Options = new LinkedList();
LinkedList<PartP2PIC2Power> Options = new LinkedList<PartP2PIC2Power>();
for (PartP2PIC2Power o : outs)
{
if ( o.OutputEnergyA <= 0.01 )