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

# Conflicts:
#	build.gradle.kts
#	common/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteHolder.java
#	common/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteHolderBuilder.java
#	common/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java
#	common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java
#	common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
#	common/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java
#	gradle.properties
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java
This commit is contained in:
dfsek
2021-06-22 21:59:27 -07:00
181 changed files with 4163 additions and 2247 deletions
+6
View File
@@ -8,3 +8,9 @@ org.gradle.caching=true
org.gradle.warning.mode=all
#org.gradle.logging.level=info
#org.gradle.configureondemand=true
# Project information
terra.description=A fast, modern, extensible, platform-agnostic data-driven world generator
terra.source=https://github.com/PolyhedralDev/Terra
terra.issues=https://github.com/PolyhedralDev/Terra/issues
terra.wiki=https://github.com/PolyhedralDev/Terra/wiki
terra.license=GNU General Public License, version 3.0