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:
@@ -452,6 +452,10 @@ enum eMinecraftColour
|
||||
eMinecraftColour_Mob_Rabbit_Colour2,
|
||||
eMinecraftColour_Mob_Endermite_Colour1,
|
||||
eMinecraftColour_Mob_Endermite_Colour2,
|
||||
eMinecraftColour_Mob_Guardian_Colour1,
|
||||
eMinecraftColour_Mob_Guardian_Colour2,
|
||||
eMinecraftColour_Mob_ElderGuardian_Colour1,
|
||||
eMinecraftColour_Mob_ElderGuardian_Colour2,
|
||||
|
||||
eMinecraftColour_Armour_Default_Leather_Colour,
|
||||
|
||||
|
||||
Reference in New Issue
Block a user