backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-29 19:13:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/Containers
History
MatthewBeshay 6000900285 Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 
# Conflicts:
#	Minecraft.Client/Level/ServerLevel.cpp
#	Minecraft.Client/Minecraft.cpp
#	Minecraft.Client/MinecraftServer.cpp
#	Minecraft.Client/Network/ClientConnection.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Death.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp
#	Minecraft.Client/Platform/Durango/Durango_Minecraft.cpp
#	Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp
#	Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
#	Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
#	Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp
#	Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/stdafx.h
#	Minecraft.Client/Player/LocalPlayer.cpp
#	Minecraft.Client/Rendering/Chunk.cpp
#	Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp
#	Minecraft.Client/Rendering/GameRenderer.cpp
#	Minecraft.Client/Rendering/LevelRenderer.cpp
#	Minecraft.Client/Textures/BufferedImage.cpp
#	Minecraft.Client/UI/Screens/AchievementScreen.cpp
#	Minecraft.Client/UI/Screens/ContainerScreen.cpp
#	Minecraft.Client/UI/Screens/TrapScreen.cpp
#	Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
#	Minecraft.World/IO/Files/File.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/Util/C4JThread.cpp
2026-03-30 15:21:08 +11:00
..
AbstractContainerMenu.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05: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 TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
AnvilMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
ArmorSlot.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
ArmorSlot.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BeaconMenu.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
BeaconMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
BrewingStandMenu.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
BrewingStandMenu.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ClientSideMerchant.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
ClientSideMerchant.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
CompoundContainer.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05: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 cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
ContainerMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
CraftingContainer.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
CraftingContainer.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
CraftingMenu.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05: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 TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05: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 TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
FireworksMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
FurnaceMenu.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05: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 TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
HopperMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
HorseInventoryMenu.cpp wip: removing vec3 tls 2026-03-26 01:10:27 -05:00
HorseInventoryMenu.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
Inventory.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
Inventory.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
InventoryMenu.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05: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 TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
MerchantContainer.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
MerchantMenu.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
MerchantMenu.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MerchantRecipe.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MerchantRecipe.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MerchantRecipeList.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
MerchantRecipeList.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MerchantResultSlot.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05: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 TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
RepairResultSlot.h chore: fmt (again) 2026-03-29 15:52:18 -05:00
ResultContainer.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
ResultContainer.h chore: fmt (again) 2026-03-29 15:52:18 -05:00
ResultSlot.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
ResultSlot.h chore: fmt (again) 2026-03-29 15:52:18 -05:00
SimpleContainer.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
SimpleContainer.h chore: fmt (again) 2026-03-29 15:52:18 -05:00
Slot.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
Slot.h TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05:00
TrapMenu.cpp TU19: merge Minecraft.World/Containers 2026-03-21 15:18:52 -05: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