Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging

# Conflicts:
#	common/api/core/src/main/java/com/dfsek/terra/api/Logger.java
This commit is contained in:
solonovamax
2021-09-24 13:50:21 -04:00
271 changed files with 123 additions and 3977 deletions

View File

@@ -1,3 +1,3 @@
dependencies {
"shadedApi"(project(":common:api"))
"shadedApi"(project(":common:api:core"))
}

View File

@@ -1,3 +1,3 @@
dependencies {
"shadedApi"(project(":common:api"))
"shadedApi"(project(":common:api:core"))
}