Merge branch 'main' into upstream-merge
# Conflicts: # .github/workflows/nightly.yml # Minecraft.Server/cmake/sources/Common.cmake
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user