Merge remote-tracking branch 'origin/main' into dec-2014

Browse Source

# Conflicts:
#	.gitignore
#	Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
#	Minecraft.Client/LevelRenderer.h

...

This commit is contained in:

Loki Rautio

2026-03-01 13:39:01 -06:00

parent 1cb1fb5fce 9382049029

commit 7cdcbeadd4

4 changed files with 19 additions and 20 deletions

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

BIN

Minecraft.Client/Windows64/GameHDD/20140401093851/saveData.ms

Binary file not shown.