vistaslayer/LegacyRenouveau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Revelations/main' into upstream-merge

Browse Source 
# Conflicts:
#	.github/workflows/nightly.yml
#	CMakeLists.txt
#	Minecraft.Client/CMakeLists.txt
#	Minecraft.Client/StringTable.cpp
#	Minecraft.Server/FourKitNatives.cpp
#	Minecraft.Server/Windows64/ServerMain.cpp
#	Minecraft.World/BiomeDecorator.cpp
#	Minecraft.World/BiomeSource.cpp
#	Minecraft.World/cmake/sources/Common.cmake
#	README.md
#	cmake/ServerTarget.cmake
This commit is contained in:
George V.
2026-04-28 03:01:30 +03:00
parent e776c55a2b 0df5cd865b
commit 2293dcbb9f
125 changed files with 4175 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/cmake/sources/Common.cmake
+5 -5
View File
@@ -106,6 +106,7 @@ set(_MINECRAFT_WORLD_COMMON_CONSOLEJAVALIBS_INPUTOUTPUTSTREAM
source_group("ConsoleJavaLibs/InputOutputStream" FILES ${_MINECRAFT_WORLD_COMMON_CONSOLEJAVALIBS_INPUTOUTPUTSTREAM})
set(_MINECRAFT_WORLD_COMMON_HEADER_FILES
"${CMAKE_CURRENT_SOURCE_DIR}/Debug.h"
"${CMAKE_CURRENT_SOURCE_DIR}/LevelObjectInputStream.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World.h"
"${CMAKE_CURRENT_SOURCE_DIR}/ParticleTypes.h"
@@ -432,8 +433,8 @@ set(_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_NETWORK_PACKET
"${CMAKE_CURRENT_SOURCE_DIR}/UseItemPacket.h"
"${CMAKE_CURRENT_SOURCE_DIR}/XZPacket.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/XZPacket.h"
"${CMAKE_CURRENT_SOURCE_DIR}/net.minecraft.network.packet.h"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/ParticleType.h"
"${CMAKE_CURRENT_SOURCE_DIR}/net.minecraft.network.packet.h"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/ParticleType.h"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/ParticleType.cpp"
)
source_group("net/minecraft/network/packet" FILES ${_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_NETWORK_PACKET})
@@ -852,9 +853,8 @@ set(_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_ENTITY_ITEM
"${CMAKE_CURRENT_SOURCE_DIR}/MinecartTNT.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/MinecartTNT.h"
"${CMAKE_CURRENT_SOURCE_DIR}/PrimedTnt.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/PrimedTnt.h"
"${CMAKE_CURRENT_SOURCE_DIR}/ArmorStand.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/PrimedTnt.h"
"${CMAKE_CURRENT_SOURCE_DIR}/ArmorStand.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/ArmorStand.h"
"${CMAKE_CURRENT_SOURCE_DIR}/net.minecraft.world.entity.item.h"
)