Quick update to 1.16+#6

Noorquacker wants to merge 3 commits into

magnusulf:mastermagnusulf/MassiveCore:masterfrom

Noorquacker:masterNoorquacker/MassiveCore:masterCopy head branch name to clipboard