Merge remote-tracking branch 'upstream/main'

Browse Source

# Conflicts:
#	CMakeLists.txt
#	Minecraft.Client/CMakeLists.txt
#	Minecraft.Client/ClientConnection.cpp
#	Minecraft.Client/Common/Media/MediaWindows64.arc
#	Minecraft.Client/Common/UI/UIControl_TextInput.cpp
#	Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
#	Minecraft.Client/Gui.cpp
#	Minecraft.Client/PlayerList.cpp
#	Minecraft.Client/ServerPlayerGameMode.cpp
#	Minecraft.Client/Windows64/KeyboardMouseInput.h
#	Minecraft.Client/Windows64Media/strings.h
#	Minecraft.Client/cmake/sources/Windows.cmake
#	Minecraft.Server/CMakeLists.txt
#	Minecraft.Server/ServerProperties.cpp
#	Minecraft.Server/ServerProperties.h
#	Minecraft.Server/Windows64/ServerMain.cpp
#	Minecraft.Server/cmake/sources/Common.cmake
#	Minecraft.World/cmake/sources/Common.cmake
#	README.md

...

This commit is contained in:

itsRevela

2026-03-23 12:29:00 -05:00

parent cbc0617dcd 77433dbd86

commit e1446953c4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available