backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-28 11:23:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/WorldGen/Features
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
..
BasicTreeFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BasicTreeFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BirchFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BirchFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BonusChestFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BonusChestFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
CactusFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
CactusFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
CanyonFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
CanyonFeature.h refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
CaveFeature.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
CaveFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ClayFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
ClayFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DeadBushFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
DeadBushFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DesertWellFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
DesertWellFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DungeonFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
DungeonFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
EndPodiumFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
EndPodiumFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Feature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
Feature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
FlowerFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
FlowerFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
GroundBushFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
GroundBushFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
HellFireFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
HellFireFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
HellPortalFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
HellPortalFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
HellSpringFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
HellSpringFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
HouseFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
HouseFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
HugeMushroomFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
HugeMushroomFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
LakeFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
LakeFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
LargeCaveFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
LargeCaveFeature.h refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
LargeFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
LargeFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
LargeHellCaveFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
LargeHellCaveFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
LightGemFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
LightGemFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MegaTreeFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MegaTreeFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MineShaftFeature.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
MineShaftFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
MonsterRoomFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MonsterRoomFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
NetherBridgeFeature.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
NetherBridgeFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
NetherSphereFeature.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
NetherSphereFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
OreFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
OreFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
PineFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
PineFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
PumpkinFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
PumpkinFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
RandomScatteredLargeFeature.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
RandomScatteredLargeFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
ReedsFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ReedsFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SandFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
SandFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SpikeFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
SpikeFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SpringFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
SpringFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SpruceFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
SpruceFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
StrongholdFeature.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
StrongholdFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
StructureFeature.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
StructureFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
SwampTreeFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
SwampTreeFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TallGrassFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
TallGrassFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TownFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TreeFeature.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
TreeFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
VillageFeature.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
VillageFeature.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
VinesFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
VinesFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WaterlilyFeature.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
WaterlilyFeature.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00