cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-17 15:39:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed merge conflicts

Browse source
This commit is contained in:
WBHarry 2025-08-26 16:53:55 +02:00
parent abe2654352
commit fa6d7d3f3d
18 changed files with 0 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/packs/subclasses/subclass_Beastbound_TIUsIlTS1WkK5vr2.json
View file

@ -53,13 +53,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754268237448, "createdTime": 1754268237448,
<<<<<<< HEAD
"modifiedTime": 1756034054727,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943503629, "modifiedTime": 1755943503629,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!TIUsIlTS1WkK5vr2" "_key": "!items!TIUsIlTS1WkK5vr2"
} }

5
src/packs/subclasses/subclass_Call_Of_The_Brave_NAFU9roaVG7f3RNJ.json
View file

@ -49,13 +49,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754256077777, "createdTime": 1754256077777,
<<<<<<< HEAD
"modifiedTime": 1756034054856,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943544886, "modifiedTime": 1755943544886,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!NAFU9roaVG7f3RNJ" "_key": "!items!NAFU9roaVG7f3RNJ"
} }

5
src/packs/subclasses/subclass_Call_Of_The_Slayer_bcNe5qP3o6CKadhK.json
View file

@ -45,13 +45,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754256112978, "createdTime": 1754256112978,
<<<<<<< HEAD
"modifiedTime": 1756034054862,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943545973, "modifiedTime": 1755943545973,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!bcNe5qP3o6CKadhK" "_key": "!items!bcNe5qP3o6CKadhK"
} }

5
src/packs/subclasses/subclass_Divine_Wielder_M5mpGoAj8LRkylrY.json
View file

@ -49,13 +49,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754352806098, "createdTime": 1754352806098,
<<<<<<< HEAD
"modifiedTime": 1756034054704,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943522722, "modifiedTime": 1755943522722,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!M5mpGoAj8LRkylrY" "_key": "!items!M5mpGoAj8LRkylrY"
} }

5
src/packs/subclasses/subclass_Elemental_Origin_wg1H0hROc2acHwZh.json
View file

@ -45,13 +45,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754349604941, "createdTime": 1754349604941,
<<<<<<< HEAD
"modifiedTime": 1756034054774,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943535524, "modifiedTime": 1755943535524,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!wg1H0hROc2acHwZh" "_key": "!items!wg1H0hROc2acHwZh"
} }

5
src/packs/subclasses/subclass_Nightwalker_h161OSIK24Up4qNd.json
View file

@ -53,13 +53,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754322815758, "createdTime": 1754322815758,
<<<<<<< HEAD
"modifiedTime": 1756034054765,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943514465, "modifiedTime": 1755943514465,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!h161OSIK24Up4qNd" "_key": "!items!h161OSIK24Up4qNd"
} }

5
src/packs/subclasses/subclass_Primal_Origin_GLpRVxnY5E82khxH.json
View file

@ -45,13 +45,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754349604941, "createdTime": 1754349604941,
<<<<<<< HEAD
"modifiedTime": 1756034054790,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943536628, "modifiedTime": 1755943536628,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!GLpRVxnY5E82khxH" "_key": "!items!GLpRVxnY5E82khxH"
} }

5
src/packs/subclasses/subclass_School_Of_Knowledge_qqQlgCqhOivUFoQn.json
View file

@ -57,13 +57,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754253538384, "createdTime": 1754253538384,
<<<<<<< HEAD
"modifiedTime": 1756034054682,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943553625, "modifiedTime": 1755943553625,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!qqQlgCqhOivUFoQn" "_key": "!items!qqQlgCqhOivUFoQn"
} }

5
src/packs/subclasses/subclass_School_Of_War_4y9Ph7RsCIAbkwTk.json
View file

@ -57,13 +57,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754253587683, "createdTime": 1754253587683,
<<<<<<< HEAD
"modifiedTime": 1756034054698,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943555081, "modifiedTime": 1755943555081,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!4y9Ph7RsCIAbkwTk" "_key": "!items!4y9Ph7RsCIAbkwTk"
} }

