Merge branch 'main' into upstream-merge

This commit is contained in:
George V.
2026-04-11 02:52:52 +03:00
92 changed files with 1619 additions and 60 deletions
@@ -624,6 +624,8 @@ set(_MINECRAFT_CLIENT_COMMON_NET_MINECRAFT_CLIENT_MODEL
"${CMAKE_CURRENT_SOURCE_DIR}/ArmorStandModel.h"
"${CMAKE_CURRENT_SOURCE_DIR}/EndermiteModel.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/EndermiteModel.h"
"${CMAKE_CURRENT_SOURCE_DIR}/GuardianModel.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/GuardianModel.h"
)
source_group("net/minecraft/client/model" FILES ${_MINECRAFT_CLIENT_COMMON_NET_MINECRAFT_CLIENT_MODEL})
@@ -901,6 +903,8 @@ set(_MINECRAFT_CLIENT_COMMON_NET_MINECRAFT_CLIENT_RENDERER_ENTITY
"${CMAKE_CURRENT_SOURCE_DIR}/RabbitRenderer.h"
"${CMAKE_CURRENT_SOURCE_DIR}/ArmorStandRenderer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/EndermiteRenderer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/GuardianRenderer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/GuardianRenderer.h"
)
source_group("net/minecraft/client/renderer/entity" FILES ${_MINECRAFT_CLIENT_COMMON_NET_MINECRAFT_CLIENT_RENDERER_ENTITY})