Merge remote-tracking branch 'origin/master'
# Conflicts: # pom.xml # src/main/java/cn/lunadeer/miniplayertitle/MiniPlayerTitle.java # src/main/java/cn/lunadeer/miniplayertitle/PlayerTitle.java # src/main/java/cn/lunadeer/miniplayertitle/Shop.java # src/main/java/cn/lunadeer/miniplayertitle/utils/ConfigManager.java # src/main/java/cn/lunadeer/miniplayertitle/utils/Database.java # src/main/java/cn/lunadeer/miniplayertitle/utils/XLogger.java
This commit is contained in:
commit
08ea2c9a5a