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

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"