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
This commit is contained in:
@@ -126,6 +126,7 @@ typedef XUID GameSessionUID;
|
||||
#include "TilePos.h"
|
||||
#include "ChunkPos.h"
|
||||
#include "compression.h"
|
||||
#include "Debug.h"
|
||||
#include "PerformanceTimer.h"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user