George V. ac7a207597 Merge branch 'main' into upstream-merge ...

# Conflicts:
#	Minecraft.Client/Windows64Media/strings.h
#	Minecraft.World/BiomeSource.cpp
#	Minecraft.World/BiomeSource.h

2026-04-13 22:26:43 +03:00

..

Audio

Merge remote-tracking branch 'itsRevela/main' into upstream-merge

2026-04-13 17:54:36 +03:00

Colours

changed: guardians placeholders

2026-04-13 18:21:58 +02:00

DLC

add support for linux clang cross compiles

2026-04-08 12:03:15 +03:00

DummyTexturePack/res

…

GameRules

add support for linux clang cross compiles

2026-04-08 12:03:15 +03:00

Leaderboards

add support for linux clang cross compiles

2026-04-08 12:03:15 +03:00

Media

Merge branch 'main' into upstream-merge

2026-04-13 22:26:43 +03:00

Network

Merge remote-tracking branch 'itsRevela/main' into upstream-merge

2026-04-13 17:54:36 +03:00

res

changed: guardians placeholders

2026-04-13 18:21:58 +02:00

Telemetry

add support for linux clang cross compiles

2026-04-08 12:03:15 +03:00

Trial

add support for linux clang cross compiles

2026-04-08 12:03:15 +03:00

Tutorial

Revert "fix: tutorial world"

2026-04-08 13:00:44 -05:00

UI

Merge branch 'main' into upstream-merge

2026-04-13 22:26:43 +03:00

XUI

Merge branch 'main-re' into upstream-merge

2026-04-10 22:00:17 +03:00

zlib

…

App_Defines.h

…

App_enums.h

Merge branch 'main' into upstream-merge

2026-04-13 22:26:43 +03:00

App_structs.h

…

C4JMemoryPool.h

…

C4JMemoryPoolAllocator.h

add support for linux clang cross compiles

2026-04-08 12:03:15 +03:00

Console_Awards_enum.h

…

Console_Debug_enum.h

…

Console_Utils.cpp

add support for linux clang cross compiles

2026-04-08 12:03:15 +03:00

ConsoleGameMode.cpp

add support for linux clang cross compiles

2026-04-08 12:03:15 +03:00

ConsoleGameMode.h

add support for linux clang cross compiles

2026-04-08 12:03:15 +03:00

Consoles_App.cpp

Merge remote-tracking branch 'itsRevela/main' into upstream-merge

2026-04-13 17:54:36 +03:00

Consoles_App.h

Merge remote-tracking branch 'itsRevela/main' into upstream-merge

2026-04-13 17:54:36 +03:00

Minecraft_Macros.h

…

PostProcesser.h

…

Potion_Macros.h

…

xuiscene_base.h

…