Merge branch 'refs/heads/master' into 1.20.4

# Conflicts: # gradle.properties
FrozenBlock · May 16, 2024 · 93c01fe · 93c01fe
2 parents 52da51a + f4191ef
commit 93c01fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -28,7 +28,7 @@
 # Dependencies
 	fabric_api_version=0.97.0+1.20.4
 	fabric_asm_version=v2.3
-	frozenlib_version=1.7.1-mc1.20.4
+	frozenlib_version=1.7.2-mc1.20.4
 
 # External Mods
     betterend_version=3.1.2

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -35,7 +35,7 @@ fun localRepository(repo: String, dependencySub: String, kotlin: Boolean) {
 
     val github = System.getenv("GITHUB_ACTIONS") == "true"
 
-    val allowLocalRepoUse = true
+    val allowLocalRepoUse = false
     val allowLocalRepoInConsoleMode = true
 
     val androidInjectedInvokedFromIde by extra("android.injected.invoked.from.ide")

diff --git a/src/main/java/net/frozenblock/wilderwild/config/MixinsConfig.java b/src/main/java/net/frozenblock/wilderwild/config/MixinsConfig.java
@@ -22,7 +22,7 @@
 import net.frozenblock.lib.config.api.instance.json.JsonConfig;
 import net.frozenblock.lib.config.api.instance.json.JsonType;
 import net.frozenblock.lib.config.api.registry.ConfigRegistry;
-import blue.endless.jankson.Comment;
+import net.frozenblock.lib.shadow.blue.endless.jankson.Comment;
 import static net.frozenblock.wilderwild.misc.WilderSharedConstants.MOD_ID;
 import static net.frozenblock.wilderwild.misc.WilderSharedConstants.configPath;