Merge branch 'master' into old-system

This commit is contained in:
Joscha Maier 2024-12-03 13:13:47 +01:00
commit 47206a8695
No known key found for this signature in database
GPG Key ID: 8C4D045D84A30ABA
4 changed files with 7 additions and 3 deletions

View File

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

View File

@ -328,7 +328,7 @@ async function publishToFoundry(done) {
function updateSystemJson(done) { function updateSystemJson(done) {
const ManifestPath = 'system.json'; const ManifestPath = 'system.json';
const Manifest = JSON.parse(fs.readFileSync(ManifestPath)); 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; Manifest.download = zipUrl;

View File

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

View File

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