mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2025-07-19 11:02:33 +00:00
4c1ac827ad
# 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