Merge branch 'master' into cyr-power-point-ui

This commit is contained in:
TJ 2021-02-23 22:42:20 -06:00
commit 6ca9b0c7b4
224 changed files with 5172 additions and 4930 deletions

View file

@ -274,7 +274,7 @@ SW5E.consumableTypes = {
"food": "SW5E.ConsumableFood",
"medpac": "SW5E.ConsumableMedpac",
"technology": "SW5E.ConsumableTechnology",
"ammunition": "SW5E.ConsumableAmmunition",
"ammo": "SW5E.ConsumableAmmunition",
"trinket": "SW5E.ConsumableTrinket",
"force": "SW5E.ConsumableForce",
"tech": "SW5E.ConsumableTech"