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
..
Iggy	refactor meson and final gles support, cleaner gdraw	2026-03-29 20:55:58 -05:00
Leaderboards	chore: format Minecraft.Client	2026-03-13 17:10:10 -05:00
Sentient	refactor: replace some win32 typedefs	2026-03-30 00:16:26 -05:00
Social	chore: format Minecraft.Client	2026-03-13 17:10:10 -05:00
Stubs	Merge branch 'upstream-dev' into cleanup/nullptr-replacement	2026-03-30 16:28:40 +11:00
Linux_App.cpp	Merge branch 'upstream-dev' into cleanup/nullptr-replacement	2026-03-30 16:28:40 +11:00
Linux_App.h	refactor: replace NULL with nullptr across C++ codebase	2026-03-30 16:25:52 +11:00
linux_game_stubs.cpp	cleanup: remove console platform code from shared includes and build paths	2026-03-26 17:53:37 +11:00
Linux_Minecraft.cpp	Merge branch 'upstream-dev' into cleanup/nullptr-replacement	2026-03-30 16:28:40 +11:00
Linux_ShutdownManager.cpp	checkpoint: refresh supported-path portability baseline	2026-03-26 17:05:31 +11:00
Linux_UIController.cpp	fix(linux): increase iggy render-target budget to 64mb	2026-03-29 20:55:59 -05:00
Linux_UIController.h	TU19: merge Minecraft.Client/Platform/Common/Tutorial	2026-03-22 03:51:48 -05:00
LinuxGL.cpp	Cleaned up linuxGL.cpp	2026-03-29 20:55:58 -05:00
LinuxGL.h	move LinuxGL.h to Platform/Linux	2026-03-13 17:15:44 -05:00