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

@@ -10,8 +10,8 @@
"download": "https://gitlab.com/teaml5r/l5r5e/-/jobs/artifacts/v2.0.0/raw/l5r5e.zip?job=build",
"version": "2.0.0",
"compatibility": {
"minimum": 10,
"verified": "10.291"
"minimum": 11,
"verified": "11"
},
"manifestPlusVersion": "1.2.0",
"socket": true,
@@ -33,8 +33,87 @@
],
"background": "systems/l5r5e/assets/l5r-header.webp",
"scripts": [],
"esmodules": ["./scripts/main-l5r5e.js"],
"styles": ["./styles/l5r5e.css"],
"esmodules": [
"./scripts/main-l5r5e.js"
],
"styles": [
"./styles/l5r5e.css"
],
"packFolders": [
{
"name": "L5R5e System",
"color": "#9a0909",
"sorting": "m",
"folders": [
{
"name": "Character related",
"color": "#019806",
"sorting": "m",
"packs": [
"core-peculiarities-distinctions",
"core-peculiarities-passions",
"core-peculiarities-adversities",
"core-peculiarities-anxieties",
"core-bonds",
"core-titles",
"core-journal-school-curriculum",
"core-journal-great-clans-presentation"
]
},
{
"name": "Techniques",
"color": "#4b1eb3",
"sorting": "m",
"packs": [
"core-techniques-kata",
"core-techniques-kiho",
"core-techniques-inversions",
"core-techniques-invocations",
"core-techniques-rituals",
"core-techniques-shuji",
"core-techniques-maho",
"core-techniques-ninjutsu",
"core-techniques-mantra",
"core-techniques-school",
"core-techniques-mastery"
]
},
{
"name": "Objects related",
"color": "#0985ae",
"sorting": "m",
"packs": [
"core-properties",
"core-item-patterns",
"core-items",
"core-armors",
"core-weapons",
"core-signature-scrolls",
"core-celestial-implement-boons"
]
},
{
"name": "Helpers",
"color": "#6b3d1f",
"sorting": "m",
"packs": [
"core-journal-conditions",
"core-journal-terrain-qualities",
"core-journal-opportunities"
]
},
{
"name": "Tools",
"color": "#834949",
"sorting": "m",
"packs": [
"core-name-tables",
"core-macros"
]
}
]
}
],
"packs": [
{
"name": "core-skills",