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
@@ -717,6 +717,8 @@ set(_MINECRAFT_CLIENT_COMMON_NET_MINECRAFT_CLIENT_PARTICLE
"${CMAKE_CURRENT_SOURCE_DIR}/SpellParticle.h"
"${CMAKE_CURRENT_SOURCE_DIR}/SplashParticle.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/SplashParticle.h"
"${CMAKE_CURRENT_SOURCE_DIR}/WaterWakeParticle.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/WaterWakeParticle.h"
"${CMAKE_CURRENT_SOURCE_DIR}/SuspendedParticle.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/SuspendedParticle.h"
"${CMAKE_CURRENT_SOURCE_DIR}/SuspendedTownParticle.cpp"