Fix conflict

2026-01-18 16:09:03 +01:00 · 2025-07-27 23:33:12 +02:00 · 2025-07-27 23:33:12 +02:00 · 181f848c4e
commit 181f848c4e
parent 9d0d35d1a7 f55698af02
216 changed files with 13028 additions and 658 deletions
--- a/templates/ui/chat/duality-roll.hbs
+++ b/templates/ui/chat/duality-roll.hbs
@ -207,7 +207,7 @@
                {{/if}} --}}
            {{/if}}
            {{#if hasEffect}}
-                    <button class="duality-action{{#if (or hasDamage hasHealing)}} duality-action-effect{{/if}}" data-value="{{roll.total}}"><span>{{localize "DAGGERHEART.UI.Chat.attackRoll.applyEffect"}}</span></button>
+                    <button class="duality-action-effect" data-value="{{roll.total}}"><span>{{localize "DAGGERHEART.UI.Chat.attackRoll.applyEffect"}}</span></button>
            {{/if}}
            <div class="duality-result">
                <div>{{roll.total}} 
--- a/templates/ui/tooltip/miscellaneous.hbs
+++ b/templates/ui/tooltip/miscellaneous.hbs