backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-29 03:26:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/Items
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
..
TileItems refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ArmorItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ArmorItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
BedItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
BedItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BoatItem.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
BoatItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
BookItem.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BookItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BottleItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BottleItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
BowItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BowItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BowlFoodItem.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BowlFoodItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BucketItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BucketItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
CarrotOnAStickItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
CarrotOnAStickItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ClockItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ClockItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
CoalItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
CoalItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
CompassItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
CompassItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ComplexItem.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ComplexItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DiggerItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
DiggerItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
DoorItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
DoorItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DyePowderItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
DyePowderItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
EggItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
EggItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
EmptyMapItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
EmptyMapItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
EnchantedBookItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
EnchantedBookItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
EnderEyeItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
EnderEyeItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
EnderPearlItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
EnderPearlItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
ExperienceItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
ExperienceItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
FireChargeItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
FireChargeItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FireworksChargeItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
FireworksChargeItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
FireworksItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
FireworksItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
FishingRodItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
FishingRodItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
FlintAndSteelItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
FlintAndSteelItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FoodItem.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
FoodItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
GoldenAppleItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
GoldenAppleItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
HangingEntityItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
HangingEntityItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
HatchetItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
HatchetItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
HoeItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
HoeItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Item.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Item.h fix(jui): forward port (w)string overloads for item hover texts from TU18 2026-03-24 07:08:14 +03:00
ItemInstance.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
ItemInstance.h fix(jui): forward port (w)string overloads for item hover texts from TU18 2026-03-24 07:08:14 +03:00
LeashItem.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
LeashItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
MapItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MapItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
MilkBucketItem.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MilkBucketItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MinecartItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
MinecartItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
NameTagItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
NameTagItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
PickaxeItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
PickaxeItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
PotionItem.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
PotionItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
RecordingItem.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
RecordingItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
RedstoneItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
RedstoneItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SaddleItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
SaddleItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
SeedFoodItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
SeedFoodItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SeedItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
SeedItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ShearsItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
ShearsItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
ShovelItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ShovelItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SignItem.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
SignItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SimpleFoiledItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
SimpleFoiledItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
SnowballItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
SnowballItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SnowItem.cpp refactor: make Tile::getAABB return optional<AABB> 2026-03-28 00:11:19 -05:00
SnowItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
SpawnEggItem.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
SpawnEggItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
WeaponItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
WeaponItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
WrittenBookItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00