Fix merge conflicts

This commit is contained in:
mDiyo committed 2013-12-06 11:46:23 -08:00
commit 91271f6bb2
22 files changed
+38 -606

No files matched your search

@@ -343,7 +343,7 @@ public class CraftingStationGui extends GuiContainer
if (logic.doubleChest == null)
this.drawTexturedModalRect(cornerX - 116, cornerY, 0, 0, 121, this.ySize);
else
this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 121, this.ySize + 21);
this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 122, this.ySize + 21);
}
// Draw description