Merge branch 'master' into professorbunbury-sw5e

This commit is contained in:
CK 2020-08-31 16:54:03 -04:00 committed by GitHub
commit 6edc557219
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
88 changed files with 1813 additions and 527 deletions

View file

@ -73,7 +73,7 @@
</label>
</div>
{{#if sss}}
{{#if sss}}
{{!-- Weapon Properties --}}
<div class="form-group stacked weapon-properties">
<label>{{ localize "SW5E.ItemWeaponProperties" }}</label>
@ -83,7 +83,7 @@
</label>
{{/each}}
</div>
{{/if}}
{{/if}}
{{#if isWeapon }}
<div class="form-group stacked weapon-properties">