Rebase fixes and changelog

CHANGELOG.md

@@ -49,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Airships can now have sprites, which can be interacted with.
 - Some sprites can be sat on.
 - Pet birds can now sit on the player's shoulder as they explore the world.
+- Adlet caves
 
 ### Changed
 

common/src/terrain/sprite.rs

@@ -657,11 +657,11 @@ impl SpriteKind {
                 | SpriteKind::Gravestone
                 | SpriteKind::MagicalBarrier
                 | SpriteKind::Helm
-                | SpriteKind::DoorWide,
+                | SpriteKind::DoorWide
                 | SpriteKind::BoneKeyhole
                 | SpriteKind::BoneKeyDoor
                 | SpriteKind::IceCrystal
-                | SpriteKind::GlowIceCrystal
+                | SpriteKind::GlowIceCrystal,
         )
     }
 }

voxygen/anim/src/biped_large/mod.rs

@@ -618,6 +618,7 @@ fn mount_point(body: &Body) -> Vec3<f32> {
         (Huskbrute, _) => (0.0, 3.0, 3.0),
         (Tursus, _) => (0.0, 2.0, 3.0),
         (Gigasfrost, _) => (1.0, 2.0, 4.0),
+        (AdletElder, _) => (0.0, 0.0, -1.0),
     }
     .into()
 }