Merge branch 'main' into upstream-merge

# Conflicts:
#	.github/workflows/nightly.yml
#	Minecraft.Server/cmake/sources/Common.cmake
This commit is contained in:
George V.
2026-04-13 17:39:46 +03:00
20 changed files with 604 additions and 421 deletions
@@ -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"