Merge branch '1.20.4' into 1.20.2

# Conflicts: # gradle.properties
FrozenBlock · Feb 2, 2024 · 08ea53d · 08ea53d
2 parents 9a2c909 + 43e55d4
commit 08ea53d
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 @@
 	fabric_api_version=0.91.6+1.20.2
     mixin_extras_version=0.3.2
 	fabric_asm_version=v2.3
-	frozenlib_version=1.5.4-mc1.20.2
+	frozenlib_version=1.6-mc1.20.2
 
 # 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
@@ -18,11 +18,11 @@
 
 package net.frozenblock.wilderwild.config;
 
-import blue.endless.jankson.Comment;
 import net.frozenblock.lib.config.api.instance.Config;
 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 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;