Konicai 737df21495 Merge remote-tracking branch 'upstream/master' into ext-1.19.20-fixes ... # Conflicts: # ap/pom.xml # api/base/pom.xml # api/geyser/pom.xml # api/pom.xml # bootstrap/bungeecord/pom.xml # bootstrap/pom.xml # bootstrap/spigot/pom.xml # bootstrap/sponge/pom.xml # bootstrap/standalone/pom.xml # bootstrap/velocity/pom.xml # common/pom.xml # core/pom.xml # pom.xml		2022-08-10 17:01:02 -04:00
..
kotlin	Merge remote-tracking branch 'upstream/master' into ext-1.19.20-fixes	2022-08-10 17:01:02 -04:00