Merge branch 'Develop' into professorbunbury-sw5e

This commit is contained in:
CK 2020-11-19 18:47:00 +00:00 committed by GitHub
commit 9fea221d6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
113 changed files with 14433 additions and 6203 deletions

View file

@ -26,6 +26,7 @@
<nav class="sheet-navigation tabs" data-group="primary">
<a class="item active" data-tab="description">Description</a>
<a class="item" data-tab="species-traits">Species Traits</a>
<a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
</nav>
{{!-- Item Sheet Body --}}
@ -185,8 +186,11 @@
{{editor content=data.traits.value target="data.traits.value" button=true editable=editable}}
</span>
</div>
{{!-- Effects Tab --}}
<div class="tab effects flexcol" data-group="primary" data-tab="effects">
{{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
</div>
</section>
</form>