Merge branch 'Roll20:master' into master

Author: Villain1nGlasses

DrD2StatusMarkers/script.json

@@ -3,7 +3,7 @@
     "script": "DrD2StatusMarkers.js",
     "version": "0.1.2",
     "previousversions": ["0.1.0", "0.1.1"],
-    "description": "Designed for use only with the Draci Doupe II sheet.\n\nThis script sets token markers based on relevant sheet attributes.\nWorks with the DrD2 token marker set, icons must be named `RED`, `BLU`, `GRN`, `VIO`, `BLK`.",
+    "description": "Designed for use only with the Draci Doupe II sheet.\n\nThis script sets token markers based on relevant sheet attributes.\nWorks with the DrD2 token marker set, icons must be named `RED`, `BLU`, `GRN`, `VIO`, `BLK`, `GRY`.\nYou can download the token marker set [here](https://download-directory.github.io/?url=https%3A%2F%2Fgithub.com%2Fnesuprachy%2Froll20-character-sheets%2Ftree%2FDraci-doupe-II%2FDraci%2520doupe%2520II%2Fassets%2FDrD2-token_markers).",
     "authors": "nesuprachy",
     "roll20userid": "11071738",
     "useroptions": [],

Earthdawn (FASA Official) character sheet companion/03.330/Earthdawn.js

@@ -1,8 +1,8 @@
 {
     "name": "Earthdawn by FASA character sheet companion",
     "script": "Earthdawn.js",
-    "version": "03.301",
-    "previousversions": ["03.30","03.19","03.15","03.023","03.022","03.021","03.020","03.001","03.000","02.042","02.041","02.040","02.000","01.002","01.001","01.000"],
+    "version": "03.330",
+    "previousversions": ["03.301","03.30","03.19","03.15","03.023","03.022","03.021","03.020","03.001","03.000","02.042","02.041","02.040","02.000","01.002","01.001","01.000"],
     "description": "The Roll20 \"Earthdawn by FASA character sheet companion\" API script is made to work with the \"Earthdawn by FASA\" character sheet and \"Earthdawn 4th Edition\" Compendium. It provides many features that automate and assist in many tasks. It is optimized for Earthdawn 4th edition and 1879 1st Edition, but currently has limited support for other editions.\r\r For more information please see [Earthdawn Sheet wiki page](https://wiki.roll20.net/Earthdawn_-_FASA_Official_V2).",
     "authors": "Chris Dickey",
     "roll20userid": "633707",