Backport some 1.21 update improvements#347

Da-Technomancer merged 5 commits into

1.20.1Crossroads-Development/Crossroads:1.20.1from

1.20.1-backportsCrossroads-Development/Crossroads:1.20.1-backportsCopy head branch name to clipboard