MatthewBeshay a104252557 Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 ...

# Conflicts:
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.World/IO/Files/File.cpp

2026-03-30 15:28:11 +11:00

..

Audio

Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2

2026-03-30 15:28:11 +11:00

Colours

TU19: merge ColourTable

2026-03-22 15:46:03 -05:00

DLC

cleanup: flatten dead branches in common app and ui code

2026-03-26 20:18:29 +11:00

GameRules

Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2

2026-03-30 15:21:08 +11:00

Leaderboards

Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2

2026-03-30 15:21:08 +11:00

Network

Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2

2026-03-30 15:21:08 +11:00

Telemetry

cleanup: flatten dead branches in common app and ui code

2026-03-26 20:18:29 +11:00

Trial

refactor: move Common to Platform/Common

2026-03-09 00:17:42 -05:00

Tutorial

Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2

2026-03-30 15:21:08 +11:00

UI

Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2

2026-03-30 15:28:11 +11:00

XML

cleanup: flatten dead branches in common app and ui code

2026-03-26 20:18:29 +11:00

zlib

refactor: move Common to Platform/Common

2026-03-09 00:17:42 -05:00

App_Defines.h

cleanup: flatten dead branches in common app and ui code

2026-03-26 20:18:29 +11:00

App_enums.h

cleanup: flatten dead branches in common app and ui code

2026-03-26 20:18:29 +11:00

App_structs.h

cleanup: flatten dead branches in common app and ui code

2026-03-26 20:18:29 +11:00

BuildVer.h

update buildver to 1.6.0560

2026-03-23 01:46:21 +03:00

C4JMemoryPool.h

refactor: move Common to Platform/Common

2026-03-09 00:17:42 -05:00

C4JMemoryPoolAllocator.h

fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h

2026-03-09 00:34:09 -05:00

Console_Awards_enum.h

cleanup: flatten dead branches in common app and ui code

2026-03-26 20:18:29 +11:00

Console_Debug_enum.h

build fixes

2026-03-22 00:10:15 -05:00

Console_Utils.cpp

cleanup: flatten dead branches in common app and ui code

2026-03-26 20:18:29 +11:00

ConsoleGameMode.cpp

refactor: move Common to Platform/Common

2026-03-09 00:17:42 -05:00

ConsoleGameMode.h

refactor: move Common to Platform/Common

2026-03-09 00:17:42 -05:00

Consoles_App.cpp

Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2

2026-03-30 15:28:11 +11:00

Consoles_App.h

cleanup: flatten dead branches in common app and ui code

2026-03-26 20:18:29 +11:00

Minecraft_Macros.h

Use fixed-width casts in skin bitmask macros

2026-03-11 15:38:51 +11:00

Potion_Macros.h

refactor: move Common to Platform/Common

2026-03-09 00:17:42 -05:00

ShutdownManager.h

checkpoint: refresh supported-path portability baseline

2026-03-26 17:05:31 +11:00

xuiscene_base.h

refactor: move Common to Platform/Common

2026-03-09 00:17:42 -05:00