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.Client/DLCTexturePack.cpp

@@ -127,7 +127,7 @@ wstring DLCTexturePack::getResource(const wstring& name)
 {
 	// 4J Stu - We should never call this function
 #ifndef __CONTENT_PACKAGE
-	__debugbreak();
+	DEBUG_BREAK();
 #endif
 	return L"";
 }
@@ -136,7 +136,7 @@ InputStream *DLCTexturePack::getResourceImplementation(const wstring &name) //th
 {
 	// 4J Stu - We should never call this function
 #ifndef _CONTENT_PACKAGE
-	__debugbreak();
+	DEBUG_BREAK();
 	if(hasFile(name)) return nullptr;
 #endif
 	return nullptr; //resource;