backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-27 20:33:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/Blocks/TileEntities
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
..
BeaconTileEntity.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
BeaconTileEntity.h refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
BrewingStandTileEntity.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BrewingStandTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
ChestTileEntity.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
ChestTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
CommandBlockEntity.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
CommandBlockEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
ComparatorTileEntity.cpp TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
ComparatorTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
DaylightDetectorTileEntity.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
DaylightDetectorTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
DispenserTileEntity.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
DispenserTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
DropperTileEntity.cpp TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
DropperTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
EnchantmentTableTileEntity.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
EnchantmentTableTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
EnderChestTileEntity.cpp TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
EnderChestTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
EntityTile.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
FurnaceTileEntity.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
FurnaceTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
Hopper.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
HopperTileEntity.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
HopperTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
MobSpawnerTileEntity.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MobSpawnerTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
MusicTileEntity.cpp TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
MusicTileEntity.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
PistonPieceTileEntity.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
PistonPieceTileEntity.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
PotionBrewing.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
PotionBrewing.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
SignTileEntity.cpp refactor: replace some win32 typedefs 2026-03-30 00:16:26 -05:00
SignTileEntity.h TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
SkullTileEntity.cpp TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
SkullTileEntity.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TheEndPortalTileEntity.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TheEndPortalTileEntity.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TileEntity.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
TileEntity.h perf(render): optimise tile entity cleanup and profiling 2026-03-29 20:56:00 -05:00