Merge remote-tracking branch 'itsRevela/main' into upstream-merge
# Conflicts: # Minecraft.Client/Common/Audio/SoundNames.cpp # Minecraft.Client/SheepRenderer.cpp # Minecraft.World/SoundTypes.h # README.md # cmake/CopyAssets.cmake
This commit is contained in:
@@ -7,16 +7,19 @@ function(setup_asset_folder_copy TARGET_NAME ASSET_FOLDER_PAIRS)
|
||||
"*.xml" "*.lang"
|
||||
"*.bat" "*.cmd"
|
||||
"*.msscmp" "*.binka" # Old audio formats
|
||||
#"*.swf" # These are built into the .arc
|
||||
"*.swf"
|
||||
"*.resx" #"*.loc"
|
||||
"*.wav" # Unsupported audio format
|
||||
"*.xui"
|
||||
"*.xui" "*.xgs"
|
||||
"*.xwb" "*.xsb"
|
||||
"*.xap" "*.xzp"
|
||||
)
|
||||
|
||||
# Global folder exclusions applied to every folder copy
|
||||
# set(ASSET_EXCLUDE_FOLDERS
|
||||
# "Graphics"
|
||||
# )
|
||||
set(ASSET_EXCLUDE_FOLDERS
|
||||
#"Graphics"
|
||||
"Gamerules"
|
||||
)
|
||||
|
||||
# Exclude platform-specific media folders
|
||||
set(PLATFORM_MEDIA_FOLDERS
|
||||
|
||||
Reference in New Issue
Block a user