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

@@ -180,11 +180,11 @@ void BiomeSource::getRawBiomeBlock(BiomeArray &biomes, int x, int z, int w, int
     {
         biomes[i] = Biome::biomes[result[i]];
 #ifndef _CONTENT_PACKAGE
-        if(biomes[i] == nullptr)
-        {
-            app.DebugPrintf("Tried to assign null biome %d\n", result[i]);
-            __debugbreak();
-        }
+		if(biomes[i] == nullptr)
+		{
+			app.DebugPrintf("Tried to assign null biome %d\n", result[i]);
+			DEBUG_BREAK();
+		}
 #endif
     }
 }