From c50a1b3d29c27c30bc7e09334a634809e88e3ad0 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sun, 6 Oct 2013 23:53:35 -0400 Subject: [PATCH 1/2] update thaumium support by upating the location of the necessary config in Thaumcraft 4 --- src/tconstruct/common/TContent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 79894a43..1f448346 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -2025,7 +2025,7 @@ public class TContent implements IFuelHandler 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."); From 8a4c85a51b63943a1149ace07ae7d0352f0bf958 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Mon, 7 Oct 2013 19:58:36 +0100 Subject: [PATCH 2/2] Revert "Change derpy faucet behaviour." Reverting due to issues that I currently do not have time to fix. --- src/tconstruct/blocks/logic/FaucetLogic.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/blocks/logic/FaucetLogic.java b/src/tconstruct/blocks/logic/FaucetLogic.java index f533ce6c..ca8e0b60 100644 --- a/src/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/tconstruct/blocks/logic/FaucetLogic.java @@ -197,10 +197,10 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi active = true; activateFaucet(); } - /*else + else { active = false; - }*/ + } } @Override