solonovamax
|
a73767ca75
|
Merge branch 'gh-builds'
# Conflicts:
# build.gradle.kts
# src/main/java/com/dfsek/terra/config/genconfig/CarverConfig.java
# src/main/java/com/dfsek/terra/config/genconfig/FloraConfig.java
# src/main/java/com/dfsek/terra/config/genconfig/OreConfig.java
# src/main/java/com/dfsek/terra/config/genconfig/PaletteConfig.java
# src/main/java/com/dfsek/terra/config/genconfig/biome/BiomeConfig.java
# src/main/java/com/dfsek/terra/config/genconfig/biome/BiomeSnowConfig.java
# src/test/java/LookupGeneratorTest.java
|
2020-11-24 18:35:33 -05:00 |
|