Merge remote-tracking branch 'origin/ver/7.0.0' into dev/pure

# Conflicts:
#	common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java
#	common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java
#	common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java
This commit is contained in:
dfsek committed 2022-08-21 13:40:57 -07:00
commit 91766599c6
149 files changed
+2122 -2303

No files matched your search

+6 -6
View File
@@ -2,14 +2,14 @@ dependencies {
api(project(":common:api"))
api(project(":common:implementation:bootstrap-addon-loader"))
testImplementation("org.slf4j", "slf4j-api", Versions.Libraries.slf4j)
testImplementation(libs.libraries.slf4j.api)
implementation("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO)
implementation(libs.libraries.internal.apache.io)
implementation("org.apache.commons", "commons-text", Versions.Libraries.Internal.apacheText)
implementation("com.dfsek.tectonic", "yaml", Versions.Libraries.tectonic)
implementation(libs.libraries.internal.apache.text)
implementation(libs.libraries.tectonic.yaml)
implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
implementation(libs.libraries.jafama)
implementation("com.dfsek", "paralithic", Versions.Libraries.paralithic)
implementation(libs.libraries.paralithic)
}