Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
libraryaddict 2021-01-25 08:17:11 +13:00
commit 11785d1842

View File

@ -76,6 +76,8 @@ SaveDisguises:
# ARMORSTANDS - Names are limited to 256 chars, uses a mix of armorstands and teams to do this. Slightly hacky. # ARMORSTANDS - Names are limited to 256 chars, uses a mix of armorstands and teams to do this. Slightly hacky.
# Downside of armorstand names is that there's a chance of it becoming desynced from the player disguise # Downside of armorstand names is that there's a chance of it becoming desynced from the player disguise
# And names will always display even if the entity is invisible using potion effects # And names will always display even if the entity is invisible using potion effects
# With ArmorStands & the Premium version, you can also use multiple lines in the nametag, use \n as a seperator.
# Read the next option for more information.
PlayerNames: TEAMS PlayerNames: TEAMS
# If doing ARMORSTANDS in the above option, should CustomNames be overridden to use armorstands too? # If doing ARMORSTANDS in the above option, should CustomNames be overridden to use armorstands too?
@ -347,4 +349,4 @@ PacketsEnabled:
# Added to support a Chinese Minecraft Server which uses their own skin server unless the UUID is not version 4. # Added to support a Chinese Minecraft Server which uses their own skin server unless the UUID is not version 4.
# Changing this from 4 to say, 3. Means their server will fetch skins from Mojang instead. # Changing this from 4 to say, 3. Means their server will fetch skins from Mojang instead.
UUIDVersion: 4 UUIDVersion: 4