Merge remote-tracking branch 'Revelations/main' into upstream-merge

# Conflicts:
#	.github/workflows/nightly.yml
#	CMakeLists.txt
#	Minecraft.Client/CMakeLists.txt
#	Minecraft.Client/StringTable.cpp
#	Minecraft.Server/FourKitNatives.cpp
#	Minecraft.Server/Windows64/ServerMain.cpp
#	Minecraft.World/BiomeDecorator.cpp
#	Minecraft.World/BiomeSource.cpp
#	Minecraft.World/cmake/sources/Common.cmake
#	README.md
#	cmake/ServerTarget.cmake

Minecraft.World/DirectoryLevelStorage.cpp

@@ -44,7 +44,7 @@ int _MapDataMappings::getDimension(int id)
 	default:
 #ifndef _CONTENT_PACKAGE
 		printf("Read invalid dimension from MapDataMapping\n");
-		__debugbreak();
+		DEBUG_BREAK();
 #endif
 		break;
 	}
@@ -73,7 +73,7 @@ void _MapDataMappings::setMapping(int id, PlayerUID xuid, int dimension)
 	default:
 #ifndef _CONTENT_PACKAGE
 		printf("Trinyg to set a MapDataMapping for an invalid dimension.\n");
-		__debugbreak();
+		DEBUG_BREAK();
 #endif
 		break;
 	}