backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-22 09:03:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/Enchantments
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
..
ArrowDamageEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ArrowDamageEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ArrowFireEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ArrowFireEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ArrowInfiniteEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ArrowInfiniteEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ArrowKnockbackEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ArrowKnockbackEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DamageEnchantment.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
DamageEnchantment.h TU19: merge Minecraft.World/Enchantments 2026-03-21 15:55:35 -05:00
DigDurabilityEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DigDurabilityEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DiggingEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DiggingEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Enchantment.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Enchantment.h fix(jui): forward port (w)string overloads for item hover texts from TU18 2026-03-24 07:08:14 +03:00
EnchantmentCategory.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
EnchantmentCategory.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
EnchantmentHelper.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
EnchantmentHelper.h TU19: merge Minecraft.World/Enchantments 2026-03-21 15:55:35 -05:00
EnchantmentInstance.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
EnchantmentInstance.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FireAspectEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FireAspectEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
KnockbackEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
KnockbackEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
LootBonusEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
LootBonusEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
OxygenEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
OxygenEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ProtectionEnchantment.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ProtectionEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ThornsEnchantment.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ThornsEnchantment.h TU19: merge Minecraft.World/Enchantments 2026-03-21 15:55:35 -05:00
UntouchingEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
UntouchingEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WaterWorkerEnchantment.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WaterWorkerEnchantment.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00