Ka0rX 037fb131ec Merge branch 'master' into Skills-update ... # Conflicts: # MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java		2023-03-19 13:57:20 +01:00
..
java/net/Indyuce/mmocore	Combat commit 1	2023-01-22 21:59:06 +01:00
resources	Merge branch 'master' into Skills-update	2023-03-19 13:57:20 +01:00