Jules 41617f722c Merge remote-tracking branch 'origin/master' ... # Conflicts: # MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java		2023-04-23 21:42:10 +02:00
..
src/main/java/net/Indyuce/mmocore	Merge remote-tracking branch 'origin/master'	2023-04-23 21:42:10 +02:00
pom.xml	Basic support for DungeonParties	2023-04-22 16:54:55 +02:00