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

feat: oceanMonument

2026-04-07 19:41:14 +02:00

DLC

fix: handled all audio and parameter types correctly to prevent crashes

2026-04-07 09:30:16 +02:00

DummyTexturePack/res

Initial commit

2026-03-01 12:16:08 +08:00

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-03-24 10:05:40 -05:00

Trial

add support for linux clang cross compiles

2026-03-24 10:05:40 -05:00

Tutorial

fix: rename tutorial

2026-04-05 23:42:25 +03: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

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

Initial commit

2026-03-01 12:16:08 +08:00

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

feat: TU19 (Dec 2014) Features & Content (#155)

2026-03-03 03:04:10 +08:00

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

Initial commit

2026-03-01 12:16:08 +08:00

PostProcesser.h

Fix split-screen UI wrong positioning on window resize (#989)

2026-03-08 22:16:58 -05:00

Potion_Macros.h

feat: TU19 (Dec 2014) Features & Content (#155)

2026-03-03 03:04:10 +08:00

xuiscene_base.h

…