cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-18 07:59:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflict

Browse source
This commit is contained in:
Dapoolp 2025-07-27 23:33:12 +02:00
commit 181f848c4e
216 changed files with 13028 additions and 658 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/config/actionConfig.mjs
View file

@ -108,7 +108,7 @@ export const diceCompare = {
}
};
export const advandtageState = {
export const advantageState = {
disadvantage: {
label: 'DAGGERHEART.GENERAL.Disadvantage.full',
value: -1

6
module/config/itemConfig.mjs
View file

@ -1301,9 +1301,9 @@ export const featureTypes = {
id: 'consumable',
label: 'TYPES.Item.consumable'
},
miscellaneous: {
id: 'miscellaneous',
label: 'TYPES.Item.miscellaneous'
loot: {
id: 'loot',
label: 'TYPES.Item.loot'
},
beastform: {
if: 'beastform',