Merge remote-tracking branch 'upstream/dev/1.3' into dev/1.3

# Conflicts:
#	src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java
This commit is contained in:
Juuz
2023-07-19 12:56:27 +03:00
15 changed files with 134 additions and 141 deletions

View File

@@ -115,7 +115,7 @@ dependencies {
implementation ('dev.architectury:mercury:0.1.2.15')
// Kotlin
implementation('org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.0') {
implementation('org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2') {
transitive = false
}