Skip to content

Commit

Permalink
Updated compatability + transferred ownership to league
Browse files Browse the repository at this point in the history
  • Loading branch information
janssen-io committed Jan 18, 2021
1 parent 7f256a6 commit a6681cf
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 61 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/set-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ if (!tagVersion || !tagVersion.startsWith('v')) {
console.error(`Invalid version specified: ${tagVersion}`);
process.exitCode = 1;
} else {
manifest.version = tagVersion.substring(1); // strip the 'v'-prefix
fs.writeFileSync('module.json', JSON.stringify(manifest, null, 2)); // pretty print JSON back to module.json
// Transferred ownership (01-2021): version should be set manually in module.json
// manifest.version = tagVersion.substring(1); // strip the 'v'-prefix
// fs.writeFileSync('module.json', JSON.stringify(manifest, null, 2)); // pretty print JSON back to module.json
console.log(tagVersion);
}
2 changes: 2 additions & 0 deletions .github/workflows/transform-manifest.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
var fs = require('fs');
let moduleInfo = JSON.parse(fs.readFileSync('module.json', 'utf8'));

// Transfer ownership (01-2021): download and manifest used to contain {{ channel }}
// These values should now be set manually. This workflow step is not deleted, in case a future developer also considers it useful.
if(moduleInfo.version.includes('beta')) {
moduleInfo.title += " (beta)";
moduleInfo.download = moduleInfo.download.replace("{{ channel }}", "beta");
Expand Down
2 changes: 1 addition & 1 deletion PATCH_NOTES.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Fixed macro config layout when using Kakaroto's The Furnace
Updated compatability + transferred ownership to league
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1 align="center">Macro Marker</h1>
<p align="center">
<img src="https://github.com/janssen-io/foundry-macro-marker/workflows/MacroMarker%20CI/badge.svg" alt="build status" /> <img src="https://img.shields.io/github/downloads-pre/janssen-io/foundry-macro-marker/v1.0.5/macro-marker.zip?label=v1.0.5" alt="v1.0.5 downloads" />
<img src="https://github.com/janssen-io/foundry-macro-marker/workflows/MacroMarker%20CI/badge.svg" alt="build status" /> <img src="https://img.shields.io/github/downloads-pre/janssen-io/foundry-macro-marker/v1.0.6/macro-marker.zip?label=v1.0.6" alt="v1.0.6 downloads" />
</p>

Using this Foundry VTT module, you can mark macros as active giving them a coloured border and an alternative icon.
Expand Down
8 changes: 4 additions & 4 deletions module.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"title": "Macro Marker",
"description": "<p>Allows players and GMs to mark macros as active giving them a coloured border.</p><p>Markers can now also be toggled automatically based on any condition or script!</p><p>Check out the compendium for examples.</p>",
"author": "Stan Janssen",
"version": "{{ version }}",
"version": "1.0.6",
"minimumCoreVersion": "0.6.0",
"compatibleCoreVersion":"0.7.5",
"compatibleCoreVersion":"0.7.9",
"scripts": ["macro-marker.js"],
"styles": ["css/macro-border.css", "css/macro-config.css"],
"manifest": "https://fvtt.janssen.io/macro-marker/{{ channel }}/module.json",
"download": "https://fvtt.janssen.io/macro-marker/{{ channel }}/macro-marker.zip",
"manifest": "https://raw.githubusercontent.com/League-of-Foundry-Developers/foundry-macro-marker/master/module.json",
"download": "https://github.com/League-of-Foundry-Developers/foundry-macro-marker/releases/download/v1.0.6/macro-marker.zip",
"url": "https://github.com/janssen-io/foundry-macro-marker",
"bugs": "https://github.com/janssen-io/foundry-macro-marker/issues",
"languages": [ ],
Expand Down
51 changes: 0 additions & 51 deletions src/deprecated/EntityMarkerFlags.ts

This file was deleted.

7 changes: 5 additions & 2 deletions webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ const common = require('./webpack.common.js');
const merge = require('webpack-merge');

module.exports = merge(common, {
devtool: 'none',
mode: 'production'
devtool: 'none',
mode: 'production',
optimization: {
minimize: false
}
});

0 comments on commit a6681cf

Please sign in to comment.