Peter Bjerg Lidegaard
|
acd3f3b9ed
|
Merge branch 'master' into ADnD_2E_Revised-Players_options
# Conflicts:
# ADnD 2E Revised/html/tabs/character-tab/tab-spells/powers.html
# ADnD 2E Revised/html/tabs/character-tab/tab-spells/priest-sphere-button.html
# ADnD 2E Revised/html/tabs/character-tab/tab-spells/spell-slots-reset-button.html
# ADnD 2E Revised/html/tabs/character-tab/tab-spells/spells-old.html
# ADnD_2E_Revised/2ESheet.html
# ADnD_2E_Revised/html/changelog.html
# ADnD_2E_Revised/html/tabs/character-tab/equipment-tab.html
# ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html
# ADnD_2E_Revised/html/tabs/character-tab/spells-tab/powers.html
# ADnD_2E_Revised/html/tabs/character-tab/spells-tab/priest-sphere-button.html
# ADnD_2E_Revised/html/tabs/character-tab/spells-tab/spell-slots-reset-button.html
# ADnD_2E_Revised/html/tabs/character-tab/spells-tab/spells-old.html
# ADnD_2E_Revised/html/tabs/character-tab/tab-spells/powers.html
# ADnD_2E_Revised/html/tabs/character-tab/tab-spells/priest-sphere-button.html
# ADnD_2E_Revised/html/tabs/character-tab/tab-spells/spell-slots-reset-button.html
# ADnD_2E_Revised/html/tabs/character-tab/tab-spells/spells-old.html
# ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
# ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html
# ADnD_2E_Revised/javascript/players-option-crit-table.js
# ADnD_2E_Revised/javascript/players-option-talents.js
|
2022-04-05 08:58:34 +02:00 |
|