George V. 1a78363ee5 Merge branch 'main' into upstream-merge ... # Conflicts: # Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp # Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp # Minecraft.Client/Common/UI/UIScene_LoadMenu.h		2026-04-11 23:36:43 +03:00
..
Audio	Merge branch 'main' into upstream-merge	2026-04-11 02:52:52 +03:00
Colours	add support for linux clang cross compiles	2026-04-08 12:03:15 +03: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-11 23:36:43 +03:00
Network	fix: resolve merge conflicts and integrate XML locale updates (#1)	2026-04-11 02:47:59 +03:00
res	feat: Guardians	2026-04-10 14:03:32 +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-11 23:36:43 +03:00
XUI	Merge branch 'main-re' into upstream-merge	2026-04-10 22:00:17 +03:00
zlib	Modernize project codebase (#906)	2026-03-08 18:08:36 -05:00
App_Defines.h	feat: uncapped FPS when VSync off, fix graphics settings bitmask collision	2026-03-30 15:36:08 -05:00
App_enums.h	Merge remote-tracking branch 'itsRevela/main'	2026-04-09 15:21:43 +03:00
App_structs.h	Save FOV value to settings (#670)	2026-03-06 16:38:16 -06:00
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	feat: replace ArchiveFile with FolderFile for media asset loading	2026-04-11 18:57:54 +03:00
Consoles_App.h	feat: replace ArchiveFile with FolderFile for media asset loading	2026-04-11 18:57:54 +03:00
Minecraft_Macros.h
PostProcesser.h	Fix split-screen UI wrong positioning on window resize (#989)	2026-03-08 22:16:58 -05:00
Potion_Macros.h
xuiscene_base.h