From 20a8788eee0954105583d2e2b91145f46dadb2ef Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sat, 13 May 2023 09:38:10 -0400
Subject: [PATCH] Rebase fixes and changelog

---
 CHANGELOG.md                        | 1 +
 common/src/terrain/sprite.rs        | 4 ++--
 voxygen/anim/src/biped_large/mod.rs | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4cb7e1ebc..f6b18a86d0 100644
--- a/CHANGELOG.md
+++ b/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
 
diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs
index 1a129aaea3..c387eb0b79 100644
--- a/common/src/terrain/sprite.rs
+++ b/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,
         )
     }
 }
diff --git a/voxygen/anim/src/biped_large/mod.rs b/voxygen/anim/src/biped_large/mod.rs
index 1fed6ca382..b0dfae671f 100644
--- a/voxygen/anim/src/biped_large/mod.rs
+++ b/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()
 }