Merge branch 'main' into pr/win64-world-saves

Browse Source

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

...

This commit is contained in:

Loki Rautio

2026-03-04 03:56:03 -06:00

parent c9d58eeac7 ef9b6fd500

commit 42aec6dac5

2117 changed files with 274623 additions and 140442 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

1440

Minecraft.Client/MinecraftServer.cpp

File diff suppressed because it is too large Load Diff