Fix conflicts

This commit is contained in:
Dapoolp 2025-08-17 15:34:49 +02:00
commit 1a8cab7ab6
75 changed files with 285 additions and 264 deletions

View file

@ -2113,7 +2113,12 @@
"extendCharacterDescriptions": { "label": "Characters" },
"extendAdversaryDescriptions": { "label": "Adversaries" },
"extendEnvironmentDescriptions": { "label": "Environments" },
"extendItemDescriptions": { "label": "Items" }
"extendItemDescriptions": { "label": "Items" },
"expandRollMessage": "Auto-expand Message Sections",
"expandRollMessageDesc": { "label": "Description" },
"expandRollMessageRoll": { "label": "Formula" },
"expandRollMessageDamage": { "label": "Damage/Healing" },
"expandRollMessageTarget": { "label": "Target" }
},
"fearDisplay": {
"token": "Tokens",