Merge remote-tracking branch 'origin/master'

ee3_client/ee3/client/gui/GuiCalcinator.java

@@ -20,6 +20,7 @@ public class GuiCalcinator extends GuiContainer {
     
     public GuiCalcinator(InventoryPlayer player, TileCalcinator calcinator) {
         super(new ContainerCalcinator(player, calcinator));
+        this.ySize = 176;
         this.calcinator = calcinator;
     }
     

ee3_common/ee3/common/container/ContainerCalcinator.java

@@ -31,14 +31,14 @@ public class ContainerCalcinator extends Container {
         {
             for (int inventoryColumnIndex = 0; inventoryColumnIndex < 9; ++inventoryColumnIndex)
             {
-                this.addSlotToContainer(new Slot(inventoryPlayer, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 8 + inventoryColumnIndex * 18, 84 + inventoryRowIndex * 18));
+                this.addSlotToContainer(new Slot(inventoryPlayer, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 8 + inventoryColumnIndex * 18, 94 + inventoryRowIndex * 18));
             }
         }
 
         // Add the player's action bar slots to the container
         for (int actionBarSlotIndex = 0; actionBarSlotIndex < 9; ++actionBarSlotIndex)
         {
-            this.addSlotToContainer(new Slot(inventoryPlayer, actionBarSlotIndex, 8 + actionBarSlotIndex * 18, 142));
+            this.addSlotToContainer(new Slot(inventoryPlayer, actionBarSlotIndex, 8 + actionBarSlotIndex * 18, 152));
         }
     }