Jules 482eeb9e8b Merge remote-tracking branch 'origin/master' ... # Conflicts: # MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java		2023-03-11 17:45:16 +01:00
..
src/main/java/net/Indyuce/mmocore	Merge remote-tracking branch 'origin/master'	2023-03-11 17:45:16 +01:00
pom.xml	Fixed UClans comp	2023-02-28 18:05:45 +01:00