Ka0rX 75265356ee Merge remote-tracking branch 'origin/master' ... # Conflicts: # pom.xml		2022-08-27 15:23:23 +02:00
..
src/main/java/net/Indyuce/mmocore	Merge remote-tracking branch 'origin/master'	2022-08-27 15:23:23 +02:00
pom.xml	Fixed pom	2022-08-21 15:57:17 +02:00