Fix conflicts

This commit is contained in:
Dapoolp 2025-08-08 20:06:59 +02:00
commit 3ff6ec4f5e
164 changed files with 2542 additions and 749 deletions

View file

@ -9,7 +9,7 @@
<label for="action-uses">Uses{{#if uses.consumeOnSuccess}}<span class="hint">{{localize "DAGGERHEART.ACTIONS.Settings.consumeOnSuccess.short"}}{{/if}}</span></label>
</div>
</div>
<label class="modifier-label" for="action-uses">{{uses.value}}/{{formulaValue uses.max @root.rollConfig.data}}</label>
<label class="modifier-label" for="action-uses">1/{{uses.remaining}}</label>
</li>
{{/if}}
{{#each costs as | cost index |}}