MatthewBeshay a0fdc643d1 Merge branch 'upstream-dev' into cleanup/nullptr-replacement ... # Conflicts: # Minecraft.Client/Network/PlayerChunkMap.cpp # Minecraft.Client/Network/PlayerList.cpp # Minecraft.Client/Network/ServerChunkCache.cpp # Minecraft.Client/Platform/Common/Consoles_App.cpp # Minecraft.Client/Platform/Common/DLC/DLCManager.cpp # Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp # Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp # Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp # Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp # Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp # Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp # Minecraft.Client/Platform/Common/UI/UIController.cpp # Minecraft.Client/Platform/Common/UI/UIController.h # Minecraft.Client/Platform/Extrax64Stubs.cpp # Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h # Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h # Minecraft.Client/Player/EntityTracker.cpp # Minecraft.Client/Player/ServerPlayer.cpp # Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp # Minecraft.Client/Textures/Packs/DLCTexturePack.cpp # Minecraft.Client/Textures/Stitching/StitchedTexture.cpp # Minecraft.Client/Textures/Stitching/TextureMap.cpp # Minecraft.Client/Textures/Textures.cpp # Minecraft.World/Blocks/NotGateTile.cpp # Minecraft.World/Blocks/PressurePlateTile.cpp # Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp # Minecraft.World/Enchantments/EnchantmentHelper.cpp # Minecraft.World/Entities/HangingEntity.cpp # Minecraft.World/Entities/LeashFenceKnotEntity.cpp # Minecraft.World/Entities/LivingEntity.cpp # Minecraft.World/Entities/Mobs/Boat.cpp # Minecraft.World/Entities/Mobs/Minecart.cpp # Minecraft.World/Entities/Mobs/Witch.cpp # Minecraft.World/Entities/SyncedEntityData.cpp # Minecraft.World/Items/LeashItem.cpp # Minecraft.World/Items/PotionItem.cpp # Minecraft.World/Level/BaseMobSpawner.cpp # Minecraft.World/Level/CustomLevelSource.cpp # Minecraft.World/Level/Level.cpp # Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp # Minecraft.World/Level/Storage/McRegionLevelStorage.cpp # Minecraft.World/Level/Storage/RegionFileCache.cpp # Minecraft.World/Player/Player.cpp # Minecraft.World/WorldGen/Biomes/BiomeCache.cpp # Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp # Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp		2026-03-30 16:28:40 +11:00
..
ArchiveFile.cpp	Merge branch 'upstream-dev' into cleanup/nullptr-replacement	2026-03-30 16:28:40 +11:00
ArchiveFile.h	chore: format Minecraft.Client	2026-03-13 17:10:10 -05:00
FrameProfiler.cpp	perf(render): optimise tile entity cleanup and profiling	2026-03-29 20:56:00 -05:00
FrameProfiler.h	perf(render): optimise tile entity cleanup and profiling	2026-03-29 20:56:00 -05:00
MemoryTracker.cpp	refactor: expand AUTO_VAR macro	2026-03-29 23:59:05 -05:00
MemoryTracker.h	chore: format Minecraft.Client	2026-03-13 17:10:10 -05:00
StringTable.cpp	refactor: expand AUTO_VAR macro	2026-03-29 23:59:05 -05:00
StringTable.h	cleanup: flatten dead branches in client render texture and runtime code	2026-03-26 20:29:59 +11:00
Timer.cpp	refactor: replace double-underscore MSVC integer types with stdint	2026-03-30 00:08:25 -05:00
Timer.h	refactor: replace double-underscore MSVC integer types with stdint	2026-03-30 00:08:25 -05:00
WstringLookup.cpp	chore: format Minecraft.Client	2026-03-13 17:10:10 -05:00
WstringLookup.h	chore: format Minecraft.Client	2026-03-13 17:10:10 -05:00