str1k3r/MCLEClient
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source 
# Conflicts:
#	Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
#	Minecraft.Client/Minecraft.Client.vcxproj
#	Minecraft.Client/Minecraft.Client.vcxproj.filters
#	Minecraft.Server/Minecraft.Server.vcxproj
#	Minecraft.World/Minecraft.World.vcxproj
#	Minecraft.World/Minecraft.World.vcxproj.filters
#	README.md
This commit is contained in:
Revela committed 2026-03-17 17:26:40 -05:00
2 parents e786604228 b1eb9a34a4
commit b58f7c8fdd
111 files changed
+8188 -73058
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Minecraft.World/cmake/sources/Common.cmake
+2143
View File
File diff suppressed because it is too large. Load diff
Minecraft.World/cmake/sources/Durango.cmake
+9
View File
@@ -0,0 +1,9 @@
set(_MINECRAFT_WORLD_DURANGO_NET_MINECRAFT_STATS
"${CMAKE_CURRENT_SOURCE_DIR}/DurangoStats.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/DurangoStats.h"
)
source_group("net/minecraft/stats" FILES ${_MINECRAFT_WORLD_DURANGO_NET_MINECRAFT_STATS})
set(MINECRAFT_WORLD_DURANGO
${_MINECRAFT_WORLD_DURANGO_NET_MINECRAFT_STATS}
)