Merge branch 'master' into weaponry

Conflicts:
	src/main/java/tconstruct/tools/TinkerTools.java
This commit is contained in:
Bernhard Bonigl committed 2014-10-24 13:17:48 +02:00
commit 939bd8a0ae
11 files changed
+176 -93

No files matched your search

@@ -100,7 +100,7 @@ public class StencilTableGui extends GuiContainer implements INEIGuiHandler
ItemStack stack;
if (logic.getStackInSlot(1) != null)
{
activeButton = StencilBuilder.getIndex(logic.getStackInSlot(1));
activeButton = StencilBuilder.getId(logic.getStackInSlot(1));
setActiveButton(activeButton);
stack = StencilBuilder.getStencil(((GuiButtonStencil) this.buttonList.get(activeButton)).element.stencilIndex);
}