mmocore/MMOCore-Dist/src/main
Ka0rX af2c68054e Merge branch 'master' into Skills-update
# Conflicts:
#	MMOCore-API/pom.xml
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/profess/SavedClassInformation.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/player/DefaultPlayerData.java
#	MMOCore-Dist/pom.xml
#	README.md
#	pom.xml
2023-03-31 09:18:33 +01:00
..
java/net/Indyuce/mmocore Transfered unlockedItems from MythicLib to MMOCore. 2023-03-29 23:35:47 +01:00
resources Merge branch 'master' into Skills-update 2023-03-31 09:18:33 +01:00