Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0

This commit is contained in:
dfsek
2021-11-23 20:41:33 -07:00
5 changed files with 165 additions and 133 deletions

View File

@@ -25,10 +25,10 @@ dependencies {
shadedApi(project(":common:implementation:base"))
shadedApi("org.slf4j:slf4j-api:1.7.32") {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, but we want slf4j 1.7.")
}
shadedImplementation("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1") {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
shaded("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1") {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, but we want slf4j 1.7.")
exclude("org.apache.logging.log4j")
}
@@ -71,4 +71,4 @@ tasks.register<TaskModrinthUpload>("publishModrinth") {
releaseType = "beta"
addGameVersion(minecraft)
addLoader("fabric")
}
}