Merge remote-tracking branch 'upstream/main'

Browse Source

# Conflicts:
#	Minecraft.Client/Common/Media/MediaWindows64.arc
#	Minecraft.Client/Common/UI/UIControl_TextInput.cpp

...

This commit is contained in:

itsRevela

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

parent 712ae60a6f 57f031a7c8

commit 58c73d1052

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