backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-24 07:33:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.Client/Textures
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
..
Packs Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Stitching Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
BufferedImage.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:28:11 +11:00
BufferedImage.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ClockTexture.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ClockTexture.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
CompassTexture.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
CompassTexture.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
HttpTexture.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
HttpTexture.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
HttpTextureProcessor.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
MemTexture.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MemTexture.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
MemTextureProcessor.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
MobSkinMemTextureProcessor.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MobSkinMemTextureProcessor.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
MobSkinTextureProcessor.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MobSkinTextureProcessor.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
ResourceLocation.h TU19: merge Minecraft.Client/Textures 2026-03-21 22:46:45 -05:00
Texture.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Texture.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
TextureAtlas.cpp TU19: merge Minecraft.Client/Textures 2026-03-21 22:46:45 -05:00
TextureAtlas.h TU19: merge Minecraft.Client/Textures 2026-03-21 22:46:45 -05:00
TextureHolder.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
TextureHolder.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
TextureManager.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
TextureManager.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Textures.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Textures.h feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00