mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2025-07-21 12:02:33 +00:00
43aa3fc086
# 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