Merge remote-tracking branch 'upstream/dev/1.12' into exp/1.12

# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/mods/AccessWidenerAnalyzeVisitorProvider.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/extension/MixinExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
#	src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java
#	src/main/java/net/fabricmc/loom/util/gradle/GradleUtils.java
#	src/main/resources/log4j2.fabric.xml
#	src/test/resources/projects/multiproject/build.gradle
This commit is contained in:
Juuz
2025-10-29 12:31:21 +02:00
91 changed files with 4674 additions and 612 deletions

View File

@@ -7,7 +7,7 @@ vineflower = "1.11.1"
# Runtime depedencies
mixin-compile-extensions = "0.6.0"
dev-launch-injector = "0.2.1+build.8"
terminal-console-appender = "1.3.0"
fabric-log4j-util = "1.0.2"
jetbrains-annotations = "26.0.2"
native-support = "1.0.1"
fabric-installer = "1.0.3"
@@ -36,7 +36,7 @@ vineflower = { module = "org.vineflower:vineflower", version.ref = "vineflower"
# Runtime depedencies
mixin-compile-extensions = { module = "net.fabricmc:fabric-mixin-compile-extensions", version.ref = "mixin-compile-extensions" }
dev-launch-injector = { module = "net.fabricmc:dev-launch-injector", version.ref = "dev-launch-injector" }
terminal-console-appender = { module = "net.minecrell:terminalconsoleappender", version.ref = "terminal-console-appender" }
fabric-log4j-util = { module = "net.fabricmc:fabric-log4j-util", version.ref = "fabric-log4j-util" }
jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
native-support = { module = "net.fabricmc:fabric-loom-native-support", version.ref = "native-support" }
fabric-installer = { module = "net.fabricmc:fabric-installer", version.ref = "fabric-installer" }