Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct

SlimeKnights · Oct 8, 2013 · 6a7b576 · 6a7b576
2 parents f5b939d + 8a4c85a
commit 6a7b576
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/tconstruct/blocks/logic/FaucetLogic.java b/src/tconstruct/blocks/logic/FaucetLogic.java
@@ -197,10 +197,10 @@ public void setActive (boolean flag)
             active = true;
             activateFaucet();
         }
-        /*else
+        else
         {
             active = false;
-        }*/
+        }
     }
 
     @Override

diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java
@@ -2024,7 +2024,7 @@ public void modIntegration ()
             TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), (ItemStack) chargedReBattery, (ItemStack) electronicCircuit);
 
         /* Thaumcraft */
-        Object obj = getStaticItem("itemResource", "thaumcraft.common.Config");
+        Object obj = getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems");
         if (obj != null)
         {
             System.out.println("[TConstruct] Thaumcraft detected. Adding thaumium tools.");