solonovamax
|
4c1ac827ad
|
Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging
# Conflicts:
# common/api/util/src/main/java/com/dfsek/terra/api/util/Logger.java
# common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java
# common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
# common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
# common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
# common/implementation/src/main/java/com/dfsek/terra/util/logging/DebugLogger.java
# common/implementation/src/main/java/com/dfsek/terra/util/logging/JavaLogger.java
# platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java
# platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java
# platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java
|
2021-09-25 00:42:09 -04:00 |
|