Merged with Development

lang/en.json

@@ -2049,6 +2049,7 @@
             "range": "Range",
             "reactionRoll": "Reaction Roll",
             "recovery": "Recovery",
+            "refresh": "Refresh",
             "reroll": "Reroll",
             "rerollThing": "Reroll {thing}",
             "resource": "Resource",

module/applications/dialogs/d20RollDialog.mjs

@@ -16,7 +16,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             this.action =
                 config.data.attack?._id == config.source.action
                     ? config.data.attack
-                    : this.item.system.actions.get(config.source.action);
+                    : this.item.system.actionsList?.find(a => a.id === config.source.action);
         }
     }
 

module/applications/sidebar/sidebar.mjs

@@ -1,4 +1,4 @@
-export default class DhSidebar extends Sidebar {
+export default class DhSidebar extends foundry.applications.sidebar.Sidebar {
     /** @override */
     static TABS = {
         chat: {

module/config/itemBrowserConfig.mjs

@@ -370,19 +370,6 @@ export const typeConfig = {
                 label: 'DAGGERHEART.ITEMS.Subclass.spellcastingTrait'
             }
         ],
-        filters: []
-    },
-    beastforms: {
-        columns: [
-            {
-                key: 'system.tier',
-                label: 'DAGGERHEART.GENERAL.Tiers.singular'
-            },
-            {
-                key: 'system.mainTrait',
-                label: 'DAGGERHEART.GENERAL.Trait.single'
-            }
-        ],
         filters: [
             {
                 key: 'system.linkedClass.uuid',

module/data/fields/action/costField.mjs

@@ -103,7 +103,7 @@ export default class CostField extends fields.ArrayField {
     static calcCosts(costs) {
         const resources = CostField.getResources.call(this, costs);
         let filteredCosts = costs;
-        if (this.parent.metadata.isQuantifiable && this.parent.consumeOnUse === false) {
+        if (this.parent?.metadata.isQuantifiable && this.parent.consumeOnUse === false) {
             filteredCosts = filteredCosts.filter(c => c.key !== 'quantity');
         }
 

styles/less/global/elements.less

@@ -210,7 +210,13 @@
     }
 
     p {
-        margin: 0;
+        &:first-child {
+            margin-top: 0;
+        }
+
+        &:last-child {
+            margin-bottom: 0;
+        }
     }
 
     ul {

templates/sidebar/daggerheart-menu/main.hbs

@@ -18,9 +18,9 @@
 
                 {{/each}}
             </div>
-            <button data-action="refreshActors" {{disabled disableRefresh}}>{{localize "Refresh"}}</button>
+            <button data-action="refreshActors" {{disabled disableRefresh}}>{{localize "DAGGERHEART.GENERAL.refresh"}}</button>
         </div>
     </fieldset>
 
     <button data-action="editCountdowns">{{localize "DAGGERHEART.APPLICATIONS.DaggerheartMenu.countdowns"}}</button>
-</div>
+</div>