Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	.github/workflows/nightly-server.yml
#	Minecraft.Server/Windows64/ServerMain.cpp
#	Minecraft.World/ConsoleSaveFileOriginal.cpp
This commit is contained in:
itsRevela committed 2026-04-05 16:23:28 -05:00
commit e52565f9a3
4 files changed
+186

No files matched your search

@@ -34,6 +34,7 @@ static BackgroundSaveResult s_bgResult;
#ifdef _XBOX
#define RESERVE_ALLOCATION MEM_RESERVE | MEM_LARGE_PAGES
#define COMMIT_ALLOCATION MEM_COMMIT | MEM_LARGE_PAGES