Merge remote-tracking branch 'origin/ver/6.1.2' into ver/6.2.0

# Conflicts:
#	platforms/fabric/src/main/resources/terra.mixins.json
This commit is contained in:
dfsek
2022-06-13 09:57:18 -07:00
28 changed files with 931 additions and 287 deletions
+5
View File
@@ -16,10 +16,15 @@ repositories {
mavenCentral()
gradlePluginPortal()
maven { url = uri("https://repo.codemc.org/repository/maven-public") }
maven("https://papermc.io/repo/repository/maven-public/") {
name = "PaperMC"
}
}
dependencies {
implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5")
implementation("org.ow2.asm:asm:9.3")
implementation("org.ow2.asm:asm-tree:9.3")
implementation("com.dfsek.tectonic:common:4.2.0")
+1 -1
View File
@@ -4,7 +4,7 @@ object Versions {
const val paralithic = "0.7.0"
const val strata = "1.1.1"
const val cloud = "1.6.2"
const val cloud = "1.7.0-SNAPSHOT"
const val slf4j = "1.7.36"
const val log4j_slf4j_impl = "2.14.1"