Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.20.4' into 1.20.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Treetrain1 committed May 2, 2024
2 parents c1b7d49 + 16fa1e7 commit b374e71
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit b374e71

Please sign in to comment.