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

LICENSE

@@ -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:
 

package.json

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

src/lang/de.json

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

src/lang/en.json

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

src/module/config.ts

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

src/system.json

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