Merge branch 'main' into upstream-merge
# Conflicts: # .github/workflows/nightly.yml # Minecraft.Server/cmake/sources/Common.cmake
This commit is contained in:
@@ -23,6 +23,7 @@ set(_MINECRAFT_SERVER_COMMON_ROOT
|
||||
"${_MS_SRC}/../Minecraft.Client/BossMobGuiInfo.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/BreakingItemParticle.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/BubbleParticle.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/WaterWakeParticle.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/BufferedImage.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/Button.cpp"
|
||||
"${_MS_SRC}/../Minecraft.Client/Camera.cpp"
|
||||
|
||||
Reference in New Issue
Block a user