Fireblade 0ed96f1592 fix: resolve merge conflicts and integrate XML locale updates (#1) ...

Resolve merge conflicts across multiple components
Merge and synchronize XML locale changes
Ensure consistency between string resources and localization files
Minor fixes to restore successful builds after merge

2026-04-11 02:47:59 +03:00

..

Audio

Merge branch 'main-re' into upstream-merge

2026-04-10 22:00:17 +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

fix: resolve merge conflicts and integrate XML locale updates (#1)

2026-04-11 02:47:59 +03:00

Network

fix: resolve merge conflicts and integrate XML locale updates (#1)

2026-04-11 02:47:59 +03:00

res

feat: oceanMonument

2026-04-07 19:41:14 +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

fix: resolve merge conflicts and integrate XML locale updates (#1)

2026-04-11 02:47:59 +03:00

XUI

Merge branch 'main-re' into upstream-merge

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

zlib

…

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

…

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

fix: resolve merge conflicts and integrate XML locale updates (#1)

2026-04-11 02:47:59 +03:00

Consoles_App.h

fix: resolve merge conflicts and integrate XML locale updates (#1)

2026-04-11 02:47:59 +03:00

Minecraft_Macros.h

…

PostProcesser.h

…

Potion_Macros.h

…

xuiscene_base.h

…