4jcraft/Minecraft.World/Level
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
..
Dimensions refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Events Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Storage Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
BaseMobSpawner.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
BaseMobSpawner.h fix: resolve all build warnings and notes 2026-03-23 18:53:18 +11:00
BlockDestructionProgress.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BlockDestructionProgress.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BlockGenMethods.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BlockGenMethods.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BlockReplacements.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BlockReplacements.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Calendar.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Calendar.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
ChunkPos.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
ChunkPos.h wip: removing vec3 tls 2026-03-26 01:10:27 -05:00
ChunkSource.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
CustomLevelSource.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
CustomLevelSource.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
DerivedLevelData.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
DerivedLevelData.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
EmptyLevelChunk.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
EmptyLevelChunk.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Explosion.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Explosion.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
GameRules.cpp refactor: expand AUTO_VAR macro 2026-03-29 23:59:05 -05:00
GameRules.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Level.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Level.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
LevelChunk.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
LevelChunk.h cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
LevelConflictException.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
LevelConflictException.h refactor: replace double-underscore MSVC integer types with stdint 2026-03-30 00:08:25 -05:00
LevelData.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
LevelData.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
RandomLevelSource.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
RandomLevelSource.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Redstone.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Redstone.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
TickNextTickData.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
TickNextTickData.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
TileEventData.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TileEventData.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TilePos.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TilePos.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WaterLevelChunk.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
WaterLevelChunk.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00