mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-10-26 14:00:26 +00:00
Merge branch 'dev' into feat/byte_buddy
# Conflicts: # build.gradle.kts # core/build.gradle.kts # core/src/main/java/com/volmit/iris/Iris.java
This commit is contained in:
10 files changed
+116
-25
No files matched your search
+1
-1
@@ -105,7 +105,7 @@ nmsBindings.forEach { key, value ->
|
||||
systemProperty("disable.watchdog", "")
|
||||
systemProperty("net.kyori.ansi.colorLevel", color)
|
||||
systemProperty("com.mojang.eula.agree", true)
|
||||
systemProperty("iris.errorReporting", errorReporting)
|
||||
systemProperty("iris.suppressReporting", !errorReporting)
|
||||
jvmArgs("-javaagent:${project(":core:agent").tasks.jar.flatMap { it.archiveFile }.get().asFile.absolutePath}")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user