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/BiomeDecorator.cpp

@@ -27,8 +27,8 @@ void BiomeDecorator::decorate(Level *level, Random *random, int xo, int zo)
     {
         app.DebugPrintf("BiomeDecorator::decorate - Already decorating!!\n");
 #ifndef _CONTENT_PACKAGE
-        __debugbreak();
-        //throw new RuntimeException("Already decorating!!");
+		DEBUG_BREAK();
+		//throw new RuntimeException("Already decorating!!");
 #endif
     }
     this->level = level;