backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-24 14:02:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/Items/TileItems
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
..
AnvilTileItem.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
AnvilTileItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
AuxDataTileItem.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
AuxDataTileItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ColoredTileItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
ColoredTileItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
LeafTileItem.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
LeafTileItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MultiTextureTileItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
MultiTextureTileItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
PistonTileItem.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
PistonTileItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
PlanterTileItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
PlanterTileItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SaplingTileItem.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SaplingTileItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SkullItem.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
SkullItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
StoneSlabTileItem.cpp refactor: make Tile::getAABB return optional<AABB> 2026-03-28 00:11:19 -05:00
StoneSlabTileItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TileItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
TileItem.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WaterLilyTileItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
WaterLilyTileItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
WoolTileItem.cpp TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
WoolTileItem.h TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00