Good upstream merge#870

linsaftw wants to merge 3 commits intoPaperMC:masterPaperMC/Waterfall:masterfrom

ArkFlame:masterArkFlame/Waterfall:masterCopy head branch name to clipboard