Merge branch 'master' into 1.6.4

common/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.ListIterator;
 
 import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -135,7 +136,11 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement
         burnTime = TileEntityFurnace.getItemBurnTime(inventory[0]);
         if(burnTime > 0) {
           totalBurnTime = burnTime;
-          decrStackSize(0, 1);
+          if(inventory[0].itemID == Item.bucketLava.itemID) {
+            inventory[0] = new ItemStack(Item.bucketEmpty);
+          } else {
+            decrStackSize(0, 1);
+          }
         }
         needsUpdate = true;
       }