Merge branch 'master' into old-system

.gitlab-ci.yml

@@ -79,6 +79,6 @@ create-release:
           url: "${MANIFEST_RELEASE_URL}"
           filepath: "/${MANIFEST}"
         - name: "$ZIPFILE"
-          url: "${ZIPFILE_PERMALINK_URL}"
+          url: "${ZIPFILE_RELEASE_URL}"
           filepath: "/${ZIPFILE}"
 

gulpfile.js

@@ -328,7 +328,7 @@ async function publishToFoundry(done) {
 function updateSystemJson(done) {
   const ManifestPath = 'system.json';
   const Manifest = JSON.parse(fs.readFileSync(ManifestPath));
-  const zipUrl = process.env.ZIPFILE_PERMALINK_URL || 'https://gitlab.com/wintermyst/kidsonbrooms/-/raw/master/kidsonbrooms.zip?inline=false';
+  const zipUrl = process.env.ZIPFILE_RELEASE_URL || 'https://gitlab.com/wintermyst/kidsonbrooms/-/raw/master/kidsonbrooms.zip?inline=false';
 
   Manifest.download = zipUrl;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kidsonbrooms",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "CSS compiler for the Kids On Brooms system",
   "scripts": {
     "build": "gulp build",

system.json

@@ -2,7 +2,11 @@
   "id": "kidsonbrooms",
   "title": "Kids on Brooms System",
   "description": "The Kids on Brooms system for FoundryVTT!",
+<<<<<<< HEAD
   "version": "1.1.6",
+=======
+  "version": "1.1.5",
+>>>>>>> master
   "compatibility": {
     "minimum": 12,
     "verified": 12.331