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:
@@ -260,6 +260,8 @@ enum eSOUND_TYPE
|
||||
eSoundType_ITEM_ARMOR_equipGeneric5,
|
||||
eSoundType_ITEM_ARMOR_equipGeneric6,
|
||||
|
||||
eSoundType_DAMAGE_CRITICAL,
|
||||
|
||||
eSoundType_MAX
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user