Merge branch 'main' into upstream-merge
# Conflicts: # Minecraft.Client/Windows64Media/strings.h # Minecraft.World/BiomeSource.cpp # Minecraft.World/BiomeSource.h
This commit is contained in:
@@ -1631,6 +1631,8 @@ source_group("net/minecraft/world/level/material" FILES ${_MINECRAFT_WORLD_COMMO
|
||||
set(_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_LEVEL_NEWBIOME_LAYER
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/AddIslandLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/AddIslandLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/AddEdgeLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/AddEdgeLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/AddMushroomIslandLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/AddMushroomIslandLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/AddSnowLayer.cpp"
|
||||
@@ -1639,6 +1641,8 @@ set(_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_LEVEL_NEWBIOME_LAYER
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/BiomeInitLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/BiomeOverrideLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/BiomeOverrideLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/BiomeEdgeLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/BiomeEdgeLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/DownfallLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/DownfallLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/DownfallMixerLayer.cpp"
|
||||
@@ -1655,8 +1659,12 @@ set(_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_LEVEL_NEWBIOME_LAYER
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/IslandLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/Layer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/Layer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/ImposeContinentsLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/ImposeContinentsLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/RegionHillsLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/RegionHillsLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/RareBiomeSpotLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/RareBiomeSpotLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/RiverInitLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/RiverInitLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/RiverLayer.cpp"
|
||||
@@ -1685,6 +1693,8 @@ set(_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_LEVEL_NEWBIOME_LAYER
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/RemoveTooMuchOceanLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/RareBiomeLayer.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/RareBiomeLayer.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/CustomizableSourceSettings.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/CustomizableSourceSettings.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/net.minecraft.world.level.newbiome.layer.h"
|
||||
)
|
||||
source_group("net/minecraft/world/level/newbiome/layer" FILES ${_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_LEVEL_NEWBIOME_LAYER})
|
||||
|
||||
Reference in New Issue
Block a user