backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-24 09:34:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/Containers
History
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
..
AbstractContainerMenu.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
AbstractContainerMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
AnimalChest.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
AnimalChest.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
AnvilMenu.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
AnvilMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
ArmorSlot.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ArmorSlot.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BeaconMenu.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BeaconMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
BrewingStandMenu.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
BrewingStandMenu.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ClientSideMerchant.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ClientSideMerchant.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
CompoundContainer.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
CompoundContainer.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
Container.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
ContainerMenu.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ContainerMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
CraftingContainer.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
CraftingContainer.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
CraftingMenu.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
CraftingMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
EnchantmentContainer.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
EnchantmentContainer.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
EnchantmentMenu.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
EnchantmentMenu.h refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
EnchantmentSlot.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FireworksMenu.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
FireworksMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
FurnaceMenu.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
FurnaceMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
FurnaceResultSlot.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
FurnaceResultSlot.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
HopperMenu.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
HopperMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
HorseInventoryMenu.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
HorseInventoryMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
Inventory.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Inventory.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
InventoryMenu.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
InventoryMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
MenuBackup.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
MenuBackup.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Merchant.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
MerchantContainer.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MerchantContainer.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
MerchantMenu.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MerchantMenu.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MerchantRecipe.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MerchantRecipe.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MerchantRecipeList.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
MerchantRecipeList.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MerchantResultSlot.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MerchantResultSlot.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MouseInventoryClickHandler.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
RepairContainer.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
RepairContainer.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
RepairResultSlot.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
RepairResultSlot.h chore: fmt (again) 2026-03-29 15:52:18 -05:00
ResultContainer.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ResultContainer.h chore: fmt (again) 2026-03-29 15:52:18 -05:00
ResultSlot.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ResultSlot.h chore: fmt (again) 2026-03-29 15:52:18 -05:00
SimpleContainer.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
SimpleContainer.h chore: fmt (again) 2026-03-29 15:52:18 -05:00
Slot.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Slot.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
TrapMenu.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
TrapMenu.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
WorldlyContainer.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00