5
src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json
View file

@ -57,13 +57,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754245881893, "createdTime": 1754245881893,
<<<<<<< HEAD
"modifiedTime": 1756034054824,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943487549, "modifiedTime": 1755943487549,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!rKRxFBlkbh9cDK8K" "_key": "!items!rKRxFBlkbh9cDK8K"
} }

5
src/packs/subclasses/subclass_Syndicate_95QxNZwgyEm1LqdG.json
View file

@ -45,13 +45,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754323643089, "createdTime": 1754323643089,
<<<<<<< HEAD
"modifiedTime": 1756034054771,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943515526, "modifiedTime": 1755943515526,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!95QxNZwgyEm1LqdG" "_key": "!items!95QxNZwgyEm1LqdG"
} }

5
src/packs/subclasses/subclass_Troubadour_ld8MIvk0xVJydSBz.json
View file

@ -43,13 +43,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754174653653, "createdTime": 1754174653653,
<<<<<<< HEAD
"modifiedTime": 1756034054841,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943465827, "modifiedTime": 1755943465827,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_id": "ld8MIvk0xVJydSBz", "_id": "ld8MIvk0xVJydSBz",
"sort": 100000, "sort": 100000,

5
src/packs/subclasses/subclass_Vengeance_SUo8NPBPO8aN193u.json
View file

@ -49,13 +49,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754246011733, "createdTime": 1754246011733,
<<<<<<< HEAD
"modifiedTime": 1756034054833,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943488691, "modifiedTime": 1755943488691,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!SUo8NPBPO8aN193u" "_key": "!items!SUo8NPBPO8aN193u"
} }

5
src/packs/subclasses/subclass_Warden_of_Renewal_xp0XMjYT85Q7E90o.json
View file

@ -53,13 +53,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754221346981, "createdTime": 1754221346981,
<<<<<<< HEAD
"modifiedTime": 1756034054814,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943479431, "modifiedTime": 1755943479431,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!xp0XMjYT85Q7E90o" "_key": "!items!xp0XMjYT85Q7E90o"
} }

5
src/packs/subclasses/subclass_Warden_of_the_Elements_W9hs5kxOWeY7eA4Q.json
View file

@ -45,13 +45,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754221102716, "createdTime": 1754221102716,
<<<<<<< HEAD
"modifiedTime": 1756034054802,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943478132, "modifiedTime": 1755943478132,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!W9hs5kxOWeY7eA4Q" "_key": "!items!W9hs5kxOWeY7eA4Q"
} }

5
src/packs/subclasses/subclass_Wayfinder_zsUglcU4NgZ8tNgZ.json
View file

@ -49,13 +49,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754268318903, "createdTime": 1754268318903,
<<<<<<< HEAD
"modifiedTime": 1756034054752,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943505016, "modifiedTime": 1755943505016,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!zsUglcU4NgZ8tNgZ" "_key": "!items!zsUglcU4NgZ8tNgZ"
} }

5
src/packs/subclasses/subclass_Winged_Sentinel_y7ERWRIpJsdP9Re4.json
View file

@ -49,13 +49,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754354451615, "createdTime": 1754354451615,
<<<<<<< HEAD
"modifiedTime": 1756034054713,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943523928, "modifiedTime": 1755943523928,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_key": "!items!y7ERWRIpJsdP9Re4" "_key": "!items!y7ERWRIpJsdP9Re4"
} }

5
src/packs/subclasses/subclass_Wordsmith_XTSODVM8st75Os8M.json
View file

@ -47,13 +47,8 @@
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "1.1.0", "systemVersion": "1.1.0",
"createdTime": 1754174655078, "createdTime": 1754174655078,
<<<<<<< HEAD
"modifiedTime": 1756034054850,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943467695, "modifiedTime": 1755943467695,
"lastModifiedBy": "tt3PwMBXcTLCtIQU" "lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
}, },
"_id": "XTSODVM8st75Os8M", "_id": "XTSODVM8st75Os8M",
"sort": 200000, "sort": 200000,