Merge remote-tracking branch 'origin/master' into 037-actor-type-creature

This commit is contained in:
Johannes Loher 2021-01-11 00:56:26 +01:00
commit 864a65fed2
6 changed files with 12 additions and 2 deletions

View file

@ -1,4 +1,4 @@
Copyright 2020 Johannes Loher, Gesina Schwalbe, Oliver Rümpelein Copyright 2020 Johannes Loher, Gesina Schwalbe, Oliver Rümpelein, Siegfried Krug
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

View file

@ -24,6 +24,10 @@
{ {
"name": "Oliver Rümpelein", "name": "Oliver Rümpelein",
"email": "foundryvtt@pheerai.de" "email": "foundryvtt@pheerai.de"
},
{
"name": "Siegfried Krug",
"email": "foundryvtt@asdil1991.de"
} }
], ],
"scripts": { "scripts": {

View file

@ -94,6 +94,8 @@
"DS4.SpellCategoryDarkness": "Schatten", "DS4.SpellCategoryDarkness": "Schatten",
"DS4.SpellCategoryMindAffecting": "Geistensbeeinflussend", "DS4.SpellCategoryMindAffecting": "Geistensbeeinflussend",
"DS4.SpellCategoryElectricity": "Elektrizität", "DS4.SpellCategoryElectricity": "Elektrizität",
"DS4.SpellCategoryNone": "Keine",
"DS4.SpellCategoryUnset": "Nicht gesetzt",
"DS4.SpellBonus": "Zauberbonus", "DS4.SpellBonus": "Zauberbonus",
"DS4.SpellBonusAbbr": "ZB", "DS4.SpellBonusAbbr": "ZB",
"DS4.SpellMaxDistance": "Reichweite", "DS4.SpellMaxDistance": "Reichweite",

View file

@ -94,6 +94,8 @@
"DS4.SpellCategoryDarkness": "Darkness", "DS4.SpellCategoryDarkness": "Darkness",
"DS4.SpellCategoryMindAffecting": "Mind Affecting", "DS4.SpellCategoryMindAffecting": "Mind Affecting",
"DS4.SpellCategoryElectricity": "Electricity", "DS4.SpellCategoryElectricity": "Electricity",
"DS4.SpellCategoryNone": "None",
"DS4.SpellCategoryUnset": "Unset",
"DS4.SpellBonus": "Spell Bonus", "DS4.SpellBonus": "Spell Bonus",
"DS4.SpellBonusAbbr": "SB", "DS4.SpellBonusAbbr": "SB",
"DS4.SpellMaxDistance": "Range", "DS4.SpellMaxDistance": "Range",

View file

@ -119,6 +119,8 @@ export const DS4 = {
darkness: "DS4.SpellCategoryDarkness", darkness: "DS4.SpellCategoryDarkness",
mindAffecting: "DS4.SpellCategoryMindAffecting", mindAffecting: "DS4.SpellCategoryMindAffecting",
electricity: "DS4.SpellCategoryElectricity", electricity: "DS4.SpellCategoryElectricity",
none: "DS4.SpellCategoryNone",
unset: "DS4.SpellCategoryUnset",
}, },
/** /**

View file

@ -6,7 +6,7 @@
"minimumCoreVersion": "0.7.9", "minimumCoreVersion": "0.7.9",
"compatibleCoreVersion": "0.7.9", "compatibleCoreVersion": "0.7.9",
"templateVersion": 2, "templateVersion": 2,
"author": "Johannes Loher, Gesina Schwalbe, Oliver Rümpelein", "author": "Johannes Loher, Gesina Schwalbe, Oliver Rümpelein, Siegfried Krug",
"esmodules": ["module/ds4.js"], "esmodules": ["module/ds4.js"],
"styles": ["ds4.css"], "styles": ["ds4.css"],
"scripts": [], "scripts": [],