From aecb3cb0936269dc9b84a93fcb0964bda89f17a2 Mon Sep 17 00:00:00 2001 From: Ethryan <3237986+Ethryan@users.noreply.github.com> Date: Fri, 17 Oct 2025 14:29:48 +0200 Subject: [PATCH] fix conflict --- dependencies.gradle | 2 +- settings.gradle | 2 +- src/main/java/baubles/common/Baubles.java | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index a350181..e33168f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,3 +1,3 @@ dependencies { - implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.87-GTNH:dev") + implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.91-GTNH:dev") } diff --git a/settings.gradle b/settings.gradle index bc5e0f0..9105fb7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.42' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.44' } diff --git a/src/main/java/baubles/common/Baubles.java b/src/main/java/baubles/common/Baubles.java index eb7ead2..c92bd79 100644 --- a/src/main/java/baubles/common/Baubles.java +++ b/src/main/java/baubles/common/Baubles.java @@ -3,6 +3,8 @@ package baubles.common; import java.io.File; import baubles.Tags; +import codechicken.nei.api.API; +import cpw.mods.fml.common.Loader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -64,6 +66,9 @@ public class Baubles { NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy); proxy.registerKeyBindings(); GameRegistry.registerItem(itemDebugger, "bauble_slot_debug_tool", Baubles.MODID); + if (BaublesConfig.hideDebugItem && Loader.isModLoaded("NotEnoughItems")){ + API.hideItem("bauble_slot_debug_tool"); + } } }