Merge branch 'master' into 5.0

Browse Source

# Conflicts:
#	README.md
#	build.gradle
#	src/main/scala/io/izzel/taboolib/module/command/base/BaseMainCommand.java
#	src/main/scala/io/izzel/taboolib/module/locale/TLocaleLoader.java
#	src/main/scala/me/skymc/taboolib/Main.java
#	src/main/scala/me/skymc/taboolib/commands/TabooLibMainCommand.java
#	src/main/scala/me/skymc/taboolib/database/PlayerDataManager.java
#	src/main/scala/me/skymc/taboolib/listener/ListenerPlayerJoinAndQuit.java
#	src/main/scala/me/skymc/taboolib/playerdata/DataUtils.java

...

This commit is contained in:

坏黑 2019-07-07 01:35:59 +08:00

parent f5bd2981d1 d42affeac8

commit bf063bebce

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available