Skip to content

Commit

Permalink
Merge branch '1.19.3' into 1.19.4
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
Treetrain1 committed Mar 22, 2023
2 parents 39d6dd6 + 33deb88 commit 7ddf27b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# Dependencies
fabric_version=0.76.0+1.19.4
fabric_asm_version=v2.3
frozenlib_version=1.1.16-mc23w07a
frozenlib_version=1.2.0-mc1.19.4

# External Mods
betterend_version=3.1.2
Expand Down
20 changes: 11 additions & 9 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 7ddf27b

Please sign in to comment.