Merge branch 'master' into 014_track_talents

This commit is contained in:
Johannes Loher 2021-01-07 00:00:36 +01:00
commit b582b44f20
16 changed files with 222 additions and 81 deletions

View file

@ -42,6 +42,8 @@ async function registerHandlebarsPartials() {
"systems/ds4/templates/actor/partials/overview-control-buttons.hbs",
"systems/ds4/templates/actor/partials/attributes-traits.hbs",
"systems/ds4/templates/actor/partials/combat-values.hbs",
"systems/ds4/templates/actor/partials/profile.hbs",
"systems/ds4/templates/actor/partials/character-progression.hbs",
];
return loadTemplates(templatePaths);
}
@ -69,6 +71,8 @@ Hooks.once("setup", function () {
"combatValues",
"baseInfo",
"progression",
"language",
"profile",
];
// Exclude some from sorting where the default order matters