Merge upstream and probably introduce a zillion errors

This commit is contained in:
Vincent Lee committed 2015-12-14 16:38:07 -06:00
commit 5211ed9149
164 files changed
+5198 -2141

No files matched your search

@@ -186,8 +186,7 @@ public class SubTileGenerating extends SubTileEntity {
@Override
public List<ItemStack> getDrops(List<ItemStack> list) {
List<ItemStack> drops = super.getDrops(list);
if(isPassiveFlower())
populateDropStackNBTs(drops);
populateDropStackNBTs(drops);
return drops;
}