backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-15 08:22:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/WorldGen/Biomes
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
..
BeachBiome.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
BeachBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Biome.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Biome.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
BiomeCache.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
BiomeCache.h build fixes 2026-03-21 19:19:31 -05:00
BiomeDecorator.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BiomeDecorator.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BiomeSource.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
BiomeSource.h cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
DesertBiome.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
DesertBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ExtremeHillsBiome.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
ExtremeHillsBiome.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
FixedBiomeSource.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
FixedBiomeSource.h TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
ForestBiome.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ForestBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
HellBiome.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
HellBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
IceBiome.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
IceBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
JungleBiome.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
JungleBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MushroomIslandBiome.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MushroomIslandBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
OceanBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
PlainsBiome.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
PlainsBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
RainforestBiome.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
RainforestBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
RiverBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SwampBiome.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
SwampBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TaigaBiome.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TaigaBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TheEndBiome.cpp TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
TheEndBiome.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00