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:
@@ -416,6 +416,7 @@ set(_MINECRAFT_SERVER_COMMON_ROOT
|
||||
"${_MS_SRC}/../Minecraft.Client/ScrolledSelectionList.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/SelectWorldScreen.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/ServerChunkCache.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/ServerChunkCache.h"
|
||||
"${_MS_SRC}/../Minecraft.Client/ServerCommandDispatcher.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/ServerConnection.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/ServerLevel.cpp"
|
||||
|
||||
Reference in New Issue
Block a user