Merge branch 'dev' into dev_skillslist

# Conflicts:
#	CHANGELOG.md
#	system/lang/en-en.json
#	system/lang/fr-fr.json
#	system/scripts/actor.js
#	system/scripts/actors/base-character-sheet.js
#	system/scripts/combat.js
#	system/scripts/config.js
#	system/scripts/dice/dice-picker-dialog.js
#	system/scripts/dice/roll-n-keep-dialog.js
#	system/scripts/gm/gm-monitor.js
#	system/scripts/gm/gm-toolbox.js
#	system/scripts/hooks.js
#	system/scripts/items/technique-sheet.js
#	system/scripts/main-l5r5e.js
#	system/scripts/migration.js
#	system/scripts/preloadTemplates.js
#	system/scripts/settings.js
#	system/scripts/socket-handler.js
#	system/styles/l5r5e.css
#	system/system.json
#	system/templates/actors/character-sheet.html
This commit is contained in:
Vlyan
2023-12-14 10:08:41 +01:00
54 changed files with 9442 additions and 393 deletions

View File

@@ -592,6 +592,18 @@
"name": "Born to Survive (WIP)",
"description": "",
"book_reference": "Décret de la nature"
},
{
"id": "Hunter of the Supernatural",
"name": "Hunter of the Supernatural (WIP)",
"description": "",
"book_reference": "Celestial Realms - Deathly Turns"
},
{
"id": "An Arrow Loosed",
"name": "An Arrow Loosed (WIP)",
"description": "",
"book_reference": "Celestial Realms - Deathly Turns"
}
]
}

View File

@@ -592,6 +592,18 @@
"name": "Evolution of the Wilds (WIP)",
"description": "",
"book_reference": "Décret de la nature"
},
{
"id": "Mazoku's Authority",
"name": "Mazoku's Authority (WIP)",
"description": "",
"book_reference": "Celestial Realms - Deathly Turns"
},
{
"id": "Effortless Aim",
"name": "Effortless Aim (WIP)",
"description": "",
"book_reference": "Celestial Realms - Deathly Turns"
}
]
}