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/entity/EntityChargedQuartz.java
+1 -1
View File
@@ -106,7 +106,7 @@ final public class EntityChargedQuartz extends EntityItem
if ( netherQuartz.getEntityItem().stackSize <= 0 )
netherQuartz.setDead();
List<ItemStack> i = new ArrayList();
List<ItemStack> i = new ArrayList<ItemStack>();
i.add( AEApi.instance().materials().materialFluixCrystal.stack( 1 ) );
ItemStack Output = AEApi.instance().materials().materialFluixCrystal.stack( 2 );