Merge branch 'main' into entities

2024-07-08 23:29:48 +03:00
parent 690b8f4807 359123bb36
commit 3cafc39555
15 changed files with 554 additions and 9 deletions
@@ -293,4 +293,4 @@ void Player::convert(dynamic::Map* data, const ContentLUT* lut) {
            Inventory::convert(inventory.get(), lut);
        }
    }
-}
+}