Merge branch 'master' into 1.19.3

# Conflicts: # gradle.properties
FrozenBlock · Mar 22, 2023 · 33deb88 · 33deb88
2 parents 984531f + 3acb6ca
commit 33deb88
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,7 @@
 # Dependencies
 	fabric_version=0.75.1+1.19.3
 	fabric_asm_version=v2.3
-	frozenlib_version=1.1.16-mc1.19.3
+	frozenlib_version=1.2.0-mc1.19.3
 
 # External Mods
     betterend_version=3.1.2

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -29,18 +29,20 @@ rootProject.name = "Wilder Wild"
 
 localRepository("FrozenLib", "maven.modrinth:frozenlib", true)
 
-fun localRepository(repo: String, dependencySub: String, kotlin: Boolean) {
-	println("Attempting to include local repo $repo")
+val allowLocalRepoUse = false
+val allowLocalRepoInConsoleMode = true
+
+val androidInjectedInvokedFromIde by extra("android.injected.invoked.from.ide")
+val xpcServiceName by extra("XPC_SERVICE_NAME")
+val ideaInitialDirectory by extra("IDEA_INITIAL_DIRECTORY")
 
-	val allowLocalRepoUse = true
-	val allowLocalRepoInConsoleMode = true
+val isIDE = androidInjectedInvokedFromIde != "" || (System.getenv(xpcServiceName) ?: "").contains("intellij") || (System.getenv(xpcServiceName) ?: "").contains(".idea") || System.getenv(ideaInitialDirectory) != null
 
-	val androidInjectedInvokedFromIde by extra("android.injected.invoked.from.ide")
-	val xpcServiceName by extra("XPC_SERVICE_NAME")
-	val ideaInitialDirectory by extra("IDEA_INITIAL_DIRECTORY")
 
-	val isIDE = androidInjectedInvokedFromIde != "" || (System.getenv(xpcServiceName) ?: "").contains("intellij") || (System.getenv(xpcServiceName) ?: "").contains(".idea") || System.getenv(ideaInitialDirectory) != null
-	val github = System.getenv("GITHUB_ACTIONS") == "true"
+fun localRepository(repo: String, dependencySub: String, kotlin: Boolean) {
+	println("Attempting to include local repo $repo")
+
+    val github = System.getenv("GITHUB_ACTIONS") == "true"
 
 	var path = "../$repo"
     var file = File(path)