Merge pull request #2302 from Wotuu/development

Release v9.1.1

app/Service/Spell/SpellService.php

@@ -77,6 +77,7 @@ public function getCategoryNameFromRowClassName(string $rowClassName): ?string
     {
         // Try to match the category directly first
         $categorySlug = Str::slug($rowClassName, '_');
+
         if (!in_array($categorySlug, Spell::ALL_CATEGORIES)) {
             // Try to find the associated class first, then use that class to identify the category
             $characterClass = $this->getCharacterClassFromClassName($rowClassName);

app/Service/View/ViewService.php

@@ -76,6 +76,8 @@ public function getGlobalViewVariables(bool $useCache = true): array
 
             // Spells
             $selectableSpellsByCategory = Spell::where('selectable', true)
+                ->orderBy('category')
+                ->orderBy('name')
                 ->get()
                 ->groupBy('category')
                 ->mapWithKeys(static fn(Collection $spells, string $key) => [__($key) => $spells]);