v1.4.4

add japanese localisaton

MaterialDeck.js

@@ -1,7 +1,6 @@
 import {registerSettings} from "./src/settings.js";
 import {StreamDeck} from "./src/streamDeck.js";
 import {TokenControl} from "./src/token.js";
-import {Move} from "./src/move.js";
 import {MacroControl} from "./src/macro.js";
 import {CombatTracker} from "./src/combattracker.js";
 import {PlaylistControl} from "./src/playlist.js";
@@ -9,9 +8,10 @@ import {SoundboardControl} from "./src/soundboard.js";
 import {OtherControls} from "./src/othercontrols.js";
 import {ExternalModules} from "./src/external.js";
 import {SceneControl} from "./src/scene.js";
+import {downloadUtility, compatibleCore} from "./src/misc.js";
+import {TokenHelper} from "./src/systems/tokenHelper.js";
 export var streamDeck;
 export var tokenControl;
-var move;
 export var macroControl;
 export var combatTracker;
 export var playlistControl;
@@ -19,16 +19,20 @@ export var soundboard;
 export var otherControls;
 export var externalModules;
 export var sceneControl;
+export var tokenHelper;
 
 export const moduleName = "MaterialDeck";
-export var selectedTokenId;
 
 let ready = false;
-let activeSounds = [];
 
 export let hotbarUses = false;
 export let calculateHotbarUses;
 
+let controlTokenTimer;
+
+export let sdVersion;
+export let msVersion;
+       
 //CONFIG.debug.hooks = true;
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -69,14 +73,38 @@ async function analyzeWSmessage(msg){
     }
 
     if (data.type == "version" && data.source == "SD") {
-        /*
-        console.log(data);
-        const minimumSDversion = game.modules.get("MaterialDeck").data.minimumSDversion.replace('v','');
-        const minimumMSversion = game.modules.get("MaterialDeck").data.minimumMSversion;
-        console.log('SD',minimumSDversion,data.version)
-        if (data.version < minimumSDversion) console.log('SD: nope')
-        else console.log('SD: yes');
-        */
+        let minimumSDversion;
+        let minimumMSversion;
+        if (compatibleCore("0.8.5")) {
+            minimumSDversion = game.modules.get("MaterialDeck").data.flags.minimumSDversion.replace('v','');
+            minimumMSversion = game.modules.get("MaterialDeck").data.flags.minimumMSversion;
+        }
+        else {
+            minimumSDversion = game.modules.get("MaterialDeck").data.minimumSDversion.replace('v','');
+            minimumMSversion = game.modules.get("MaterialDeck").data.minimumMSversion;
+        }
+        
+        sdVersion = data.version;
+
+        if (data.version < minimumSDversion) {
+            let d = new Dialog({
+                title: "Material Deck: Update Needed",
+                content: "<p>The Stream Deck plugin version you're using is v" + data.version + ", which is incompatible with this verion of the module.<br>Update to v" + minimumSDversion + " or newer.</p>",
+                buttons: {
+                 download: {
+                  icon: '<i class="fas fa-download"></i>',
+                  label: "Download Utility",
+                  callback: () => new downloadUtility()
+                 },
+                 ignore: {
+                  icon: '<i class="fas fa-times"></i>',
+                  label: "Ignore"
+                 }
+                },
+                default: "download"
+            });
+            d.render(true);
+        }
     }
 
     if (data == undefined || data.payload == undefined) return;
@@ -86,6 +114,8 @@ async function analyzeWSmessage(msg){
     const context = data.context;
     const coordinates = data.payload.coordinates;
     const settings = data.payload.settings;
+    const device = data.device;
+    
 
     if (data.data == 'init'){
 
@@ -93,52 +123,48 @@ async function analyzeWSmessage(msg){
     if (event == 'willAppear' || event == 'didReceiveSettings'){
         if (coordinates == undefined) return;
         streamDeck.setScreen(action);
-        streamDeck.setContext(action,context,coordinates,settings);
+        await streamDeck.setContext(device,data.size,data.deviceIteration,action,context,coordinates,settings);
 
         if (action == 'token'){
             tokenControl.active = true;
-            tokenControl.update(selectedTokenId);
+            tokenControl.pushData(canvas.tokens.controlled[0]?.id,settings,context,device);
         }  
-        else if (action == 'move')
-            move.update(settings,context);
         else if (action == 'macro')
-            macroControl.update(settings,context);
+            macroControl.update(settings,context,device);
         else if (action == 'combattracker')
-            combatTracker.update(settings,context);
+            combatTracker.update(settings,context,device);
         else if (action == 'playlist')
-            playlistControl.update(settings,context);
+            playlistControl.update(settings,context,device);
         else if (action == 'soundboard')
-            soundboard.update(settings,context); 
+            soundboard.update(settings,context,device); 
         else if (action == 'other')
-            otherControls.update(settings,context);
+            otherControls.update(settings,context,device);
         else if (action == 'external')
-            externalModules.update(settings,context);
+            externalModules.update(settings,context,device);
         else if (action == 'scene')
-            sceneControl.update(settings,context);
+            sceneControl.update(settings,context,device);
     }
     
     else if (event == 'willDisappear'){
         if (coordinates == undefined) return;
-        streamDeck.clearContext(action,coordinates,context);
+        streamDeck.clearContext(device,action,coordinates,context);
     }
 
     else if (event == 'keyDown'){
         if (action == 'token')
             tokenControl.keyPress(settings);
-        else if (action == 'move')
-            move.keyPress(settings);
         else if (action == 'macro')
             macroControl.keyPress(settings);
         else if (action == 'combattracker')
-            combatTracker.keyPress(settings,context);
+            combatTracker.keyPress(settings,context,device);
         else if (action == 'playlist')
-            playlistControl.keyPress(settings,context);
+            playlistControl.keyPress(settings,context,device);
         else if (action == 'soundboard')
             soundboard.keyPressDown(settings);
         else if (action == 'other')
-            otherControls.keyPress(settings,context);
+            otherControls.keyPress(settings,context,device);
         else if (action == 'external')
-            externalModules.keyPress(settings,context);
+            externalModules.keyPress(settings,context,device);
         else if (action == 'scene')
             sceneControl.keyPress(settings);
     }
@@ -171,6 +197,7 @@ function startWebsocket() {
     }
 
     ws.onopen = function() {
+        messageCount = 0;
         WSconnected = true;
         ui.notifications.info("Material Deck "+game.i18n.localize("MaterialDeck.Notifications.Connected") +": "+address);
         wsOpen = true;
@@ -192,13 +219,23 @@ function startWebsocket() {
     clearInterval(wsInterval);
     wsInterval = setInterval(resetWS, 10000);
 }
-
+let messageCount = 0;
 /**
  * Try to reset the websocket if a connection is lost
  */
 function resetWS(){
-    if (wsOpen) ui.notifications.warn("Material Deck: "+game.i18n.localize("MaterialDeck.Notifications.Disconnected"));
-    else ui.notifications.warn("Material Deck: "+game.i18n.localize("MaterialDeck.Notifications.ConnectFail"));
+    const maxMessages = game.settings.get(moduleName, 'nrOfConnMessages');
+    if (maxMessages == 0 || maxMessages > messageCount) {
+        messageCount++;
+        const countString = maxMessages == 0 ? "" : " (" + messageCount + "/" + maxMessages + ")";
+        if (wsOpen) {
+            ui.notifications.warn("Material Deck: "+game.i18n.localize("MaterialDeck.Notifications.Disconnected"));
+            wsOpen = false;
+            messageCount = 0;
+        }
+        else ui.notifications.warn("Material Deck: "+game.i18n.localize("MaterialDeck.Notifications.ConnectFail") + countString);
+    }
+    
     WSconnected = false;
     startWebsocket();
 }
@@ -235,23 +272,25 @@ export function getPermission(action,func) {
  * Attempt to open the websocket
  */
 Hooks.once('ready', async()=>{
+    registerSettings();
     enableModule = (game.settings.get(moduleName,'Enable')) ? true : false;
 
     
+    
     soundboard = new SoundboardControl();
     streamDeck = new StreamDeck();
     tokenControl = new TokenControl();
-    move = new Move();
     macroControl = new MacroControl();
     combatTracker = new CombatTracker();
     playlistControl = new PlaylistControl();
     otherControls = new OtherControls();
     externalModules = new ExternalModules();
     sceneControl = new SceneControl();
+    tokenHelper = new TokenHelper();
 
     game.socket.on(`module.MaterialDeck`, async(payload) =>{
         //console.log(payload);
-        if (payload.msgType == "playSound") playTrack(payload.trackNr,payload.src,payload.play,payload.repeat,payload.volume);  
+        if (payload.msgType == "playSound") soundboard.playSound(payload.trackNr,payload.src,payload.play,payload.repeat,payload.volume);  
         else if (game.user.isGM && payload.msgType == "playPlaylist") {
             const playlist = playlistControl.getPlaylist(payload.playlistNr);
             playlistControl.playPlaylist(playlist,payload.playlistNr);
@@ -295,8 +334,42 @@ Hooks.once('ready', async()=>{
             
     });
 
-    for (let i=0; i<64; i++)
-        activeSounds[i] = false;
+    if (game.user.isGM) {
+        let soundBoardSettings = game.settings.get(moduleName,'soundboardSettings');
+        let macroSettings = game.settings.get(moduleName, 'macroSettings');
+        let array = [];
+        for (let i=0; i<64; i++) array[i] = "";
+        let arrayVolume = [];
+        for (let i=0; i<64; i++) arrayVolume[i] = "50";
+        let arrayZero = [];
+        for (let i=0; i<64; i++) arrayZero[i] = "0";
+    
+        if (macroSettings.color == undefined){
+            game.settings.set(moduleName,'macroSettings',{
+                macros: array,
+                color: arrayZero
+            });
+        }
+    
+        const settings = {
+            playlist: "",
+            sounds: array,
+            colorOn: arrayZero,
+            colorOff: arrayZero,
+            mode: arrayZero,
+            toggle: arrayZero,
+            volume: arrayVolume
+        };
+        if (soundBoardSettings.colorOff == undefined){
+            game.settings.set(moduleName,'soundboardSettings',settings);
+        }
+    }
+
+
+
+
+
+
 
     if (enableModule == false) return;
     if (getPermission('ENABLE') == false) {
@@ -306,66 +379,14 @@ Hooks.once('ready', async()=>{
 
     startWebsocket();
 
-    let soundBoardSettings = game.settings.get(moduleName,'soundboardSettings');
-    let macroSettings = game.settings.get(moduleName, 'macroSettings');
-    let array = [];
-    for (let i=0; i<64; i++) array[i] = "";
-    let arrayVolume = [];
-    for (let i=0; i<64; i++) arrayVolume[i] = "50";
-    let arrayZero = [];
-    for (let i=0; i<64; i++) arrayZero[i] = "0";
-
-    if (macroSettings.color == undefined){
-        game.settings.set(moduleName,'macroSettings',{
-            macros: array,
-            color: arrayZero
-        });
-    }
-    if (soundBoardSettings.colorOff == undefined){
-        game.settings.set(moduleName,'soundboardSettings',{
-            playlist: "",
-            sounds: array,
-            colorOn: arrayZero,
-            colorOff: arrayZero,
-            mode: arrayZero,
-            toggle: arrayZero,
-            volume: arrayVolume
-        });
-    }
-
     const hotbarUsesTemp = game.modules.get("illandril-hotbar-uses");
-    if (hotbarUsesTemp != undefined) {
-        hotbarUses = true;
-    }
-    
+    if (hotbarUsesTemp != undefined) hotbarUses = true;
 });
 
-export function playTrack(soundNr,src,play,repeat,volume){
-    if (play){
-        volume *= game.settings.get("core", "globalInterfaceVolume");
-
-        let howl = new Howl({src, volume, loop: repeat, onend: (id)=>{
-            if (repeat == false){
-                activeSounds[soundNr] = false;
-            }
-        },
-        onstop: (id)=>{
-            activeSounds[soundNr] = false;
-        }});
-        howl.play();
-        activeSounds[soundNr] = howl;
-   }
-   else {
-        activeSounds[soundNr].stop();
-        activeSounds[soundNr] = false;
-   }
-}
-
 Hooks.on('updateToken',(scene,token)=>{
     if (enableModule == false || ready == false) return;
     let tokenId = token._id;
-    if (tokenId == selectedTokenId)
-        tokenControl.update(selectedTokenId);
+    if (tokenId == canvas.tokens.controlled[0]?.id) tokenControl.update(canvas.tokens.controlled[0]?.id);
     if (macroControl != undefined) macroControl.updateAll();
 });
 
@@ -375,8 +396,10 @@ Hooks.on('updateActor',(scene,actor)=>{
     for (let i=0; i<children.length; i++){
         if (children[i].actor.id == actor._id){
             let tokenId = children[i].id;
-            if (tokenId == selectedTokenId)
-                tokenControl.update(selectedTokenId);
+            if (tokenId == canvas.tokens.controlled[0]?.id) {
+                tokenControl.update(canvas.tokens.controlled[0]?.id);
+            }
+                
         }
     }
     if (macroControl != undefined) macroControl.updateAll();
@@ -385,12 +408,16 @@ Hooks.on('updateActor',(scene,actor)=>{
 Hooks.on('controlToken',(token,controlled)=>{
     if (enableModule == false || ready == false) return;
     if (controlled) {
-        selectedTokenId = token.data._id;
+        tokenControl.update(token.data._id);
+        if (controlTokenTimer != undefined) {
+            clearTimeout(controlTokenTimer);
+            controlTokenTimer = undefined;
+        }
     }
     else {
-        selectedTokenId = undefined;
+        controlTokenTimer = setTimeout(function(){tokenControl.update(canvas.tokens.controlled[0]?.id);},10)
     }
-    tokenControl.update(selectedTokenId);
+    
     if (macroControl != undefined) macroControl.updateAll();
 });
 
@@ -403,10 +430,22 @@ Hooks.on('renderHotbar', (hotbar)=>{
     if (macroControl != undefined) macroControl.hotbar(hotbar.macros);
 });
 
+Hooks.on('render', (app)=>{
+    if (enableModule == false || ready == false) return;
+    if (compatibleCore("0.8.1") == false) return;
+    if (app.id == "hotbar" && macroControl != undefined)  macroControl.hotbar(app.macros);
+    
+});
+
 Hooks.on('renderCombatTracker',()=>{
     if (enableModule == false || ready == false) return;
     if (combatTracker != undefined) combatTracker.updateAll();
-    if (tokenControl != undefined) tokenControl.update(selectedTokenId);
+    if (tokenControl != undefined) tokenControl.update(canvas.tokens.controlled[0]?.id);
+});
+
+Hooks.on('renderActorSheet',()=>{
+    if (enableModule == false || ready == false) return;
+    if (tokenControl != undefined) tokenControl.update();
 });
 
 Hooks.on('renderPlaylistDirectory', (playlistDirectory)=>{
@@ -425,10 +464,27 @@ Hooks.on('pauseGame',()=>{
     otherControls.updateAll();
 });
 
-Hooks.on('renderSidebarTab',()=>{
+Hooks.on('renderSidebarTab',(app)=>{
+    const options = {
+        sidebarTab: app.tabName,
+        renderPopout: app.popOut
+    }
+    if (enableModule == false || ready == false) return;
+    if (otherControls != undefined) otherControls.updateAll(options);
+    if (sceneControl != undefined) sceneControl.updateAll();
+});
+
+Hooks.on('closeSidebarTab',(app)=>{
+    const options = {
+        sidebarTab: app.tabName,
+        renderPopout: false
+    }
+    if (otherControls != undefined) otherControls.updateAll(options);
+});
+
+Hooks.on('changeSidebarTab',()=>{
     if (enableModule == false || ready == false) return;
     if (otherControls != undefined) otherControls.updateAll();
-    if (sceneControl != undefined) sceneControl.updateAll();
 });
 
 Hooks.on('updateScene',()=>{
@@ -446,7 +502,7 @@ Hooks.on('renderSceneControls',()=>{
 
 Hooks.on('targetToken',(user,token,targeted)=>{
     if (enableModule == false || ready == false) return;
-    if (token.id == selectedTokenId) tokenControl.update(selectedTokenId);
+    if (token.id == canvas.tokens.controlled[0]?.id) tokenControl.update(canvas.tokens.controlled[0]?.id);
 });
 
 Hooks.on('sidebarCollapse',()=>{
@@ -464,14 +520,30 @@ Hooks.on('closeCompendium',()=>{
     otherControls.updateAll();
 });
 
-Hooks.on('renderJournalSheet',()=>{
+Hooks.on('renderCompendiumBrowser',()=>{
     if (enableModule == false || ready == false) return;
-    otherControls.updateAll();
+    otherControls.updateAll({renderCompendiumBrowser:true});
 });
 
-Hooks.on('closeJournalSheet',()=>{
+Hooks.on('closeCompendiumBrowser',()=>{
     if (enableModule == false || ready == false) return;
-    otherControls.updateAll();
+    otherControls.updateAll({renderCompendiumBrowser:false});
+});
+
+Hooks.on('renderJournalSheet',(sheet)=>{
+    if (enableModule == false || ready == false) return;
+    otherControls.updateAll({
+        hook:'renderJournalSheet',
+        sheet:sheet
+    });
+});
+
+Hooks.on('closeJournalSheet',(sheet)=>{
+    if (enableModule == false || ready == false) return;
+    otherControls.updateAll({
+        hook:'closeJournalSheet',
+        sheet:sheet
+    });
 });
 
 Hooks.on('gmScreenOpenClose',(html,isOpen)=>{
@@ -501,7 +573,7 @@ Hooks.on('about-time.clockRunningStatus', ()=>{
 
 Hooks.once('init', ()=>{
     //CONFIG.debug.hooks = true;
-    registerSettings(); //in ./src/settings.js
+    //registerSettings(); //in ./src/settings.js
 });
 
 Hooks.once('canvasReady',()=>{

README.md

@@ -31,11 +31,6 @@ The functions are categorized into actions. Here is a list of the available acti
     <li>Toggle token visibility, combat state, conditions</li>
   </ul>
   <li>Move Action: Move selected token or the canvas</li>
-  <ul>
-    <li>Move token (in a specified direction)</li>
-    <li>Move canvas (in a specified direction)</li>
-    <li>Zoom canvas in/out</li>
-  </ul>
   <li>Macro Actions: Execute macros</li>
   <ul>
     <li>Execute macro from hotbar</li>
@@ -71,7 +66,7 @@ Instructions and more info can be found in the <a href="https://github.com/CDeen
 Module manifest: https://raw.githubusercontent.com/CDeenen/MaterialDeck/Master/module.json
 
 ## Software Versions & Module Incompatibilities
-<b>Foundry VTT:</b> Tested on 0.7.9<br>
+<b>Foundry VTT:</b> Tested on 0.7.9 - 0.8.5<br>
 <b>Module Incompatibilities:</b> None known.<br>
 
 ## Feedback

changelog.md

@@ -1,5 +1,147 @@
 # Changelog Material Deck Module
-## v1.3.2 - 11-03-2021
+### v1.4.4 - 26-05-2021
+Fixes:
+<ul>
+<li>Some small fixes to make the module compatible with Foundry 0.8.5</li>
+</ul>
+
+Additions:
+<ul>
+<li>Token Action => Added 'Page-Wide Token' option. All buttons on the current page (where the page is the collection of buttons that are shown) that have this enabled will use the same token</li>
+<li>Token Action => On Click: Added 'Set Page-Wide Token' option, so you can configure buttons to set the page-wide token by pressing a button</li>
+<li>Token Action: Added a 'Mode' select box. Setting it to 'Token' is the same as pre v1.4.4. New are the inventory, features and spellbook options that can be used to auto-populate buttons with items, features and spells.</li>
+<li>Added a 'Clear Page' and 'Clear All' button to the soundboard and macroboard configuration</li>
+<li>Added import and export buttons to the soundboard and macroboard configuration (only imports/exports metadata, not the actual audio files or the macros)</li>
+<li>The number of connection error messages you will get is now configurable in the module settings</li>
+<li>Added a download utility to the module settings, so you can easily version-check with the SD plugin and Material Server, download them and download profiles</li>
+<li>Added Japanese localization (thanks BrotherSharper and Asami). All of the new features have not yet been translated</li>
+</ul>
+
+Other:
+<ul>
+<li><b>(Breaking)</b> The Move Action has been removed. Moving tokens is not in the Token Action (it's an on click setting) and moving the canvas is in the Other Actions.</li>
+<li>Major change to the soundboard and macroboard configuration. It is now displayed as pages of 16 sounds or 32 macros each, you can browse through the pages using the arrow keys at the top.</li>
+<li>There is no longer a limit to the amount of sounds/macros you can assign to the soundboard/macroboard, but please note that at some point you might experience performance issues if there's too many sounds/macros.</li>
+<li>Removed the 'Stream Deck Model' module setting, since it's not that useful</li>
+<li>Token Action has been revamped to make it clearer and easier to implement new game systems</li>
+</ul>
+
+<br>
+<b>Compatible server app and SD plugin:</b><br>
+Material Server v1.0.2 (unchanged): https://github.com/CDeenen/MaterialServer/releases <br>
+SD plugin v1.4.4 (<b>must be updated!</b>): https://github.com/CDeenen/MaterialDeck_SD/releases<br>
+
+### v1.4.3 - 05-05-2021
+Fixes:
+<ul>
+<li>Fixed issue where the module would break if multiple Stream Decks were configured in the Stream Deck application, but not all of them had MD actions assigned to them</li>
+<li>In the User Permission Configuration, the Scene Directory hint wasn't displayed properly</li>
+<li>Got rid of warnings that popped up on initialization when using MD as a player</li>
+<li>Fixed issue where the soundboard and macro board could not be configured by players, if it hadn't first been configured by a GM</li>
+</ul>
+
+Other
+<ul>
+<li>Added compatibility for Foundry 0.8.2. Some functions no longer work in 0.8.1 (they still do in 0.7.9)</li>
+</ul>
+
+<br>
+<b>Compatible server app and SD plugin:</b><br>
+Material Server v1.0.2 (unchanged): https://github.com/CDeenen/MaterialServer/releases <br>
+SD plugin v1.4.2 (unchanged): https://github.com/CDeenen/MaterialDeck_SD/releases<br>
+
+### v1.4.2 - 23-04-2021
+Fixes:
+<ul>
+<li>Last update I fixed the combat tracker, but this broke something in the Token Action (if you had a token selected, it would sometimes assumed you didn't have it selected), both should now work</li>
+<li>Token Action: Plugin wouldn't save text boxes (such as 'Prepend Title' or 'Custom') if they were empty</li>
+<li>Token Action: Improved performance, especially when 'Token' is set to 'Selected Token', and you're selecting a new token while you had another token selected<li>
+<li>Token Action => Stats => Skill Modifier: (dnd5e) Would only display the modifier, now it displays the total value (so with proficiency, if applicable)</li>
+<li>Combat Tracker => Mode: Function => Function: Would not always properly load the 'Turn Display' options</li>
+<li>Playlist Action: Background color would not show, and 'Off Color' wouldn't work for 'Offset'</li>
+<li>Macro Action => Macro Board => Offset: Background color would not show</li>
+<li>Scene Action => Offset: Background color would not show</li>
+</ul>
+
+Additions:
+<ul>
+<li>Token Action: Changed the way how you can select what icon will be displayed. Instead of a true/false, there is now a selection box where you can select between 'None', 'Token Icon', 'Actor Icon' and 'Default', where the last one will display the default icon, for example the selected stat to display, the condition, etc</li>
+<li>Token Action => Stats & On Click => Custom: Textbox now automatically resizes to fit the content</li>
+<li>Token Action => On Click => Dice Roll: Added 'Roll Mode' option, where you can set to roll as 'default' (displays dialog), 'normal', 'advantage' or 'disadvantage'. All options, except for 'default', will ignore the previously added 'Token Roll Options' in 'Other Actions'</li>
+</ul>
+
+Other:
+<ul>
+<li>Big code cleanup of the SD plugin</li>
+</ul>
+
+<br>
+<b>Compatible server app and SD plugin:</b><br>
+Material Server v1.0.2 (unchanged): https://github.com/CDeenen/MaterialServer/releases <br>
+SD plugin v1.4.2 (<b>must be updated!</b>): https://github.com/CDeenen/MaterialDeck_SD/releases<br>
+
+### v1.4.1 - 21-04-2021
+Fixes:
+<ul>
+<li>Previous update broke the combat tracker, should now be fixed</li>
+</ul>
+
+### v1.4.0 - 21-04-2021
+Additions:
+<ul>
+<li>Support for connecting multiple Stream Decks at the same time. Please note that performance decreases with each extra Stream Deck</li>
+<li>Other Actions: Added 'Token Roll Options'. This can toggle token rolls between showing a dialog and skipping the dialog and rolling normally or with advantage or disadvantage</li>
+<li>If the SD plugin version you're using is outdated, you now get a pop-up to notify you of this and direct you to the download page</li>
+<li>Added a module setting to set how dark the default white images should be. Can be lowered for improved readability of the text</li>
+<li>Token Action => Stats: Added option to prepend text to the title, so you can set the stat to, for example, strength, and put 'STR: ' in the prepend textbox to display, for example, 'STR: +2'</li>
+</ul>
+
+Fixes:
+<ul>
+<li>Token Action => Skill Roll: Setting wasn't saved in SD app</li>
+<li>Token Action => Roll Ability: Rolling ability checks was broken for some systems</li>
+<li>Token Action => Stats => Display HP: Read overlay indicating HP in the heart icon was also drawn when 'Display Token Icon' was enabled</li>
+<li>Token Action => Stats: Added default images for all dnd5e abilities, saves and skills</li>
+</ul>
+
+<br>
+<b>Compatible server app and SD plugin:</b><br>
+Material Server v1.0.2 (unchanged): https://github.com/CDeenen/MaterialServer/releases <br>
+SD plugin v1.4.0 (<b>must be updated!</b>): https://github.com/CDeenen/MaterialDeck_SD/releases<br>
+
+
+### v1.3.3 - 12-04-2021
+Additions:
+<ul>
+<li>Other Actions => Open Sidebar Tab: Action now indicates which sidebar tab is open (only works on Foundry 0.8.x)</li>
+<li>Other Actions => Open Sidebar Tab: Added option to create an pop-out (doesn't work for the chat)</li>
+<li>Other Actions: Added option to open the pf2e compendium browser</li>
+<li>Macro Action: Can now call macros by name</li>
+<li>Token Action => On Click: Added option to call a macro. Currently the macro will be applied to the selected token</li>
+<li>Token Action => Display Stats: Added saving throws and skill modifiers for most systems</li>
+<li>Token Action => OnClick: Added 'Dice Roll' option, which allows you to roll ability checks, saving throws and other things (depending on game system)</li>
+<li>Token Action => Stats => Display HP: Made the heart icon dynamic, so the amount that the heart is filled with red depends on the relative amount of hit points of the token. 25% hp means the lower 25% of the heart is red, 50% hp means the lower 50% of the heart is red, etc</li>
+<li>Token Action => Stats => Added a '+' before all modifier stats that are bigger than 0</li>
+<li>Token Action => Custom OnClick: Added support for calling macros. For instructions, please refer to the documentation: https://github.com/CDeenen/MaterialDeck/wiki/Token-Action#custom-on-click-function</li>
+</ul>
+
+Fixes:
+<ul>
+<li>Other Actions => Pause Game: Pause is now transmitted to all connected clients</li>
+<li>Token Action => Display Stats: Fixed movement speed for pf2e</li>
+</ul>
+
+Other:
+<ul>
+<li>Should be compatible with Foundry 0.8.1. Only tested on DnD5e. Please note that any functions that rely on other modules do not work if the other modules are not compatible with 0.8.1</li>
+</ul>
+
+<br>
+<b>Compatible server app and SD plugin:</b><br>
+Material Server v1.0.2 (unchanged): https://github.com/CDeenen/MaterialServer/releases <br>
+SD plugin v1.3.4 (<b>must be updated!</b>): https://github.com/CDeenen/MaterialDeck_SD/releases<br>
+
+### v1.3.2 - 11-03-2021
 Additions:
 <ul>
 <li>Added support for the Multi Action provided by the SD app</li>
@@ -19,7 +161,6 @@ Other:
 <ul>
 <li>Macro Action: Improved the way Hotbar Uses are displayed, it is now displayed in a box similar to how the module looks in Foundry</li>
 <li>Made the way images are generated more flexible to make future additions easier</li>
-<li></li>
 </ul>
 
 <br>

img/other/SOURCES.txt

@@ -1,2 +1,3 @@
 other.png: Made using https://www.elgato.com/en/gaming/keycreator
 cogs.png: Edited from https://fontawesome.com/icons/cogs?style=solid
+d20.png: Edited from https://game-icons.net/1x1/delapouite/dice-twenty-faces-twenty.html

img/token/SOURCES.txt

@@ -1,5 +1,5 @@
 ac.webp: Foundry's icon folder, original name: heater-steel-worn.webp
-hp.png: made using Elgato's key creator: https://www.elgato.com/en/gaming/keycreator
+hp.png, hp_empty.png and temp_hp_empty.png: made using/modified from Elgato's key creator: https://www.elgato.com/en/gaming/keycreator
 init.png: freepngimg.com, color inverted, from: https://freepngimg.com/png/81025-art-dice-dungeons-system-dragons-d20-triangle/icon
 speed.webp: Foundry's icon folder, original name: shoes-collared-leather-blue.webp
 mystery-man.png: Foundry's icon folder, converted from .svg

img/token/abilities/SOURCES.txt

@@ -0,0 +1,7 @@
+All images licenced under CC BY 3.0. Grabbed from game-icons.net
+str.png: https://game-icons.net/1x1/delapouite/weight-lifting-up.html
+dex.png: https://game-icons.net/1x1/darkzaitzev/acrobatic.html
+cons.png: https://game-icons.net/1x1/zeromancer/heart-plus.html
+int.png: https://game-icons.net/1x1/lorc/bookmarklet.html
+wis.png: https://game-icons.net/1x1/delapouite/wisdom.html
+cha.png: https://game-icons.net/1x1/lorc/icicles-aura.html

img/token/skills/SOURCES.txt

@@ -0,0 +1,19 @@
+All images licenced under CC BY 3.0. Grabbed from game-icons.net
+acr.png: https://game-icons.net/1x1/delapouite/contortionist.html
+ani.png: https://game-icons.net/1x1/delapouite/cavalry.html
+arc.png: https://game-icons.net/1x1/delapouite/spell-book.html
+ath.png: https://game-icons.net/1x1/lorc/muscle-up.html
+dec.png: https://game-icons.net/1x1/delapouite/convince.html
+his.png: https://game-icons.net/1x1/delapouite/backward-time.html
+ins.png: https://game-icons.net/1x1/lorc/light-bulb.html
+itm.png: https://game-icons.net/1x1/lorc/one-eyed.html
+inv.png: https://game-icons.net/1x1/lorc/magnifying-glass.html
+med.png: https://game-icons.net/1x1/delapouite/first-aid-kit.html
+nat.png: https://game-icons.net/1x1/delapouite/forest.html
+prc.png: https://game-icons.net/1x1/lorc/semi-closed-eye.html
+prf.png: https://game-icons.net/1x1/lorc/sing.html
+per.png: https://game-icons.net/1x1/delapouite/public-speaker.html
+rel.png: https://game-icons.net/1x1/lorc/holy-grail.html
+slt.png: https://game-icons.net/1x1/lorc/snatch.html
+ste.png: https://game-icons.net/1x1/lorc/cloak-dagger.html
+sur.png: https://game-icons.net/1x1/delapouite/pyre.html

lang/en.json

@@ -3,15 +3,10 @@
     "MaterialDeck.Notifications.ConnectFail": "Can't connect to Material Server, retrying",
     "MaterialDeck.Notifications.Connected": "Connected",
     "MaterialDeck.Notifications.Soundboard.NoPermission": "You do not have permission to configure the soundboard",
-    "MaterialDeck.Notifications.Macroboard.NoPermission": "You do not have permission to configure the macro board",
+    "MaterialDeck.Notifications.Macroboard.NoPermission": "You do not have permission to configure the macroboard",
     "MaterialDeck.Notifications.Playlist.NoPermission": "You do not have permission to configure the playlists",
     
     "MaterialDeck.Sett.Enable": "Enable module",
-    "MaterialDeck.Sett.Model": "Stream Deck Model",
-    "MaterialDeck.Sett.Model_Hint": "Reduces the amount of macros and sounds in the macro and soundboard configuration screens. Gives a better overview, but if desired it can be set to XL to get the maximum number. This doesn't influence the operation of the module.",
-    "MaterialDeck.Sett.Model_Mini": "Mini",
-    "MaterialDeck.Sett.Model_Normal": "Normal or Mobile",
-    "MaterialDeck.Sett.Model_XL": "XL",
     "MaterialDeck.Sett.Help": "Help",
     "MaterialDeck.Sett.Permission": "User Permission Configuration",
     "MaterialDeck.Sett.PlaylistConfig": "Playlist Configuration",
@@ -21,6 +16,10 @@
     "MaterialDeck.Sett.ServerAddrHint": "The IP address and port of Material Server. The default value will work for 99% of people, only change this if you know what you're doing. Must follow the format [ip_address]:[port], for example: 'localhost:3001' or '192.168.1.1:4000'.",
     "MaterialDeck.Sett.ImageBuffer": "Image Cache Size",
     "MaterialDeck.Sett.ImageBufferHint": "Sets the amount of images to store in the image cache. The image cache will locally store all images sent to the Stream Deck. This improves the update speed, but increases memory usage.",
+    "MaterialDeck.Sett.ImageBrightness": "Image Brightness",
+    "MaterialDeck.Sett.ImageBrightnessHint": "Sets the brightness of the default white images. If the Image Cache Size is bigger than 0, perform a refresh for instant results.",
+    "MaterialDeck.Sett.NrOfConnMessages": "Number of Connection Warnings",
+    "MaterialDeck.Sett.NrOfConnMessagesHint": "Sets the number of times a connection warning is displayed if Material Deck cannot connect to Material Server. If set to 0, it will give not be limited.",
 
     "MaterialDeck.PL.Unrestricted": "Unrestricted",
     "MaterialDeck.PL.OneTrackPlaylist": "One track per playlist",
@@ -37,6 +36,8 @@
     "MaterialDeck.Background": "Background",
     "MaterialDeck.Macro": "Macro",
     "MaterialDeck.Sound": "Sound",
+    "MaterialDeck.Sounds": "Sounds",
+    "MaterialDeck.Of": "of",
     "MaterialDeck.Icon": "Icon",
     "MaterialDeck.Once": "Once",
     "MaterialDeck.Repeat": "Repeat",
@@ -48,11 +49,28 @@
     "MaterialDeck.Name": "Name",
     "MaterialDeck.None": "None",
     "MaterialDeck.Save": "Save",
+    "MaterialDeck.ClearAll": "Clear All",
+    "MaterialDeck.ClearAll_Content": "This will clear all the data. This cannot be undone, are you sure you want to proceed?",
+    "MaterialDeck.ClearPage": "Clear Page",
+    "MaterialDeck.ClearPage_Content": "This will clear all the data on this page. This cannot be undone, are you sure you want to proceed?",
+    "MaterialDeck.Continue": "Continue",
+    "MaterialDeck.Cancel": "Cancel",
+    "MaterialDeck.Import": "Import",
+    "MaterialDeck.Export": "Export",
+    "MaterialDeck.Filename": "Filename",
+
+    "MaterialDeck.ExportDialog.Title": "Export",
+    "MaterialDeck.ExportDialog.SoundboardContent": "Export the soundboard data. Please note that only the metadata is exported, so you will have to make sure the audio files are in the same relative location when you import them.",
+    "MaterialDeck.ExportDialog.MacroboardContent": "Export the macroboard data. Please note that only the metadata is exported, so you will have to make sure the same macros are available when you import them.",
+
+    "MaterialDeck.ImportDialog.Title": "Import",
+    "MaterialDeck.ImportDialog.SoundboardContent": "Select a file to import. Please note that only the metadata is imported, so you will have to make sure the audio files are in the same relative location as when you exported them.",
+    "MaterialDeck.ImportDialog.MacroboardContent": "Import the macroboard data. ",
+    "MaterialDeck.ImportDialog.Warning": "This will overwrite your current settings, and cannot be undone.",
 
     "MaterialDeck.FxMaster.Colorize": "Colorize",
     "MaterialDeck.FxMaster.Clear": "Clear All",
 
-
     "MaterialDeck.Perm.Instructions": "Configure the permission for each Material Deck action.",
     "MaterialDeck.Perm.DefaultNotification": "Material Deck user permissions have been configured to the default values.",
 
@@ -91,16 +109,12 @@
     "MaterialDeck.Perm.MACRO.label": "Macros",
     "MaterialDeck.Perm.MACRO.HOTBAR.label": "Hotbar Macros",
     "MaterialDeck.Perm.MACRO.HOTBAR.hint": "Allow users to use hotbar macros",
+    "MaterialDeck.Perm.MACRO.BY_NAME.label": "Macro by Name",
+    "MaterialDeck.Perm.MACRO.BY_NAME.hint": "Allow users to call macros by name",
     "MaterialDeck.Perm.MACRO.MACROBOARD.label": "Macro Board",
-    "MaterialDeck.Perm.MACRO.MACROBOARD.hint": "Allow users to use the macro board",
+    "MaterialDeck.Perm.MACRO.MACROBOARD.hint": "Allow users to use the macroboard",
     "MaterialDeck.Perm.MACRO.MACROBOARD_CONFIGURE.label": "Configure the Macro Board",
-    "MaterialDeck.Perm.MACRO.MACROBOARD_CONFIGURE.hint": "Allow users to configure the macro board",
-
-    "MaterialDeck.Perm.MOVE.label": "Move",
-    "MaterialDeck.Perm.MOVE.TOKEN.label": "Token",
-    "MaterialDeck.Perm.MOVE.TOKEN.hint": "Allow users to move a controlled token",
-    "MaterialDeck.Perm.MOVE.CANVAS.label": "Canvas",
-    "MaterialDeck.Perm.MOVE.CANVAS.hint": "Allow users to move their canvas",
+    "MaterialDeck.Perm.MACRO.MACROBOARD_CONFIGURE.hint": "Allow users to configure the macroboard. To allow users to pick icons using the filepicker, enable 'Browse File Explorer' for that user in the core Permission Configuration",
 
     "MaterialDeck.Perm.OTHER.label": "Other",
     "MaterialDeck.Perm.OTHER.PAUSE.label": "Pause/Resume",
@@ -140,7 +154,7 @@
     "MaterialDeck.Perm.SCENE.ACTIVE.label": "Active Scene",
     "MaterialDeck.Perm.SCENE.ACTIVE.hint": "Allow users to view the active scene",
     "MaterialDeck.Perm.SCENE.DIRECTORY.label": "Scene Directory",
-    "MaterialDeck.Perm.SCENE.DIRECTOR.hint": "Allow users to view and control scenes from the scene directory",
+    "MaterialDeck.Perm.SCENE.DIRECTORY.hint": "Allow users to view and control scenes from the scene directory",
     "MaterialDeck.Perm.SCENE.NAME.label": "Scene by Name",
     "MaterialDeck.Perm.SCENE.NAME.hint": "Allow users to view and control any scene by name",
 
@@ -148,7 +162,7 @@
     "MaterialDeck.Perm.SOUNDBOARD.PLAY.label": "Enable",
     "MaterialDeck.Perm.SOUNDBOARD.PLAY.hint": "Allow users to play sounds from the soundboard",
     "MaterialDeck.Perm.SOUNDBOARD.CONFIGURE.label": "Configure",
-    "MaterialDeck.Perm.SOUNDBOARD.CONFIGURE.hint": "Allow users to configure the soundboard",
+    "MaterialDeck.Perm.SOUNDBOARD.CONFIGURE.hint": "Allow users to configure the soundboard. To allow users to pick files and icons using the filepicker, enable 'Browse File Explorer' for that user in the core Permission Configuration",
 
     "MaterialDeck.Perm.TOKEN.label": "Token",
     "MaterialDeck.Perm.TOKEN.STATS.label": "Display Stats",
@@ -174,6 +188,22 @@
     "MaterialDeck.AboutTime.Second": "nd",
     "MaterialDeck.AboutTime.Third": "rd",
     "MaterialDeck.AboutTime.Fourth": "th",
-    "MaterialDeck.AboutTime.Of": "of"
-}
+    "MaterialDeck.AboutTime.Of": "of",
 
+    "MaterialDeck.DownloadUtility.Title": "Download Utility",
+    "MaterialDeck.DownloadUtility.Plugin": "Plugin & Material Server",
+    "MaterialDeck.DownloadUtility.Minimum": "Minimum",
+    "MaterialDeck.DownloadUtility.Current": "Current",
+    "MaterialDeck.DownloadUtility.Latest": "Latest",
+    "MaterialDeck.DownloadUtility.OS": "OS",
+    "MaterialDeck.DownloadUtility.Download": "Download",
+    "MaterialDeck.DownloadUtility.SDplugin": "SD Plugin",
+    "MaterialDeck.DownloadUtility.MSserver": "Material Server",
+    "MaterialDeck.DownloadUtility.Windows": "Windows",
+    "MaterialDeck.DownloadUtility.Macos": "MacOS",
+    "MaterialDeck.DownloadUtility.Linux": "Linux",
+    "MaterialDeck.DownloadUtility.Source": "Source",
+    "MaterialDeck.DownloadUtility.Profiles": "Profiles",
+    "MaterialDeck.DownloadUtility.Name": "Name",
+    "MaterialDeck.DownloadUtility.Refresh": "Refresh"
+}

lang/ja.json

@@ -0,0 +1,209 @@
+{
+    "MaterialDeck.Notifications.Disconnected": "Material Serverから切断され、再接続を試みています",
+    "MaterialDeck.Notifications.ConnectFail": "Material Serverに接続できません、再試行します",
+    "MaterialDeck.Notifications.Connected": "に接続しました",
+    "MaterialDeck.Notifications.Soundboard.NoPermission": "サウンドボードを設定する権限がありません",
+    "MaterialDeck.Notifications.Macroboard.NoPermission": "マクロボードを設定する権限がありません",
+    "MaterialDeck.Notifications.Playlist.NoPermission": "プレイリストを設定する権限がありません",
+
+    "MaterialDeck.Sett.Enable": "モジュールの有効化",
+    "MaterialDeck.Sett.Help": "ヘルプ",
+    "MaterialDeck.Sett.Permission": "ユーザー権限の設定",
+    "MaterialDeck.Sett.PlaylistConfig": "プレイリスト設定",
+    "MaterialDeck.Sett.MacroConfig": "マクロ設定",
+    "MaterialDeck.Sett.SoundboardConfig": "サウンド設定",
+    "MaterialDeck.Sett.ServerAddr": "Material Server アドレス",
+    "MaterialDeck.Sett.ServerAddrHint": "MaterialServerのIPアドレスとポート。デフォルト値は99％の人に有効ですが、何をしているのかがわかっている場合にのみ変更してください。[ip_address]:[port]の形式に従う必要があります。例：｢localhost:3001｣または｢192.168.1.1:4000｣。",
+    "MaterialDeck.Sett.ImageBuffer": "画像キャッシュサイズ",
+    "MaterialDeck.Sett.ImageBufferHint": "画像キャッシュに保存する画像のデータ量を設定します。画像キャッシュは、ストリームデッキに送信されたすべての画像をローカルに保存します。これにより更新速度は向上しますが、メモリ使用量は増加します。",
+    "MaterialDeck.Sett.ImageBrightness": "画像の明るさ",
+    "MaterialDeck.Sett.ImageBrightnessHint": "デフォルトの画像の明るさを設定します。画像キャッシュサイズが0より大きい場合、更新を実行してください。",
+    "MaterialDeck.Sett.NrOfConnMessages": "Number of Connection Warnings",
+    "MaterialDeck.Sett.NrOfConnMessagesHint": "Sets the number of times a connection warning is displayed if Material Deck cannot connect to Material Server. If set to 0, it will give not be limited.",
+
+    "MaterialDeck.PL.Unrestricted": "無制限",
+    "MaterialDeck.PL.OneTrackPlaylist": "プレイリストごとに1つのトラック",
+    "MaterialDeck.PL.OneTrackTotal": "合計1トラック",
+    "MaterialDeck.PL.OneTrack": "1トラック",
+    "MaterialDeck.PL.Settings": "設定",
+    "MaterialDeck.PL.Mode": "デフォルトの再生モード",
+    "MaterialDeck.PL.Nr": "プレイリストの数",
+    
+    "MaterialDeck.Playlists": "プレイリスト",
+    "MaterialDeck.Playlist": "プレイリスト",
+    "MaterialDeck.FilePicker": "ファイルを選ぶ",
+    "MaterialDeck.FurnaceArgs": "炉の引数",
+    "MaterialDeck.Background": "背景",
+    "MaterialDeck.Macro": "マクロ",
+    "MaterialDeck.Sound": "サウンド",
+    "MaterialDeck.Sounds": "Sounds",
+    "MaterialDeck.Of": "of",
+    "MaterialDeck.Icon": "アイコン",
+    "MaterialDeck.Once": "一度だけ再生",
+    "MaterialDeck.Repeat": "リピート再生",
+    "MaterialDeck.Hold": "ホールド",
+    "MaterialDeck.Playback": "再生",
+    "MaterialDeck.Volume": "音量",
+    "MaterialDeck.On": "On",
+    "MaterialDeck.Off": "Off",
+    "MaterialDeck.Name": "名前",
+    "MaterialDeck.None": "無し",
+    "MaterialDeck.Save": "セーブ",
+    "MaterialDeck.ClearAll": "Clear All",
+    "MaterialDeck.ClearAll_Content": "This will clear all the data. This cannot be undone, are you sure you want to proceed?",
+    "MaterialDeck.ClearPage": "Clear Page",
+    "MaterialDeck.ClearPage_Content": "This will clear all the data on this page. This cannot be undone, are you sure you want to proceed?",
+    "MaterialDeck.Continue": "Continue",
+    "MaterialDeck.Cancel": "Cancel",
+    "MaterialDeck.Import": "Import",
+    "MaterialDeck.Export": "Export",
+    "MaterialDeck.Filename": "Filename",
+
+    "MaterialDeck.ExportDialog.Title": "Export",
+    "MaterialDeck.ExportDialog.SoundboardContent": "Export the soundboard data. Please note that only the metadata is exported, so you will have to make sure the audio files are in the same relative location when you import them.",
+    "MaterialDeck.ExportDialog.MacroboardContent": "Export the macro board data. Please note that only the metadata is exported, so you will have to make sure the same macros are available when you import them.",
+
+    "MaterialDeck.ImportDialog.Title": "Import",
+    "MaterialDeck.ImportDialog.SoundboardContent": "Select a file to import. Please note that only the metadata is imported, so you will have to make sure the audio files are in the same relative location as when you exported them.",
+    "MaterialDeck.ImportDialog.MacroboardContent": "Import the macro board data. ",
+    "MaterialDeck.ImportDialog.Warning": "This will overwrite your current settings, and cannot be undone.",
+
+    "MaterialDeck.FxMaster.Colorize": "色付け",
+    "MaterialDeck.FxMaster.Clear": "すべてクリア",
+
+    "MaterialDeck.Perm.Instructions": "各Material Deckアクションの権限を設定します。",
+    "MaterialDeck.Perm.DefaultNotification": "Material Deckのユーザー権限がデフォルト値に設定されています。",
+
+    "MaterialDeck.Perm.ENABLE.label": "モジュールを有効にする",
+    "MaterialDeck.Perm.ENABLE.ENABLE.label": "有効にする",
+    "MaterialDeck.Perm.ENABLE.ENABLE.hint": "ユーザーがMaterial Deckを使用できるようにします",
+
+    "MaterialDeck.Perm.COMBAT.label": "イニシアチブ表",
+    "MaterialDeck.Perm.COMBAT.END_TURN.label": "ターン終了",
+    "MaterialDeck.Perm.COMBAT.END_TURN.hint": "ユーザーが自分のターンを終了できるようにします",
+    "MaterialDeck.Perm.COMBAT.TURN_DISPLAY.label": "ターン表示",
+    "MaterialDeck.Perm.COMBAT.TURN_DISPLAY.hint": "ユーザーがターン表示できるようにします",
+    "MaterialDeck.Perm.COMBAT.OTHER_FUNCTIONS.label": "その他の機能",
+    "MaterialDeck.Perm.COMBAT.OTHER_FUNCTIONS.hint": "戦闘の開始/停止、ターンの増減など、ユーザーが「機能モード」で他の機能を使用できるようにします。",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_COMBATANTS.label": "戦闘参加者の表示",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_COMBATANTS.hint": "ユーザーが戦闘参加者を表示できるようにします",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_NON_OWNED_STATS.label": "所有されていないステータスと､オブザーバー以外のステータスを表示",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_NON_OWNED_STATS.hint": "ユーザーが所有していないか、オブザーバー権限を持っていないトークンのステータスを表示できるようにする",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_LIMITED_HP.label": "リミテッド権限のHP表示",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_LIMITED_HP.hint": "ユーザーがリミテッド権限を持つトークンのHPを表示できるようにする",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_OBSERVER_HP.label": "オブザーバー権限のHP表示",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_OBSERVER_HP.hint": "ユーザーがオブザーバー権限を持つトークンのHPを表示できるようにする",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_ALL_NAMES.label": "すべての名前を表示",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_ALL_NAMES.hint": "ユーザーがすべてのトークンの名前を表示できるようにする",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_LIMITED_NAME.label": "リミテッド権限の名前表示",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_LIMITED_NAME.hint": "ユーザーがリミテッド権限を持つトークンの名前を表示できるようにする",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_OBSERVER_NAME.label": "オブザーバー権限の名前表示",
+    "MaterialDeck.Perm.COMBAT.DISPLAY_OBSERVER_NAME.hint": "ユーザーがオブザーバー権限を持つトークンの名前を表示できるようにする",
+    
+    "MaterialDeck.Perm.EXTERNAL.label": "外部モジュール",
+    "MaterialDeck.Perm.EXTERNAL.FXMASTER.label": "Fx Master",
+    "MaterialDeck.Perm.EXTERNAL.FXMASTER.hint": "ユーザーがFxマスターモジュールを制御できるようにする",
+    "MaterialDeck.Perm.EXTERNAL.GM_SCREEN.label": "GM Screen",
+    "MaterialDeck.Perm.EXTERNAL.GM_SCREEN.hint": "ユーザーがGM Screenモジュールを使用してGM画面を表示できるようにする",
+
+    "MaterialDeck.Perm.MACRO.label": "マクロ",
+    "MaterialDeck.Perm.MACRO.HOTBAR.label": "ホットバーマクロ",
+    "MaterialDeck.Perm.MACRO.HOTBAR.hint": "ユーザーがホットバーマクロを使用できるようにする",
+    "MaterialDeck.Perm.MACRO.BY_NAME.label": "名前でマクロ呼出",
+    "MaterialDeck.Perm.MACRO.BY_NAME.hint": "ユーザーが名前でマクロを呼び出すことを許可します",
+    "MaterialDeck.Perm.MACRO.MACROBOARD.label": "マクロボード",
+    "MaterialDeck.Perm.MACRO.MACROBOARD.hint": "ユーザーがマクロボードを使用できるようにする",
+    "MaterialDeck.Perm.MACRO.MACROBOARD_CONFIGURE.label": "マクロボードの設定",
+    "MaterialDeck.Perm.MACRO.MACROBOARD_CONFIGURE.hint": "ユーザーがマクロボードを設定できるようにする。ユーザーがファイルエクスプローラを使用してアイコンを選択できるようにするには、コア設定の「権限の設定」でそのユーザーに対して「ファイルエクスプローラの使用」を有効にすること。",
+
+    "MaterialDeck.Perm.OTHER.label": "その他",
+    "MaterialDeck.Perm.OTHER.PAUSE.label": "一時停止/再開",
+    "MaterialDeck.Perm.OTHER.PAUSE.hint": "ユーザーがゲームを一時停止または再開できるようにする",
+    "MaterialDeck.Perm.OTHER.CONTROL.label": "コントロールボタン",
+    "MaterialDeck.Perm.OTHER.CONTROL.hint": "ユーザーがコントロールボタンを制御できるようにする",
+    "MaterialDeck.Perm.OTHER.DARKNESS.label": "シーンの暗さ",
+    "MaterialDeck.Perm.OTHER.DARKNESS.hint": "ユーザーがシーンの暗さを設定できるようにする",
+    "MaterialDeck.Perm.OTHER.DICE.label": "ダイスロール",
+    "MaterialDeck.Perm.OTHER.DICE.hint": "ユーザーがダイスを振ることを許可する",
+    "MaterialDeck.Perm.OTHER.TABLES_ALL.label": "ロールテーブル（すべて）",
+    "MaterialDeck.Perm.OTHER.TABLES_ALL.hint": "ユーザーがすべてのロールテーブルの表示、およびロールすることを許可する",
+    "MaterialDeck.Perm.OTHER.TABLES.label": "ロールテーブル（ｵﾌﾞｻﾞｰﾊﾞｰ/所有者）",
+    "MaterialDeck.Perm.OTHER.TABLES.hint": "ユーザーがオブザーバーまたは所有者の権限を持つロールテーブルを表示およびロールできるようにする",
+    "MaterialDeck.Perm.OTHER.SIDEBAR.label": "サイドバー",
+    "MaterialDeck.Perm.OTHER.SIDEBAR.hint": "ユーザーがサイドバーを制御できるようにする",
+    "MaterialDeck.Perm.OTHER.COMPENDIUM_ALL.label": "辞典（すべて）",
+    "MaterialDeck.Perm.OTHER.COMPENDIUM_ALL.hint": "ユーザーがすべての辞典を開くことを許可する",
+    "MaterialDeck.Perm.OTHER.COMPENDIUM.label": "辞典（オブザーバー/所有者）",
+    "MaterialDeck.Perm.OTHER.COMPENDIUM.hint": "ユーザーがオブザーバーまたは所有者権限を持つ辞典を開くことを許可する",
+    "MaterialDeck.Perm.OTHER.JOURNAL_ALL.label": "資料（すべて）",
+    "MaterialDeck.Perm.OTHER.JOURNAL_ALL.hint": "ユーザーがすべての資料を開くことを許可する",
+    "MaterialDeck.Perm.OTHER.JOURNAL.label": "資料（オブザーバー/所有者）",
+    "MaterialDeck.Perm.OTHER.JOURNAL.hint": "ユーザーがオブザーバーまたは所有者権限を持つ資料を開くことを許可する",
+    "MaterialDeck.Perm.OTHER.CHAT.label": "チャットメッセージ",
+    "MaterialDeck.Perm.OTHER.CHAT.hint": "ユーザーがチャットメッセージを送信できるようにする",
+
+    "MaterialDeck.Perm.PLAYLIST.label": "プレイリスト",
+    "MaterialDeck.Perm.PLAYLIST.PLAY.label": "制御",
+    "MaterialDeck.Perm.PLAYLIST.PLAY.hint": "ユーザーがプレイリストとサウンドを再生および一時停止できるようにする",
+    "MaterialDeck.Perm.PLAYLIST.CONFIGURE.label": "設定",
+    "MaterialDeck.Perm.PLAYLIST.CONFIGURE.hint": "ユーザーがプレイリストを設定できるようにする",
+    
+    "MaterialDeck.Perm.SCENE.label": "シーン",
+    "MaterialDeck.Perm.SCENE.VISIBLE.label": "シーンの可視状態",
+    "MaterialDeck.Perm.SCENE.VISIBLE.hint": "ユーザーが表示されているシーンを表示および制御できるようにする",
+    "MaterialDeck.Perm.SCENE.ACTIVE.label": "シーンの有効化",
+    "MaterialDeck.Perm.SCENE.ACTIVE.hint": "ユーザーが有効化されたシーンを表示できるようにする",
+    "MaterialDeck.Perm.SCENE.DIRECTORY.label": "シーンディレクトリ",
+    "MaterialDeck.Perm.SCENE.DIRECTORY.hint": "ユーザーがシーンディレクトリからシーンを表示および制御できるようにする",
+    "MaterialDeck.Perm.SCENE.NAME.label": "名前によるシーン",
+    "MaterialDeck.Perm.SCENE.NAME.hint": "ユーザーが名前で任意のシーンを表示および制御できるようにする",
+
+    "MaterialDeck.Perm.SOUNDBOARD.label": "サウンドボード",
+    "MaterialDeck.Perm.SOUNDBOARD.PLAY.label": "有効にする",
+    "MaterialDeck.Perm.SOUNDBOARD.PLAY.hint": "ユーザーがサウンドボードからサウンドを再生できるようにする",
+    "MaterialDeck.Perm.SOUNDBOARD.CONFIGURE.label": "設定",
+    "MaterialDeck.Perm.SOUNDBOARD.CONFIGURE.hint": "ユーザーがサウンドボードを設定できるようにする。ユーザーがファイルエクスプローラを使用してアイコンを選択できるようにするには、コア設定の「権限の設定」でそのユーザーに対して「ファイルエクスプローラの使用」を有効にすること。",
+
+    "MaterialDeck.Perm.TOKEN.label": "トークン",
+    "MaterialDeck.Perm.TOKEN.STATS.label": "ステータス表示",
+    "MaterialDeck.Perm.TOKEN.STATS.hint": "ユーザーが制御されたトークンのステータスを表示できるようにする",
+    "MaterialDeck.Perm.TOKEN.VISIBILITY.label": "可視状態の切替",
+    "MaterialDeck.Perm.TOKEN.VISIBILITY.hint": "ユーザーが制御するトークンの表示を切り替えることができるようにする",
+    "MaterialDeck.Perm.TOKEN.COMBAT.label": "戦闘状態の切替",
+    "MaterialDeck.Perm.TOKEN.COMBAT.hint": "ユーザーが制御するトークンの戦闘状態を切り替えることができるようにする",
+    "MaterialDeck.Perm.TOKEN.VISION.label": "視覚を有効化",
+    "MaterialDeck.Perm.TOKEN.VISION.hint": "ユーザーが制御されたトークンの視覚を設定できるようにする",
+    "MaterialDeck.Perm.TOKEN.WILDCARD.label": "ワイルドカード画像",
+    "MaterialDeck.Perm.TOKEN.WILDCARD.hint": "ユーザーがワイルドカード画像機能を使用して制御するトークンの画像を設定できるようにする",
+    "MaterialDeck.Perm.TOKEN.CONDITIONS.label": "状態設定",
+    "MaterialDeck.Perm.TOKEN.CONDITIONS.hint": "ユーザーが制御するトークンの状態を設定できるようにする",
+    "MaterialDeck.Perm.TOKEN.CUSTOM.label": "カスタムオンクリック",
+    "MaterialDeck.Perm.TOKEN.CUSTOM.hint": "ユーザーがカスタムオンクリック機能を設定できるようにする",
+    "MaterialDeck.Perm.TOKEN.NON_OWNED.label": "非所有者/非オブザーバートークン",
+    "MaterialDeck.Perm.TOKEN.NON_OWNED.hint": "所有者またはオブザーバーではない権限を持つトークンへのアクセスをユーザーに許可する",
+    "MaterialDeck.Perm.TOKEN.OBSERVER.label": "オブザーバー",
+    "MaterialDeck.Perm.TOKEN.OBSERVER.hint": "オブザーバー権限を持つトークンへのユーザーアクセスを許可する",
+
+    "MaterialDeck.AboutTime.First": "１",
+    "MaterialDeck.AboutTime.Second": "２",
+    "MaterialDeck.AboutTime.Third": "３",
+    "MaterialDeck.AboutTime.Fourth": "４",
+    "MaterialDeck.AboutTime.Of": "/",
+
+    "MaterialDeck.DownloadUtility.Title": "Download Utility",
+    "MaterialDeck.DownloadUtility.Plugin": "Plugin & Material Server",
+    "MaterialDeck.DownloadUtility.Minimum": "Minimum",
+    "MaterialDeck.DownloadUtility.Current": "Current",
+    "MaterialDeck.DownloadUtility.Latest": "Latest",
+    "MaterialDeck.DownloadUtility.OS": "OS",
+    "MaterialDeck.DownloadUtility.Download": "Download",
+    "MaterialDeck.DownloadUtility.SDplugin": "SD Plugin",
+    "MaterialDeck.DownloadUtility.MSserver": "Material Server",
+    "MaterialDeck.DownloadUtility.Windows": "Windows",
+    "MaterialDeck.DownloadUtility.Macos": "MacOS",
+    "MaterialDeck.DownloadUtility.Linux": "Linux",
+    "MaterialDeck.DownloadUtility.Source": "Source",
+    "MaterialDeck.DownloadUtility.Profiles": "Profiles",
+    "MaterialDeck.DownloadUtility.Name": "Name",
+    "MaterialDeck.DownloadUtility.Refresh": "Refresh"
+}

module.json

@@ -1,25 +1,48 @@
 {
-    "name": "MaterialDeck",
-    "title": "Material Deck",
-    "description": "Material Deck allows you to control Foundry using an Elgato Stream Deck",
-    "version": "1.3.2",
-    "minimumSDversion": "1.3.2",
-    "minimumMSversion": "1.0.2",
-    "author": "CDeenen",
-    "esmodules": [
-      "./MaterialDeck.js"
-    ],
-    "socket": true,
-    "minimumCoreVersion": "0.7.5",
-    "compatibleCoreVersion": "0.7.9",
-    "languages": [
-      {
-        "lang": "en",
-        "name": "English",
-        "path": "lang/en.json"
-      }
-    ],
-    "url": "https://github.com/CDeenen/MaterialDeck",
-    "manifest": "https://raw.githubusercontent.com/CDeenen/MaterialDeck/Master/module.json",
-    "download": "https://github.com/CDeenen/MaterialDeck/archive/Master.zip"
-  }
+  "name": "MaterialDeck",
+  "title": "Material Deck",
+  "description": "Material Deck allows you to control Foundry using an Elgato Stream Deck",
+  "version": "1.4.4",
+  "author": "CDeenen",
+  "authors": {
+    "name": "CDeenen",
+    "email": "cdeenen@outlook.com",
+    "discord": "Cris#6864",
+    "patreon": "MaterialFoundry",
+    "reddit": "CDeenen123"
+  },
+  "flags": {
+    "minimumSDversion": "1.4.4",
+    "minimumMSversion": "1.0.2"
+  },
+  "minimumSDversion": "1.4.4",
+  "minimumMSversion": "1.0.2",
+  "esmodules": [
+    "./MaterialDeck.js"
+  ],
+  "socket": true,
+  "minimumCoreVersion": "0.7.5",
+  "compatibleCoreVersion": "0.8.5",
+  "languages": [
+    {
+      "lang": "en",
+      "name": "English",
+      "path": "lang/en.json"
+    },
+    {
+      "lang": "ja",
+      "name": "日本語",
+      "path": "lang/ja.json"
+    }
+  ],
+  "media": [
+    {
+      "type": "icon",
+      "url": "https://raw.githubusercontent.com/CDeenen/MaterialDeck/Master/img/MaterialFoundry512x512.png"
+    }
+  ],
+  "manifestPlusVersion": "1.1.0",
+  "url": "https://github.com/CDeenen/MaterialDeck",
+  "manifest": "https://raw.githubusercontent.com/CDeenen/MaterialDeck/Master/module.json",
+  "download": "https://github.com/CDeenen/MaterialDeck/archive/Master.zip"
+}

src/combattracker.js

@@ -1,5 +1,6 @@
 import * as MODULE from "../MaterialDeck.js";
 import {streamDeck, tokenControl} from "../MaterialDeck.js";
+import {compatibleCore} from "./misc.js";
 
 export class CombatTracker{
     constructor(){
@@ -9,14 +10,17 @@ export class CombatTracker{
 
     async updateAll(){
         if (this.active == false) return;
-        for (let i=0; i<32; i++){   
-            const data = streamDeck.buttonContext[i];
-            if (data == undefined || data.action != 'combattracker') continue;
-            await this.update(data.settings,data.context);
+        for (let device of streamDeck.buttonContext) {
+            if (device?.buttons == undefined) continue;
+            for (let i=0; i<device.buttons.length; i++){   
+                const data = device.buttons[i];
+                if (data == undefined || data.action != 'combattracker') continue;
+                await this.update(data.settings,data.context,device.device);
+            }
         }
     }
 
-    update(settings,context){
+    update(settings,context,device){
         this.active = true;
         const ctFunction = settings.combatTrackerFunction ? settings.combatTrackerFunction : 'startStop';
         const mode = settings.combatTrackerMode ? settings.combatTrackerMode : 'combatants';
@@ -25,10 +29,11 @@ export class CombatTracker{
         let txt = "";
         let background = "#000000";
         settings.combat = true;
+        settings.icon = settings.displayIcon ? 'tokenIcon' : 'none';
         
         if (mode == 'combatants'){
             if (MODULE.getPermission('COMBAT','DISPLAY_COMBATANTS') == false) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device,device,false,"combat tracker");
                 return;
             }
             if (combat != null && combat != undefined && combat.turns.length != 0){
@@ -39,46 +44,46 @@ export class CombatTracker{
                 const combatant = initiativeOrder[nr]
 
                 if (combatant != undefined){
-                    const tokenId = combatant.tokenId;
-                    tokenControl.pushData(tokenId,settings,context,combatantState,'#cccc00');
+                    const tokenId = compatibleCore("0.8.1") ? combatant.data.tokenId : combatant.tokenId;
+                    tokenControl.pushData(tokenId,settings,context,device,combatantState,'#cccc00');
                     return;
                 }
                 else {
-                    streamDeck.setIcon(context,src,{background:background});
+                    streamDeck.setIcon(context,device,src,{background:background});
                     streamDeck.setTitle(txt,context);
                 } 
             }
             else {
-                streamDeck.setIcon(context,src,{background:background});
+                streamDeck.setIcon(context,device,src,{background:background});
                 streamDeck.setTitle(txt,context);
             }
         }
         else if (mode == 'currentCombatant'){
             if (MODULE.getPermission('COMBAT','DISPLAY_COMBATANTS') == false) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device,device);
                 return;
             }
             if (combat != null && combat != undefined && combat.started){
-                const tokenId = combat.combatant.tokenId;
-                tokenControl.pushData(tokenId,settings,context);
+                const tokenId = compatibleCore("0.8.1") ? combat.combatant.data.tokenId : combat.combatant.tokenId;
+                tokenControl.pushData(tokenId,settings,context,device);
             }
             else {
-                streamDeck.setIcon(context,src,{background:background});
+                streamDeck.setIcon(context,device,src,{background:background});
                 streamDeck.setTitle(txt,context);
             }
         }
         else if (mode == 'function'){
 
             if (ctFunction == 'turnDisplay' && MODULE.getPermission('COMBAT','TURN_DISPLAY') == false) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
             else if (ctFunction == 'endTurn' && MODULE.getPermission('COMBAT','END_TURN') == false) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
             else if (ctFunction != 'turnDisplay' && ctFunction != 'endTurn' && MODULE.getPermission('COMBAT','OTHER_FUNCTIONS') == false) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
 
@@ -125,12 +130,12 @@ export class CombatTracker{
                 if (txt != "") txt += "\n";
                 if (settings.displayTurn) txt += "Turn\n"+turn;
             }
-            streamDeck.setIcon(context,src,{background:background});
+            streamDeck.setIcon(context,device,src,{background:background});
             streamDeck.setTitle(txt,context);
         }
     }
 
-    keyPress(settings,context){
+    keyPress(settings,context,device){
         const mode = settings.combatTrackerMode ? settings.combatTrackerMode : 'combatants';
         const combat = game.combat;
 
@@ -139,15 +144,15 @@ export class CombatTracker{
             const ctFunction = settings.combatTrackerFunction ? settings.combatTrackerFunction : 'startStop';
 
             if (ctFunction == 'turnDisplay' && MODULE.getPermission('COMBAT','TURN_DISPLAY') == false) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
             else if (ctFunction == 'endTurn' && MODULE.getPermission('COMBAT','END_TURN') == false) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
             else if (ctFunction != 'turnDisplay' && ctFunction != 'endTurn' && MODULE.getPermission('COMBAT','OTHER_FUNCTIONS') == false) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
 
@@ -156,15 +161,10 @@ export class CombatTracker{
                 let background;
                 if (game.combat.started){
                     game.combat.endCombat();
-                    src = "modules/MaterialDeck/img/combattracker/startcombat.png";
-                    background = "#000000";
                 }
                 else {
                     game.combat.startCombat();
-                    src = "modules/MaterialDeck/img/combattracker/stopcombat.png";
-                    background = "#FF0000";
                 }
-                streamDeck.setIcon(context,src,{background:background});
                 return;
             }
             if (game.combat.started == false) return;
@@ -185,12 +185,12 @@ export class CombatTracker{
                     if (nr == undefined || nr < 1) nr = 0;
                     const combatant = initiativeOrder[nr]
                     if (combatant == undefined) return;
-                    tokenId = combatant.tokenId;
+                    tokenId = compatibleCore("0.8.1") ? combatant.data.tokenId : combatant.tokenId;
                 }
             }
             else if (mode == 'currentCombatant') 
                 if (combat != null && combat != undefined && combat.started)
-                    tokenId = combat.combatant.tokenId;
+                    tokenId = compatibleCore("0.8.1") ? combat.combatant.data.tokenId : combat.combatant.tokenId;
                 
             let token = (canvas.tokens.children[0] != undefined) ? canvas.tokens.children[0].children.find(p => p.id == tokenId) : undefined;
             if (token == undefined) return;

src/external.js

@@ -1,4 +1,3 @@
-import * as MODULE from "../MaterialDeck.js";
 import {streamDeck} from "../MaterialDeck.js";
 
 export class ExternalModules{
@@ -12,39 +11,42 @@ export class ExternalModules{
             this.gmScreenOpen = data.gmScreen.isOpen;
         }
         if (this.active == false) return;
-        for (let i=0; i<32; i++){   
-            const data = streamDeck.buttonContext[i];
-            if (data == undefined || data.action != 'external') continue;
-            await this.update(data.settings,data.context);
+        for (let device of streamDeck.buttonContext) {
+            if (device?.buttons == undefined) continue;
+            for (let i=0; i<device.buttons.length; i++){   
+                const data = device.buttons[i];
+                if (data == undefined || data.action != 'external') continue;
+                await this.update(data.settings,data.context,device.device);
+            }
         }
     }
 
-    update(settings,context){
+    update(settings,context,device){
         this.active = true;
         const module = settings.module ? settings.module : 'fxmaster';
 
-        if (module == 'fxmaster')           this.updateFxMaster(settings,context);
-        else if (module == 'gmscreen')      this.updateGMScreen(settings,context);
-        else if (module == 'triggerHappy')  this.updateTriggerHappy(settings,context);
-        else if (module == 'sharedVision')  this.updateSharedVision(settings,context);
-        else if (module == 'mookAI')        this.updateMookAI(settings,context);
-        else if (module == 'notYourTurn')   this.updateNotYourTurn(settings,context);
-        else if (module == 'lockView')      this.updateLockView(settings,context);
-        else if (module == 'aboutTime')     this.updateAboutTime(settings,context);
+        if (module == 'fxmaster')           this.updateFxMaster(settings,context,device);
+        else if (module == 'gmscreen')      this.updateGMScreen(settings,context,device);
+        else if (module == 'triggerHappy')  this.updateTriggerHappy(settings,context,device);
+        else if (module == 'sharedVision')  this.updateSharedVision(settings,context,device);
+        else if (module == 'mookAI')        this.updateMookAI(settings,context,device);
+        else if (module == 'notYourTurn')   this.updateNotYourTurn(settings,context,device);
+        else if (module == 'lockView')      this.updateLockView(settings,context,device);
+        else if (module == 'aboutTime')     this.updateAboutTime(settings,context,device);
     }
 
-    keyPress(settings,context){
+    keyPress(settings,context,device){
         if (this.active == false) return;
         const module = settings.module ? settings.module : 'fxmaster';
 
-        if (module == 'fxmaster')           this.keyPressFxMaster(settings,context);
-        else if (module == 'gmscreen')      this.keyPressGMScreen(settings,context);
-        else if (module == 'triggerHappy')  this.keyPressTriggerHappy(settings,context);
-        else if (module == 'sharedVision')  this.keyPressSharedVision(settings,context);
-        else if (module == 'mookAI')        this.keyPressMookAI(settings,context);
-        else if (module == 'notYourTurn')   this.keyPressNotYourTurn(settings,context);
-        else if (module == 'lockView')      this.keyPressLockView(settings,context);
-        else if (module == 'aboutTime')     this.keyPressAboutTime(settings,context);
+        if (module == 'fxmaster')           this.keyPressFxMaster(settings,context,device);
+        else if (module == 'gmscreen')      this.keyPressGMScreen(settings,context,device);
+        else if (module == 'triggerHappy')  this.keyPressTriggerHappy(settings,context,device);
+        else if (module == 'sharedVision')  this.keyPressSharedVision(settings,context,device);
+        else if (module == 'mookAI')        this.keyPressMookAI(settings,context,device);
+        else if (module == 'notYourTurn')   this.keyPressNotYourTurn(settings,context,device);
+        else if (module == 'lockView')      this.keyPressLockView(settings,context,device);
+        else if (module == 'aboutTime')     this.keyPressAboutTime(settings,context,device);
     }
 
     getModuleEnable(moduleId){
@@ -56,7 +58,7 @@ export class ExternalModules{
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //FxMaster
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    updateFxMaster(settings,context){
+    updateFxMaster(settings,context,device){
         if (game.user.isGM == false) return;
         const fxmaster = game.modules.get("fxmaster");
         if (fxmaster == undefined || fxmaster.active == false) return;
@@ -125,8 +127,8 @@ export class ExternalModules{
             name = game.i18n.localize("MaterialDeck.FxMaster.Clear");
         }
 
-        if (displayIcon) streamDeck.setIcon(context,icon,{background:background,ring:ring,ringColor:ringColor});
-        else streamDeck.setIcon(context, "", {background:background,ring:ring,ringColor:ringColor});
+        if (displayIcon) streamDeck.setIcon(context,device,icon,{background:background,ring:ring,ringColor:ringColor});
+        else streamDeck.setIcon(context,device, "", {background:background,ring:ring,ringColor:ringColor});
         if (displayName == 0) name = ""; 
         streamDeck.setTitle(name,context);
     }
@@ -140,7 +142,7 @@ export class ExternalModules{
         } : null;
       }
 
-    keyPressFxMaster(settings,context){
+    keyPressFxMaster(settings,context,device){
         if (game.user.isGM == false) return;
         const fxmaster = game.modules.get("fxmaster");
         if (fxmaster == undefined || fxmaster.active == false) return;
@@ -257,7 +259,7 @@ export class ExternalModules{
     //GM Screen
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    updateGMScreen(settings,context){
+    updateGMScreen(settings,context,device){
         if (this.getModuleEnable("gm-screen") == false) return;
         if (game.user.isGM == false) return;
 
@@ -270,12 +272,12 @@ export class ExternalModules{
         if (this.gmScreenOpen) ring = 2;
         
         if (settings.displayGmScreenIcon) src = "fas fa-book-reader";
-        streamDeck.setIcon(context,src,{background:background,ring:ring,ringColor:ringColor});
+        streamDeck.setIcon(context,device,src,{background:background,ring:ring,ringColor:ringColor});
         if (settings.displayGmScreenName) txt = game.i18n.localize(`GMSCR.gmScreen.Open`); 
         streamDeck.setTitle(txt,context);
     }
 
-    keyPressGMScreen(settings,context){
+    keyPressGMScreen(settings,context,device){
         if (this.getModuleEnable("gm-screen") == false) return;
         if (game.user.isGM == false) return;
         window['gm-screen'].toggleGmScreenVisibility();
@@ -285,7 +287,7 @@ export class ExternalModules{
     //Trigger Happy
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    updateTriggerHappy(settings,context) {
+    updateTriggerHappy(settings,context,device) {
         if (this.getModuleEnable("trigger-happy") == false) return;
         if (game.user.isGM == false) return;
         
@@ -296,14 +298,14 @@ export class ExternalModules{
         const ringColor = game.settings.get("trigger-happy", "enableTriggers") ? "#A600FF" : "#340057";
 
         let txt = '';
-        if (displayIcon) streamDeck.setIcon(context,"fas fa-grin-squint-tears",{background:background,ring:2,ringColor:ringColor});
-        else streamDeck.setIcon(context,'',{background:'#000000'});
+        if (displayIcon) streamDeck.setIcon(context,device,"fas fa-grin-squint-tears",{background:background,ring:2,ringColor:ringColor});
+        else streamDeck.setIcon(context,device,'',{background:'#000000'});
         if (displayName) txt = 'Trigger Happy';
         
         streamDeck.setTitle(txt,context);
     }
 
-    keyPressTriggerHappy(settings,context){
+    keyPressTriggerHappy(settings,context,device){
         if (this.getModuleEnable("trigger-happy") == false) return;
         if (game.user.isGM == false) return;
         const mode = settings.triggerHappyMode ? settings.triggerHappyMode : 'toggle';
@@ -326,7 +328,7 @@ export class ExternalModules{
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //Shared Vision
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    updateSharedVision(settings,context) {
+    updateSharedVision(settings,context,device) {
         if (this.getModuleEnable("SharedVision") == false) return;
         if (game.user.isGM == false) return;
         
@@ -337,13 +339,13 @@ export class ExternalModules{
         const ringColor = game.settings.get("SharedVision", "enable") ? "#A600FF" : "#340057";
 
         let txt = '';
-        if (displayIcon) streamDeck.setIcon(context,"fas fa-eye",{background:background,ring:2,ringColor:ringColor});
-        else streamDeck.setIcon(context,'',{background:'#000000'});
+        if (displayIcon) streamDeck.setIcon(context,device,"fas fa-eye",{background:background,ring:2,ringColor:ringColor});
+        else streamDeck.setIcon(context,device,'',{background:'#000000'});
         if (displayName) txt = 'Shared Vision';
         streamDeck.setTitle(txt,context);
     }
 
-    keyPressSharedVision(settings,context) {
+    keyPressSharedVision(settings,context,device) {
         if (this.getModuleEnable("SharedVision") == false) return;
         if (game.user.isGM == false) return;
 
@@ -357,7 +359,7 @@ export class ExternalModules{
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //Mook AI
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    updateMookAI(settings,context) {
+    updateMookAI(settings,context,device) {
         if (this.getModuleEnable("mookAI") == false) return;
         if (game.user.isGM == false) return;
         
@@ -367,13 +369,13 @@ export class ExternalModules{
         const background = "#000000";
 
         let txt = '';
-        if (displayIcon) streamDeck.setIcon(context,"fas fa-brain",{background:'#000000'});
-        else streamDeck.setIcon(context,'',{background:'#000000'});
+        if (displayIcon) streamDeck.setIcon(context,device,"fas fa-brain",{background:'#000000'});
+        else streamDeck.setIcon(context,device,'',{background:'#000000'});
         if (displayName) txt = 'Mook AI';
         streamDeck.setTitle(txt,context);
     }
 
-    async keyPressMookAI(settings,context) {
+    async keyPressMookAI(settings,context,device) {
         if (this.getModuleEnable("mookAI") == false) return;
         if (game.user.isGM == false) return;
         
@@ -385,7 +387,7 @@ export class ExternalModules{
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //Not Your Turn!
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    updateNotYourTurn(settings,context) {
+    updateNotYourTurn(settings,context,device) {
         
         if (this.getModuleEnable("NotYourTurn") == false) return;
         if (game.user.isGM == false) return;
@@ -409,13 +411,13 @@ export class ExternalModules{
             txt = "Block Non-Combat Movement";
             ringColor = game.settings.get('NotYourTurn','nonCombat') ?  "#A600FF": "#340057" ;
         }
-        if (displayIcon) streamDeck.setIcon(context,icon,{background:background,ring:2,ringColor:ringColor});
-        else streamDeck.setIcon(context,'',{background:'#000000'});
+        if (displayIcon) streamDeck.setIcon(context,device,icon,{background:background,ring:2,ringColor:ringColor});
+        else streamDeck.setIcon(context,device,'',{background:'#000000'});
         if (displayName == false) txt = '';
         streamDeck.setTitle(txt,context);
     }
 
-    async keyPressNotYourTurn(settings,context) {
+    async keyPressNotYourTurn(settings,context,device) {
         if (this.getModuleEnable("NotYourTurn") == false) return;
         if (game.user.isGM == false) return;
 
@@ -433,7 +435,7 @@ export class ExternalModules{
     //Lock View
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    updateLockView(settings,context) {
+    updateLockView(settings,context,device) {
         
         if (this.getModuleEnable("LockView") == false) return;
         if (game.user.isGM == false) return;
@@ -463,13 +465,13 @@ export class ExternalModules{
             ringColor = canvas.scene.getFlag('LockView', 'boundingBox') ?  "#A600FF": "#340057" ;
         }
         
-        if (displayIcon) streamDeck.setIcon(context,icon,{background:background,ring:2,ringColor:ringColor});
-        else streamDeck.setIcon(context,'',{background:'#000000'});
+        if (displayIcon) streamDeck.setIcon(context,device,icon,{background:background,ring:2,ringColor:ringColor});
+        else streamDeck.setIcon(context,device,'',{background:'#000000'});
         if (displayName == false) txt = '';
         streamDeck.setTitle(txt,context);
     }
 
-    async keyPressLockView(settings,context) {
+    async keyPressLockView(settings,context,device) {
         if (this.getModuleEnable("LockView") == false) return;
         if (game.user.isGM == false) return;
 
@@ -489,7 +491,7 @@ export class ExternalModules{
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //About Time
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    updateAboutTime(settings,context) {
+    updateAboutTime(settings,context,device) {
         if (this.getModuleEnable("about-time") == false) return;
         if (game.user.isGM == false) return;
 
@@ -566,10 +568,10 @@ export class ExternalModules{
         }
         
         streamDeck.setTitle(txt,context);
-        streamDeck.setIcon(context,'',{background:background,ring:ring,ringColor:ringColor, clock:clock});
+        streamDeck.setIcon(context,device,'',{background:background,ring:ring,ringColor:ringColor, clock:clock});
     }
 
-    keyPressAboutTime(settings,context) {
+    keyPressAboutTime(settings,context,device) {
         if (this.getModuleEnable("about-time") == false) return;
         if (game.user.isGM == false) return;
 

src/macro.js

@@ -1,5 +1,6 @@
 import * as MODULE from "../MaterialDeck.js";
 import {streamDeck} from "../MaterialDeck.js";
+import {compatibleCore} from "./misc.js";
 
 export class MacroControl{
     constructor(){
@@ -9,14 +10,17 @@ export class MacroControl{
 
     async updateAll(){
         if (this.active == false) return;
-        for (let i=0; i<32; i++){   
-            const data = streamDeck.buttonContext[i];
-            if (data == undefined || data.action != 'macro') continue;
-            await this.update(data.settings,data.context);
+        for (let device of streamDeck.buttonContext) {
+            if (device?.buttons == undefined) continue;
+            for (let i=0; i<device.buttons.length; i++){   
+                const data = device.buttons[i];
+                if (data == undefined || data.action != 'macro') continue;
+                await this.update(data.settings,data.context,device.device);
+            }
         }
     }
 
-    async update(settings,context){
+    async update(settings,context,device){
         this.active = true;
         const mode = settings.macroMode ? settings.macroMode : 'hotbar';
         const displayName = settings.displayName ? settings.displayName : false;
@@ -36,7 +40,7 @@ export class MacroControl{
         
         if (mode == 'macroBoard') {  //Macro board
             if ((MODULE.getPermission('MACRO','MACROBOARD') == false )) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
             if (settings.macroBoardMode == 'offset') {  //Offset
@@ -48,6 +52,7 @@ export class MacroControl{
                 
                 ringColor = (macroOffset == parseInt(this.offset)) ? ringOnColor : ringOffColor;
                 ring = 2;
+                src = "modules/MaterialDeck/img/transparant.png";
             }
             else { //Execute macro
                 macroNumber += this.offset - 1;
@@ -58,9 +63,14 @@ export class MacroControl{
                 ring = 0;
             }  
         }
+        else if (mode == 'name') {  //macro by name
+            const macroName = settings.macroNumber;
+            const macro = game.macros.getName(macroName);
+            macroId = macro?.id;
+        }
         else { //Macro Hotbar
             if ((MODULE.getPermission('MACRO','HOTBAR') == false )) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
             if (mode == 'hotbar') macroId = game.user.data.hotbar[macroNumber];
@@ -71,10 +81,7 @@ export class MacroControl{
                 else 
                     macros = game.macros.apps[0].macros;
                 if (macroNumber > 9) macroNumber = 0;
-                for (let j=0; j<10; j++){
-                    if (macros[j].key == macroNumber)
-                        macroId = (macros[j].macro == null) ? undefined : macros[j].macro._id; 
-                }
+                macroId = game.macros.apps[0].macros.find(m => m.key == macroNumber).macro?.id
             }  
         }
 
@@ -87,9 +94,12 @@ export class MacroControl{
                 if (MODULE.hotbarUses && displayUses) uses = await this.getUses(macro);
             }
         }
+        else {
+            if (displayName) name = "";
+            if (displayIcon) src = "modules/MaterialDeck/img/black.png";
+        }
         
-        
-        streamDeck.setIcon(context,src,{background:background,ring:ring,ringColor:ringColor,uses:uses});
+        streamDeck.setIcon(context,device,src,{background:background,ring:ring,ringColor:ringColor,uses:uses});
         streamDeck.setTitle(name,context);
     }
 
@@ -100,53 +110,51 @@ export class MacroControl{
         return uses;
     }
 
-    async hotbar(macros){
-        for (let i=0; i<32; i++){ 
-            const data = streamDeck.buttonContext[i];
-            if (data == undefined || data.action != 'macro' || data.settings.macroMode == 'macroBoard') continue;
+    async hotbar(){
+        for (let device of streamDeck.buttonContext) {
+            if (device?.buttons == undefined) continue;
+            for (let i=0; i<device.buttons.length; i++){   
+                const data = device.buttons[i];
+                if (data == undefined || data.action != 'macro' || data.settings.macroMode == 'macroBoard') continue;
             
-            const context = data.context;
-            const mode = data.settings.macroMode ? data.settings.macroMode : 'hotbar';
-            const displayName = data.settings.displayName ? data.settings.displayName : false;
-            const displayIcon = data.settings.displayIcon ? data.settings.displayIcon : false;
-            const displayUses = data.settings.displayUses ? data.settings.displayUses : false;
-            let background = data.settings.background ? data.settings.background : '#000000';
-            let macroNumber = data.settings.macroNumber;
-            if(macroNumber == undefined || isNaN(parseInt(macroNumber))) macroNumber = 1;
+                const context = data.context;
+                const mode = data.settings.macroMode ? data.settings.macroMode : 'hotbar';
+                const displayName = data.settings.displayName ? data.settings.displayName : false;
+                const displayIcon = data.settings.displayIcon ? data.settings.displayIcon : false;
+                const displayUses = data.settings.displayUses ? data.settings.displayUses : false;
+                let background = data.settings.background ? data.settings.background : '#000000';
+                let macroNumber = data.settings.macroNumber;
+                if(macroNumber == undefined || isNaN(parseInt(macroNumber))) macroNumber = 1;
 
-            if ((MODULE.getPermission('MACRO','HOTBAR') == false )) {
-                streamDeck.noPermission(context);
-                return;
-            } 
-
-            let src = "";
-            let name = "";
-
-            if (mode == 'Macro Board') continue;
-            
-            let macroId;
-            if (mode == 'hotbar'){
-                macroId = game.user.data.hotbar[macroNumber];
-            }
-            else {
-                if (macroNumber > 9) macroNumber = 0;
-                for (let j=0; j<10; j++){
-                    if (macros[j].key == macroNumber){
-                        if (macros[j].macro == null) macroId == undefined;
-                        else macroId = macros[j].macro._id;
-                    }  
+                if ((MODULE.getPermission('MACRO','HOTBAR') == false )) {
+                    streamDeck.noPermission(context,device);
+                    return;
                 } 
+
+                let src = "";
+                let name = "";
+
+                if (mode == 'Macro Board') continue;
+                
+                let macroId;
+                if (mode == 'hotbar'){
+                    macroId = game.user.data.hotbar[macroNumber];
+                }
+                else {
+                    if (macroNumber > 9) macroNumber = 0;
+                    macroId = game.macros.apps[0].macros.find(m => m.key == macroNumber).macro?.id
+                }
+                let macro = undefined;
+                let uses = undefined;
+                if (macroId != undefined) macro = game.macros._source.find(p => p._id == macroId);
+                if (macro != undefined && macro != null) {
+                    if (displayName) name += macro.name;
+                    if (displayIcon) src += macro.img;
+                    if (MODULE.hotbarUses && displayUses) uses = await this.getUses(macro);
+                }
+                streamDeck.setIcon(context,device,src,{background:background,uses:uses});
+                streamDeck.setTitle(name,context);
             }
-            let macro = undefined;
-            let uses = undefined;
-            if (macroId != undefined) macro = game.macros._source.find(p => p._id == macroId);
-            if (macro != undefined && macro != null) {
-                if (displayName) name += macro.name;
-                if (displayIcon) src += macro.img;
-                if (MODULE.hotbarUses && displayUses) uses = await this.getUses(macro);
-            }
-            streamDeck.setIcon(context,src,{background:background,uses:uses});
-            streamDeck.setTitle(name,context);
         }
     }
    
@@ -154,11 +162,36 @@ export class MacroControl{
         const mode = settings.macroMode ? settings.macroMode : 'hotbar';
         let macroNumber = settings.macroNumber;
         if(macroNumber == undefined || isNaN(parseInt(macroNumber))) macroNumber = 0;
+        let target = settings.target ? settings.target : undefined;
         
         if (mode == 'hotbar' || mode == 'visibleHotbar' || mode == 'customHotbar'){
             if ((MODULE.getPermission('MACRO','HOTBAR') == false )) return;
             this.executeHotbar(macroNumber,mode);
         } 
+        else if (mode == 'name') {
+            if ((MODULE.getPermission('MACRO','BY_NAME') == false )) return;
+            const macroName = settings.macroNumber;
+            const macro = game.macros.getName(macroName);
+
+            if (macro == undefined) return;
+           
+            const args = settings.macroArgs ? settings.macroArgs : "";
+
+            let furnaceEnabled = false;
+            let furnace = game.modules.get("furnace");
+            if (furnace != undefined && furnace.active && compatibleCore("0.8.1")==false) furnaceEnabled = true;
+            if (args == "" || args == " ") furnaceEnabled = false;
+            if (furnaceEnabled == false) macro.execute({token:target});
+            else {
+                let chatData = {
+                    user: game.user._id,
+                    speaker: ChatMessage.getSpeaker(),
+                    content: "/'" + macro.name + "' " + args
+                };
+                ChatMessage.create(chatData, {});
+            }
+
+        }
         else {
             if ((MODULE.getPermission('MACRO','MACROBOARD') == false )) return;
             if (settings.macroBoardMode == 'offset') {
@@ -182,12 +215,7 @@ export class MacroControl{
             }
             else macros = game.macros.apps[0].macros;
             if (macroNumber > 9) macroNumber = 0;
-            for (let j=0; j<10; j++){
-                if (macros[j].key == macroNumber){
-                    if (macros[j].macro == null) macroId == undefined;
-                    else macroId = macros[j].macro._id; 
-                }
-            }
+            macroId = game.macros.apps[0].macros.find(m => m.key == macroNumber).macro?.id
         }
         if (macroId == undefined) return;
         let macro = game.macros.get(macroId);
@@ -206,7 +234,7 @@ export class MacroControl{
                 const args = game.settings.get(MODULE.moduleName,'macroSettings').args;
                 let furnaceEnabled = false;
                 let furnace = game.modules.get("furnace");
-                if (furnace != undefined && furnace.active) furnaceEnabled = true;
+                if (furnace != undefined && furnace.active && compatibleCore("0.8.1")==false) furnaceEnabled = true;
                 if (args == undefined || args[macroNumber] == undefined || args[macroNumber] == "") furnaceEnabled = false;
                 if (furnaceEnabled == false) macro.execute();
                 else {

src/misc.js

@@ -1,6 +1,16 @@
-import * as MODULE from "../MaterialDeck.js";
+import {sdVersion, msVersion, moduleName, getPermission, enableModule} from "../MaterialDeck.js";
 import {macroControl,soundboard,playlistControl} from "../MaterialDeck.js";
 
+export function compatibleCore(compatibleVersion){
+    let coreVersion = game.data.version;
+    coreVersion = coreVersion.split(".");
+    compatibleVersion = compatibleVersion.split(".");
+    if (compatibleVersion[0] > coreVersion[0]) return false;
+    if (compatibleVersion[1] > coreVersion[1]) return false;
+    if (compatibleVersion[2] > coreVersion[2]) return false;
+    return true;
+}
+
 export class playlistConfigForm extends FormApplication {
     constructor(data, options) {
         super(data, options);
@@ -17,7 +27,8 @@ export class playlistConfigForm extends FormApplication {
             title: "Material Deck: "+game.i18n.localize("MaterialDeck.Sett.PlaylistConfig"),
             template: "./modules/MaterialDeck/templates/playlistConfig.html",
             classes: ["sheet"],
-            width: 500
+            width: 500,
+            height: "auto"
         });
     }
 
@@ -25,12 +36,12 @@ export class playlistConfigForm extends FormApplication {
      * Provide data to the template
      */
     getData() {
-        if (MODULE.getPermission('PLAYLIST','CONFIGURE') == false ) {
+        if (getPermission('PLAYLIST','CONFIGURE') == false ) {
             ui.notifications.warn(game.i18n.localize("MaterialDeck.Notifications.Playlist.NoPermission"));
             return;
         }
         //Get the playlist settings
-        let settings = game.settings.get(MODULE.moduleName,'playlists');
+        let settings = game.settings.get(moduleName,'playlists');
 
         //Get values from the settings, and check if they are defined
         let selectedPlaylists = settings.selectedPlaylist;
@@ -65,7 +76,7 @@ export class playlistConfigForm extends FormApplication {
         }
  
         return {
-            playlists: game.playlists.entities,
+            playlists: compatibleCore("0.8.1") ? game.playlists.contents : game.playlists.entities,
             numberOfPlaylists: numberOfPlaylists,
             playlistData: playlistData,
             playMode: playMode
@@ -114,8 +125,8 @@ export class playlistConfigForm extends FormApplication {
 
     async updateSettings(settings,render){
         if (game.user.isGM) {
-            await game.settings.set(MODULE.moduleName,'playlists', settings);
-            if (MODULE.enableModule) playlistControl.updateAll();
+            await game.settings.set(moduleName,'playlists', settings);
+            if (enableModule) playlistControl.updateAll();
             if (render) this.render();
         }
         else {
@@ -135,6 +146,7 @@ export class macroConfigForm extends FormApplication {
     constructor(data, options) {
         super(data, options);
         this.data = data;
+        this.page = 0;
     }
 
     /**
@@ -153,14 +165,14 @@ export class macroConfigForm extends FormApplication {
      * Provide data to the template
      */
     getData() {
-        if (MODULE.getPermission('MACRO','MACROBOARD_CONFIGURE') == false ) {
+        if (getPermission('MACRO','MACROBOARD_CONFIGURE') == false ) {
             ui.notifications.warn(game.i18n.localize("MaterialDeck.Notifications.Macroboard.NoPermission"));
             return;
         }
         //Get the settings
-        var selectedMacros = game.settings.get(MODULE.moduleName,'macroSettings').macros;
-        var color = game.settings.get(MODULE.moduleName,'macroSettings').color;
-        var args = game.settings.get(MODULE.moduleName,'macroSettings').args;
+        var selectedMacros = game.settings.get(moduleName,'macroSettings').macros;
+        var color = game.settings.get(moduleName,'macroSettings').color;
+        var args = game.settings.get(moduleName,'macroSettings').args;
 
         //Check if the settings are defined
         if (selectedMacros == undefined) selectedMacros = [];
@@ -171,33 +183,17 @@ export class macroConfigForm extends FormApplication {
         let furnaceEnabled = false;
         let height = 95;
         let furnace = game.modules.get("furnace");
-        if (furnace != undefined && furnace.active) {
+        if (furnace != undefined && furnace.active && compatibleCore("0.8.1")==false) {
             furnaceEnabled = true;
             height += 50;
         }
 
-        //Check what SD model the user is using, and set the number of rows and columns to correspond
-        let streamDeckModel = game.settings.get(MODULE.moduleName,'streamDeckModel');
-        let iMax,jMax;
-        if (streamDeckModel == 0){
-            jMax = 6;
-            iMax = 3;
-        }
-        else if (streamDeckModel == 1){
-            jMax = 6;
-            iMax = 5;
-        }
-        else {
-            jMax = 8;
-            iMax = 8;
-        }
-
-        let iteration = 0;
+        let iteration = this.page*32;
         let macroData = [];
-        for (let j=0; j<jMax; j++){
+        for (let j=0; j<4; j++){
             let macroThis = [];
       
-            for (let i=0; i<iMax; i++){
+            for (let i=0; i<8; i++){
                 let colorData = color[iteration];
                 if (colorData != undefined){
                     let colorCorrect = true;
@@ -222,13 +218,15 @@ export class macroConfigForm extends FormApplication {
             }
             macroData.push({dataThis: macroThis});
         }
-
         return {
             height: height,
             macros: game.macros,
             selectedMacros: selectedMacros,
             macroData: macroData,
-            furnace: furnaceEnabled
+            furnace: furnaceEnabled,
+            macroRange: `${this.page*32 + 1} - ${this.page*32 + 32}`,
+            prevDisabled: this.page == 0 ? 'disabled' : '',
+            totalMacros: Math.max(Math.ceil(selectedMacros.length/32)*32, this.page*32 + 32)
         } 
     }
 
@@ -243,27 +241,118 @@ export class macroConfigForm extends FormApplication {
 
     activateListeners(html) {
         super.activateListeners(html); 
+        const navNext = html.find("button[id='navNext']");
+        const navPrev = html.find("button[id='navPrev']");
+        const clearAll = html.find("button[id='clearAll']");
+        const clearPage = html.find("button[id='clearPage']");
+        const importBtn = html.find("button[id='import']");
+        const exportBtn = html.find("button[id='export']");
         const macro = html.find("select[name='macros']");
         const args = html.find("input[name='args']");
         const color = html.find("input[name='colorPicker']");
 
+        importBtn.on('click', async(event) => {
+            let importDialog = new importConfigForm();
+            importDialog.setData('macroboard',this)
+            importDialog.render(true);
+        });
+
+        exportBtn.on('click', async(event) => {
+            const settings = game.settings.get(moduleName,'macroSettings');
+            let exportDialog = new exportConfigForm();
+            exportDialog.setData(settings,'macroboard')
+            exportDialog.render(true);
+        });
+
+        navNext.on('click',async (event) => {
+            this.page++;
+            this.render(true);
+        });
+
+        navPrev.on('click',async (event) => {
+            const settings = game.settings.get(moduleName,'macroSettings');
+            this.page--;
+            if (this.page < 0) this.page = 0;
+            else {
+                const totalMacros = Math.ceil(settings.macros.length/32)*32;
+                if ((this.page + 2)*32 == totalMacros) {
+                    let pageEmpty = this.getPageEmpty(totalMacros-32);
+                    if (pageEmpty) {
+                        await this.clearPage(totalMacros-32,true)
+                    }
+                }
+            }
+            this.render(true);
+        });
+
+        clearAll.on('click',async (event) => {
+            const parent = this;
+
+            let d = new Dialog({
+                title: game.i18n.localize("MaterialDeck.ClearAll"),
+                content: game.i18n.localize("MaterialDeck.ClearAll_Content"),
+                buttons: {
+                    continue: {
+                    icon: '<i class="fas fa-check"></i>',
+                    label: game.i18n.localize("MaterialDeck.Continue"),
+                    callback: async () => {
+                        this.page = 0;
+                        await parent.clearAllSettings();
+                        parent.render(true);
+                    }
+                    },
+                    cancel: {
+                    icon: '<i class="fas fa-times"></i>',
+                    label: game.i18n.localize("MaterialDeck.Cancel")
+                    }
+                },
+                default: "cancel"
+            });
+            d.render(true);
+        })
+
+        clearPage.on('click',(event) => {
+            const parent = this;
+
+            let d = new Dialog({
+                title: game.i18n.localize("MaterialDeck.ClearPage"),
+                content: game.i18n.localize("MaterialDeck.ClearPage_Content"),
+                buttons: {
+                    continue: {
+                    icon: '<i class="fas fa-check"></i>',
+                    label: game.i18n.localize("MaterialDeck.Continue"),
+                    callback: async () => {
+                        await parent.clearPage(parent.page*32)
+                        parent.render(true);
+                    }
+                    },
+                    cancel: {
+                    icon: '<i class="fas fa-times"></i>',
+                    label: game.i18n.localize("MaterialDeck.Cancel")
+                    }
+                },
+                default: "cancel"
+            });
+            d.render(true);
+        })
+
         macro.on("change", event => {
             let id = event.target.id.replace('macros','');
-            let settings = game.settings.get(MODULE.moduleName,'macroSettings');
+            let settings = game.settings.get(moduleName,'macroSettings');
             settings.macros[id-1]=event.target.value;
             this.updateSettings(settings);
         });
 
         args.on("change", event => {
             let id = event.target.id.replace('args','');
-            let settings = game.settings.get(MODULE.moduleName,'macroSettings');
+            let settings = game.settings.get(moduleName,'macroSettings');
             settings.args[id-1]=event.target.value;
             this.updateSettings(settings);
         });
 
         color.on("change", event => {
             let id = event.target.id.replace('colorpicker','');
-            let settings = game.settings.get(MODULE.moduleName,'macroSettings');
+            let settings = game.settings.get(moduleName,'macroSettings');
             settings.color[id-1]=event.target.value;
             this.updateSettings(settings);
         });
@@ -271,8 +360,8 @@ export class macroConfigForm extends FormApplication {
 
     async updateSettings(settings){
         if (game.user.isGM) {
-            await game.settings.set(MODULE.moduleName,'macroSettings',settings);
-            if (MODULE.enableModule) macroControl.updateAll();
+            await game.settings.set(moduleName,'macroSettings',settings);
+            if (enableModule) macroControl.updateAll();
         }
         else {
             const payload = {
@@ -282,6 +371,49 @@ export class macroConfigForm extends FormApplication {
             game.socket.emit(`module.MaterialDeck`, payload);
         }
     }
+
+    getPageEmpty(pageStart) {
+        const settings = game.settings.get(moduleName,'macroSettings');
+        let pageEmpty = true;
+        for (let i=pageStart; i<pageStart+32; i++) {
+            if (settings.macros[i] != undefined && settings.macros[i] != null && settings.macros[i] != "") {
+                pageEmpty = false;
+                break;
+            }
+        }
+        return pageEmpty;
+    }
+
+    async clearPage(pageStart,remove=false) {
+        const settings = game.settings.get(moduleName,'macroSettings');
+        if (remove) {
+            await settings.macros.splice(pageStart,32);
+            await settings.color.splice(pageStart,32);
+            if (settings.args != undefined) await settings.args.splice(pageStart,32);
+        }
+        else {
+            for (let i=pageStart; i<pageStart+32; i++) {
+                settings.macros[i] = null;
+                settings.color[i] = "0";
+                if (settings.args != undefined) settings.args[i] = null;
+            }
+        }
+        await this.updateSettings(settings);
+    }
+
+    async clearAllSettings() {
+        let settings = {
+            macros: [],
+            color: [],
+            args: []
+        };
+        for (let i=0; i<32; i++) {
+            settings.macros[i] = null;
+            settings.color[i] = "0";
+            settings.args[i] = null;
+        }
+        await this.updateSettings(settings);
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -290,9 +422,8 @@ export class soundboardConfigForm extends FormApplication {
     constructor(data, options) {
         super(data, options);
         this.playlists = [];
-        this.iMax;
-        this.jMax;
         this.settings = {};
+        this.page = 0;
     }
 
     /**
@@ -304,7 +435,7 @@ export class soundboardConfigForm extends FormApplication {
             title: "Material Deck: "+game.i18n.localize("MaterialDeck.Sett.SoundboardConfig"),
             template: "./modules/MaterialDeck/templates/soundboardConfig.html",
             classes: ["sheet"],
-            height: 720
+            height: "auto"
         });
     }
 
@@ -312,13 +443,13 @@ export class soundboardConfigForm extends FormApplication {
      * Provide data to the template
      */
     getData() {
-        if (MODULE.getPermission('SOUNDBOARD','CONFIGURE') == false ) {
+        if (getPermission('SOUNDBOARD','CONFIGURE') == false ) {
             ui.notifications.warn(game.i18n.localize("MaterialDeck.Notifications.Soundboard.NoPermission"));
             return;
         }
 
         //Get the settings
-        this.settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
+        this.settings = game.settings.get(moduleName,'soundboardSettings');
 
         //Check if all settings are defined
         if (this.settings.sounds == undefined) this.settings.sounds = [];
@@ -335,34 +466,20 @@ export class soundboardConfigForm extends FormApplication {
         let playlists = [];
         playlists.push({id:"none",name:game.i18n.localize("MaterialDeck.None")});
         playlists.push({id:"FP",name:game.i18n.localize("MaterialDeck.FilePicker")})
-        for (let i=0; i<game.playlists.entities.length; i++){
-            playlists.push({id:game.playlists.entities[i]._id,name:game.playlists.entities[i].name});
-        }
+        
+        const playlistArray = compatibleCore("0.8.1") ? game.playlists.contents : game.playlists.entities;
+        for (let playlist of playlistArray) 
+            playlists.push({id: playlist.id, name: playlist.name})
+        
         this.playlists = playlists;
 
-        //Check what SD model the user is using, and set the number of rows and columns to correspond
-        let streamDeckModel = game.settings.get(MODULE.moduleName,'streamDeckModel');
-       
-        if (streamDeckModel == 0){
-            this.jMax = 6;
-            this.iMax = 3;
-        }
-        else if (streamDeckModel == 1){
-            this.jMax = 6;
-            this.iMax = 5;
-        }
-        else {
-            this.jMax = 8;
-            this.iMax = 8;
-        }
-
-        let iteration = 0;  //Sound number
+        let iteration = this.page*16;  //Sound number
         let soundData = []; //Stores all the data for each sound
 
-        //Fill soundData. soundData is an array the size of jMax (nr of rows), with each array element containing an array the size of iMax (nr of columns)
-        for (let j=0; j<this.jMax; j++){
+        //Fill soundData
+        for (let j=0; j<2; j++){
             let soundsThis = [];    //Stores row data
-            for (let i=0; i<this.iMax; i++){
+            for (let i=0; i<8; i++){
                 //Each iteration gets the data for each sound
 
                 //If the volume is undefined for this sound, define it and set it to its default value
@@ -376,20 +493,30 @@ export class soundboardConfigForm extends FormApplication {
                 else if (this.settings.selectedPlaylists[iteration] == 'FP') selectedPlaylist = 'FP';
                 else {
                     //Get the playlist
-                    const pl = game.playlists.entities.find(p => p._id == this.settings.selectedPlaylists[iteration]);
+                    const playlistArray = compatibleCore("0.8.1") ? game.playlists.contents : game.playlists.entities;
+                    let pl = playlistArray.find(p => p.id == this.settings.selectedPlaylists[iteration])
+
                     if (pl == undefined){
                         selectedPlaylist = 'none';
                         sounds = [];
                     }
                     else {
                         //Add the sound name and id to the sounds array
-                        for (let i=0; i<pl.sounds.length; i++)
-                            sounds.push({
-                                name: pl.sounds[i].name,
-                                id: pl.sounds[i]._id
-                            });
+                        if (compatibleCore("0.8.1"))
+                            for (let sound of pl.sounds.contents)
+                                sounds.push({
+                                    name: sound.name,
+                                    id: sound.id
+                                });
+                        else {
+                            for (let sound of pl.sounds)
+                                sounds.push({
+                                    name: sound.name,
+                                    id: sound._id
+                                });
+                        }        
                         //Get the playlist id
-                        selectedPlaylist = pl._id;
+                        selectedPlaylist = pl.id;
                     }  
                 }
 
@@ -430,7 +557,10 @@ export class soundboardConfigForm extends FormApplication {
 
         return {
             soundData: soundData,
-            playlists
+            playlists,
+            soundRange: `${this.page*16 + 1} - ${this.page*16 + 16}`,
+            prevDisabled: this.page == 0 ? 'disabled' : '',
+            totalSounds: this.settings.volume.length
         } 
     }
 
@@ -445,6 +575,12 @@ export class soundboardConfigForm extends FormApplication {
 
     async activateListeners(html) {
         super.activateListeners(html);
+        const navNext = html.find("button[id='navNext']");
+        const navPrev = html.find("button[id='navPrev']");
+        const clearAll = html.find("button[id='clearAll']");
+        const clearPage = html.find("button[id='clearPage']");
+        const importBtn = html.find("button[id='import']");
+        const exportBtn = html.find("button[id='export']");
         const nameField = html.find("input[name='namebox']");
         const playlistSelect = html.find("select[name='playlist']");
         const soundSelect = html.find("select[name='sounds']");
@@ -455,6 +591,89 @@ export class soundboardConfigForm extends FormApplication {
         const playMode = html.find("select[name='mode']");
         const volume = html.find("input[name='volume']");
 
+        importBtn.on('click', async(event) => {
+            let importDialog = new importConfigForm();
+            importDialog.setData('soundboard',this)
+            importDialog.render(true);
+        });
+
+        exportBtn.on('click', async(event) => {
+            const settings = game.settings.get(moduleName,'soundboardSettings');
+            let exportDialog = new exportConfigForm();
+            exportDialog.setData(settings,'soundboard')
+            exportDialog.render(true);
+        });
+
+        navNext.on('click',async (event) => {
+            this.page++;
+            this.render(true);
+        });
+        navPrev.on('click',async (event) => {
+            this.page--;
+            if (this.page < 0) this.page = 0;
+            else {
+                const totalSounds = this.settings.volume.length;
+                if ((this.page + 2)*16 == totalSounds) {
+                    let pageEmpty = this.getPageEmpty(totalSounds-16);
+                    if (pageEmpty) {
+                        await this.clearPage(totalSounds-16,true)
+                    }
+                }
+            }
+            this.render(true);
+        });
+
+        clearAll.on('click',async (event) => {
+            const parent = this;
+
+            let d = new Dialog({
+                title: game.i18n.localize("MaterialDeck.ClearAll"),
+                content: game.i18n.localize("MaterialDeck.ClearAll_Content"),
+                buttons: {
+                    continue: {
+                    icon: '<i class="fas fa-check"></i>',
+                    label: game.i18n.localize("MaterialDeck.Continue"),
+                    callback: async () => {
+                        this.page = 0;
+                        await parent.clearAllSettings();
+                        parent.render(true);
+                    }
+                    },
+                    cancel: {
+                    icon: '<i class="fas fa-times"></i>',
+                    label: game.i18n.localize("MaterialDeck.Cancel")
+                    }
+                },
+                default: "cancel"
+            });
+            d.render(true);
+        })
+
+        clearPage.on('click',(event) => {
+            const parent = this;
+
+            let d = new Dialog({
+                title: game.i18n.localize("MaterialDeck.ClearPage"),
+                content: game.i18n.localize("MaterialDeck.ClearPage_Content"),
+                buttons: {
+                    continue: {
+                    icon: '<i class="fas fa-check"></i>',
+                    label: game.i18n.localize("MaterialDeck.Continue"),
+                    callback: async () => {
+                        await parent.clearPage(parent.page*16)
+                        parent.render(true);
+                    }
+                    },
+                    cancel: {
+                    icon: '<i class="fas fa-times"></i>',
+                    label: game.i18n.localize("MaterialDeck.Cancel")
+                    }
+                },
+                default: "cancel"
+            });
+            d.render(true);
+        })
+
         nameField.on("change",event => {
             let id = event.target.id.replace('name','')-1;
             this.settings.name[id]=event.target.value;
@@ -489,8 +708,9 @@ export class soundboardConfigForm extends FormApplication {
                     //Show the sound selector
                     document.querySelector(`#ss${iteration}`).style='';
 
-                    const pl = game.playlists.entities.find(p => p._id == event.target.value);
-                    selectedPlaylist = pl._id;
+                    const playlistArray = compatibleCore("0.8.1") ? game.playlists.contents : game.playlists.entities;
+                    const pl = playlistArray.find(p => p.id == event.target.value)
+                    selectedPlaylist = pl.id;
 
                     //Get the sound select element
                     let SSpicker = document.getElementById(`soundSelect${iteration}`);
@@ -504,12 +724,20 @@ export class soundboardConfigForm extends FormApplication {
                     optionNone.innerHTML = game.i18n.localize("MaterialDeck.None");
                     SSpicker.appendChild(optionNone);
 
-                    for (let i=0; i<pl.sounds.length; i++){
-                        let newOption = document.createElement('option');
-                        newOption.value = pl.sounds[i]._id;
-                        newOption.innerHTML = pl.sounds[i].name;
-                        SSpicker.appendChild(newOption);
-                    }
+                    if (compatibleCore("0.8.1"))
+                        for (let sound of pl.sounds.contents) {
+                            let newOption = document.createElement('option');
+                            newOption.value = sound.id;
+                            newOption.innerHTML = sound.name;
+                            SSpicker.appendChild(newOption);
+                        } 
+                    else 
+                        for (let sound of pl.sounds) {
+                            let newOption = document.createElement('option');
+                            newOption.value = sound._id;
+                            newOption.innerHTML = sound.name;
+                            SSpicker.appendChild(newOption);
+                        }        
                 }
 
                 //Save the new playlist to this.settings, and update the settings
@@ -563,8 +791,8 @@ export class soundboardConfigForm extends FormApplication {
     
     async updateSettings(settings){
         if (game.user.isGM) {
-            await game.settings.set(MODULE.moduleName,'soundboardSettings',settings);
-            if (MODULE.enableModule) soundboard.updateAll();
+            await game.settings.set(moduleName,'soundboardSettings',settings);
+            if (enableModule) soundboard.updateAll();
         }
         else {
             const payload = {
@@ -574,4 +802,375 @@ export class soundboardConfigForm extends FormApplication {
             game.socket.emit(`module.MaterialDeck`, payload);
         }
     }
+
+    getPageEmpty(pageStart) {
+        let pageEmpty = true;
+        for (let i=pageStart; i<pageStart+16; i++) {
+            const name = this.settings.name[i];
+            const playlist = this.settings.selectedPlaylists[i];
+            const sound = this.settings.sounds[i];
+            if ((name != "" && name != null) || playlist != undefined || sound != undefined) {
+                pageEmpty = false;
+                break;
+            }
+        }
+        return pageEmpty;
+    }
+
+    async clearPage(pageStart,remove=false) {
+        if (remove) {
+            await this.settings.sounds.splice(pageStart,16);
+            await this.settings.colorOn.splice(pageStart,16);
+            await this.settings.colorOff.splice(pageStart,16);
+            await this.settings.mode.splice(pageStart,16);
+            await this.settings.img.splice(pageStart,16);
+            await this.settings.volume.splice(pageStart,16);
+            await this.settings.name.splice(pageStart,16);
+            await this.settings.selectedPlaylists.splice(pageStart,16);
+            await this.settings.src.splice(pageStart,16);
+            await this.settings.sounds.splice(pageStart,16);
+        }
+        else {
+            for (let i=pageStart; i<pageStart+16; i++) {
+                this.settings.sounds[i] = null;
+                this.settings.colorOn[i] = null;
+                this.settings.colorOff[i] = null;
+                this.settings.mode[i] = null;
+                this.settings.img[i] = null;
+                this.settings.volume[i] = null;
+                this.settings.name[i] = null;
+                this.settings.selectedPlaylists[i] = null;
+                this.settings.src[i] = null;
+                this.settings.sounds[i] = null;
+            }
+        }
+        
+        await this.updateSettings(this.settings);
+    }
+
+    async clearAllSettings() {
+        let array = [];
+        for (let i=0; i<16; i++) array[i] = "";
+        let arrayVolume = [];
+        for (let i=0; i<16; i++) arrayVolume[i] = "50";
+        let arrayZero = [];
+        for (let i=0; i<16; i++) arrayZero[i] = "0";
+    
+        const settings = {
+            playlist: "",
+            sounds: array,
+            colorOn: arrayZero,
+            colorOff: arrayZero,
+            mode: arrayZero,
+            toggle: arrayZero,
+            volume: arrayVolume
+        };
+        await this.updateSettings(settings);
+    }
+}
+
+export class exportConfigForm extends FormApplication {
+    constructor(data, options) {
+        super(data, options);
+        this.data = {};
+        this.name = "";
+        this.source = "";
+    }
+
+    /**
+     * Default Options for this FormApplication
+     */
+    static get defaultOptions() {
+        return mergeObject(super.defaultOptions, {
+            id: "MD_Export",
+            title: "Material Deck: " + game.i18n.localize("MaterialDeck.ExportDialog.Title"),
+            template: "./modules/MaterialDeck/templates/exportDialog.html",
+            width: 500,
+            height: "auto"
+        });
+    }
+
+    setData(data,source) {
+        this.data = data;
+        this.source = source;
+        this.name = source;
+    }
+
+    /**
+     * Provide data to the template
+     */
+    getData() {
+        return {
+            source: this.source,
+            name: this.name,
+            content: this.source == "soundboard" ? game.i18n.localize("MaterialDeck.ExportDialog.SoundboardContent") : game.i18n.localize("MaterialDeck.ExportDialog.MacroboardContent")
+        } 
+    }
+
+    /**
+     * Update on form submit
+     * @param {*} event 
+     * @param {*} formData 
+     */
+    async _updateObject(event, formData) {
+        this.download(this.data,formData.name)
+    }
+
+    activateListeners(html) {
+        super.activateListeners(html);
+    }
+
+    download(data,name) {
+        let dataStr = JSON.stringify(data);
+        let dataUri = 'data:application/json;charset=utf-8,'+ encodeURIComponent(dataStr);
+        let exportFileDefaultName = `${name}.json`;
+        let linkElement = document.createElement('a');
+        linkElement.setAttribute('href', dataUri);
+        linkElement.setAttribute('download', exportFileDefaultName);
+        linkElement.click();
+    }
+}
+
+export class importConfigForm extends FormApplication {
+    constructor(data, options) {
+        super(data, options);
+        this.data = {};
+        this.name = "";
+        this.source = "";
+        this.parent;
+    }
+
+    /**
+     * Default Options for this FormApplication
+     */
+    static get defaultOptions() {
+        return mergeObject(super.defaultOptions, {
+            id: "MD_Import",
+            title: "Material Deck: " + game.i18n.localize("MaterialDeck.ImportDialog.Title"),
+            template: "./modules/MaterialDeck/templates/importDialog.html",
+            width: 500,
+            height: "auto"
+        });
+    }
+
+    setData(source,parent) {
+        this.source = source;
+        this.name = source;
+        this.parent = parent;
+    }
+
+    /**
+     * Provide data to the template
+     */
+    getData() {
+        return {
+            source: this.source,
+            name: this.name,
+            content: this.source == "soundboard" ? game.i18n.localize("MaterialDeck.ImportDialog.SoundboardContent") : game.i18n.localize("MaterialDeck.ImportDialog.MacroboardContent")
+        } 
+    }
+
+    /**
+     * Update on form submit
+     * @param {*} event 
+     * @param {*} formData 
+     */
+    async _updateObject(event, formData) {
+        await this.parent.updateSettings(this.data);
+        this.parent.render(true);
+    }
+
+    activateListeners(html) {
+        super.activateListeners(html);
+
+        const upload = html.find("input[id='uploadJson']");
+
+        upload.on('change',(event) => {
+            event.preventDefault();
+            this.readJsonFile(event.target.files[0]); 
+        })
+    }
+
+    readJsonFile(jsonFile) {
+        var reader = new FileReader(); 
+        reader.addEventListener('load', (loadEvent) => { 
+          try { 
+            let json = JSON.parse(loadEvent.target.result); 
+            this.data = json;
+          } catch (error) { 
+            console.error(error); 
+          } 
+        }); 
+        reader.readAsText(jsonFile); 
+    } 
+
+
+}
+
+export class downloadUtility extends FormApplication {
+    constructor(data, options) {
+        super(data, options);
+        this.localSDversion = sdVersion;
+        this.masterSDversion;
+        this.localMSversion = msVersion;
+        this.masterMSversion;
+        this.releaseAssets = [];
+        this.profiles = [];
+
+        let parent = this;
+        setTimeout(function(){
+            parent.checkForUpdate('SD');
+            parent.checkForUpdate('MS');
+            parent.getReleaseData();
+        },100)
+    }
+
+    /**
+     * Default Options for this FormApplication
+     */
+    static get defaultOptions() {
+        return mergeObject(super.defaultOptions, {
+            id: "MD_DownloadUtility",
+            title: "Material Deck: " + game.i18n.localize("MaterialDeck.DownloadUtility.Title"),
+            template: "./modules/MaterialDeck/templates/downloadUtility.html",
+            width: 500,
+            height: "auto"
+        });
+    }
+
+    /**
+     * Provide data to the template
+     */
+    getData() {
+        let dlDisabled = true;
+
+        this.profiles = [];
+        let iteration = 0;
+        for (let asset of this.releaseAssets) {
+            let split = asset.name.split('.');
+            if (split[split.length-1] == 'streamDeckProfile') {
+                this.profiles.push({id: iteration, label:split[0], url:asset.browser_download_url});
+                iteration++;
+                dlDisabled = false;
+            }
+        }
+        if (this.localMSversion == undefined) this.localMSversion = 'unknown';
+        
+        return {
+            minimumSdVersion: game.modules.get("MaterialDeck").data.minimumSDversion.replace('v',''),
+            localSdVersion: this.localSDversion,
+            masterSdVersion: this.masterSDversion,
+            sdDlDisable: this.masterSDversion == undefined,
+            minimumMsVersion: game.modules.get("MaterialDeck").data.minimumMSversion.replace('v',''),
+            localMsVersion: this.localMSversion,
+            masterMsVersion: this.masterMSversion,
+            msDlDisable: this.masterMSversion == undefined,
+            profiles: this.profiles,
+            profileDlDisable: dlDisabled
+        } 
+    }
+
+    /**
+     * Update on form submit
+     * @param {*} event 
+     * @param {*} formData 
+     */
+    async _updateObject(event, formData) {
+   
+    }
+
+    activateListeners(html) {
+        super.activateListeners(html);
+
+        const downloadSd = html.find("button[id='downloadSd']");
+        const downloadMs = html.find("button[id='downloadMs']");
+        const downloadProfile = html.find("button[name='downloadProfile']")
+        const refresh = html.find("button[id='refresh']");
+
+        downloadSd.on('click', () => {
+            const version = document.getElementById('masterSdVersion').innerHTML;
+            if (version == '' || version == undefined || version == 'Error') return;
+            const url = `https://github.com/CDeenen/MaterialDeck_SD/releases/download/v${version}/com.cdeenen.materialdeck.streamDeckPlugin`;
+            this.downloadURI(url,'com.cdeenen.materialdeck.streamDeckPlugin')
+        })
+        downloadMs.on('click', () => {
+            const version = document.getElementById('masterMsVersion').innerHTML;
+            const os = document.getElementById('os').value;
+            if (version == '' || version == undefined || version == 'Error') return;
+            let name = `MaterialServer-${os}.zip`;
+            let url;
+            if (os == 'source') url = `https://github.com/CDeenen/MaterialServer/archive/refs/tags/v${version}.zip`;
+            else url = `https://github.com/CDeenen/MaterialServer/releases/download/v${version}/${name}`;
+            this.downloadURI(url,name)
+        })
+        downloadProfile.on('click',(event) => {
+            let id = event.currentTarget.id.replace('dlProfile-','');
+            this.downloadURI(this.profiles[id].url,`${this.profiles[id].label}.streamDeckProfile`);
+        })
+        refresh.on('click', () => {
+            document.getElementById('masterSdVersion').value = 'Getting data';
+            this.checkForUpdate('SD');
+            document.getElementById('masterMsVersion').value = 'Getting data';
+            this.checkForUpdate('MS');
+            this.getReleaseData();
+        })
+    }
+
+    downloadURI(uri, name) {
+        var link = document.createElement("a");
+        link.download = name;
+        link.href = uri;
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      }
+
+      getReleaseData() {
+        let parent = this;
+        const url = 'https://api.github.com/repos/CDeenen/MaterialDeck_SD/releases/latest';
+        var request = new XMLHttpRequest();
+        request.open('GET', url, true);
+        request.send(null);
+        request.onreadystatechange = function () {
+            if (request.readyState === 4 && request.status === 200) {
+                var type = request.getResponseHeader('Content-Type');
+                const data = JSON.parse(request.responseText);
+                parent.releaseAssets = data.assets;
+                parent.render(true);
+                if (type.indexOf("text") !== 1) {
+    
+                    return;
+                }
+            }
+        }
+        request.onerror = function () {
+        }
+    }
+
+    checkForUpdate(reqType) {
+        let parent = this;
+        let url;
+        if (reqType == 'SD') url = 'https://raw.githubusercontent.com/CDeenen/MaterialDeck_SD/master/Plugin/com.cdeenen.materialdeck.sdPlugin/manifest.json';
+        else if (reqType == 'MS') url = 'https://raw.githubusercontent.com/CDeenen/MaterialServer/master/src/Windows/package.json';
+        const elementId = reqType == 'SD' ? 'masterSdVersion' : 'masterMsVersion';
+
+        var request = new XMLHttpRequest();
+        request.open('GET', url, true);
+        request.send(null);
+        request.onreadystatechange = function () {
+            if (request.readyState === 4 && request.status === 200) {
+                var type = request.getResponseHeader('Content-Type');
+                if (type.indexOf("text") !== 1) {
+                    if (reqType == 'SD') parent.masterSDversion = JSON.parse(request.responseText).Version;
+                    else if (reqType == 'MS') parent.masterMSversion = JSON.parse(request.responseText).version;
+                    parent.render(true);
+                    return;
+                }
+                
+            }
+        }
+        request.onerror = function () {
+            document.getElementById(elementId).innerHTML = 'Error';
+        }
+    }     
 }

src/move.js

@@ -1,177 +0,0 @@
-import * as MODULE from "../MaterialDeck.js";
-import {streamDeck} from "../MaterialDeck.js";
-
-export class Move{
-    constructor(){
-        this.active = false;
-    }
-
-    update(settings,context){
-        const background = settings.background ? settings.background : '#000000';
-        const mode = settings.mode ? settings.mode : 'canvas';
-        const type = settings.type ? settings.type : 'move';
-
-        if ((MODULE.getPermission('MOVE','TOKEN') == false && mode == 'selectedToken') || (MODULE.getPermission('MOVE','CANVAS') == false && mode == 'canvas')) {
-            streamDeck.noPermission(context);
-            return;
-        }
-
-        let url = '';
-        if (mode == 'canvas' || (mode == 'selectedToken' && type == 'move')){
-            const dir = settings.dir ? settings.dir : 'center';
-            if (dir == 'center')  //center
-                url = "modules/MaterialDeck/img/move/center.png";
-            else if (dir == 'up') //up
-                url = "modules/MaterialDeck/img/move/up.png";
-            else if (dir == 'down') //down
-                url = "modules/MaterialDeck/img/move/down.png";
-            else if (dir == 'right') //right
-                url = "modules/MaterialDeck/img/move/right.png";
-            else if (dir == 'left') //left
-                url = "modules/MaterialDeck/img/move/left.png";
-            else if (dir == 'upRight') 
-                url = "modules/MaterialDeck/img/move/upright.png";
-            else if (dir == 'upLeft') 
-                url = "modules/MaterialDeck/img/move/upleft.png";
-            else if (dir == 'downRight') 
-                url = "modules/MaterialDeck/img/move/downright.png";
-            else if (dir == 'downLeft') 
-                url = "modules/MaterialDeck/img/move/downleft.png";
-            else if (dir == 'zoomIn') 
-                url = "modules/MaterialDeck/img/move/zoomin.png";
-            else if (dir ==  'zoomOut') 
-                url = "modules/MaterialDeck/img/move/zoomout.png";
-        }
-        else if (mode == 'selectedToken' && type == 'rotate'){
-            const value = isNaN(parseInt(settings.rotValue)) ? 0 : parseInt(settings.rotValue);
-            if (value >= 0) 
-                url = "modules/MaterialDeck/img/move/rotatecw.png";
-            else
-                url = "modules/MaterialDeck/img/move/rotateccw.png";
-        }
-        streamDeck.setIcon(context,url,{background:background});
-        streamDeck.setTitle('',context);
-    }
-
-    keyPress(settings){
-        if (canvas.scene == null) return;
-        if ((MODULE.getPermission('MOVE','TOKEN') == false && mode == 'selectedToken') || (MODULE.getPermission('MOVE','CANVAS') == false && mode == 'canvas')) {
-            streamDeck.noPermission(context);
-            return;
-        }
-
-        const dir = settings.dir ? settings.dir : 'center';
-        const mode = settings.mode ? settings.mode : 'canvas';
-        const type = settings.type ? settings.type : 'move';
-
-        let token;
-        if (mode == 'selectedToken') {
-            const selection = settings.selection ? settings.selection : 'selected';
-            const tokenIdentifier = settings.tokenName ? settings.tokenName : '';
-    
-            if (selection == 'selected') token = canvas.tokens.children[0].children.find(p => p.id == MODULE.selectedTokenId);
-            else if (selection != 'selected' && tokenIdentifier == '') {}
-            else if (selection == 'tokenName') token = canvas.tokens.children[0].children.find(p => p.name == tokenIdentifier);
-            else if (selection == 'actorName') token = canvas.tokens.children[0].children.find(p => p.actor.name == tokenIdentifier);
-            else if (selection == 'tokenId') token = canvas.tokens.children[0].children.find(p => p.id == tokenIdentifier);
-            else if (selection == 'actorId') token = canvas.tokens.children[0].children.find(p => p.actor.id == tokenIdentifier);
-            if (token == undefined) return;
-        }
-
-        if (type == 'move'){
-            if (dir ==  'zoomIn') {//zoom in
-                let viewPosition = canvas.scene._viewPosition;
-                viewPosition.scale = viewPosition.scale*1.05;
-                viewPosition.duration = 100;
-                canvas.animatePan(viewPosition);
-            }
-            else if (dir == 'zoomOut') {//zoom out
-                let viewPosition = canvas.scene._viewPosition;
-                viewPosition.scale = viewPosition.scale*0.95;
-                viewPosition.duration = 100;
-                canvas.animatePan(viewPosition);
-            }
-            else {
-                if (settings.mode == 'selectedToken')
-                    this.moveToken(token,dir);
-                else    
-                    this.moveCanvas(dir);
-            }
-        }
-        else if (type == 'rotate' && mode == 'selectedToken'){
-            const rotType = settings.rot ? settings.rot : 'to';
-            const value = isNaN(parseInt(settings.rotValue)) ? 0 : parseInt(settings.rotValue);
-
-            let rotationVal;
-            if (rotType == 'by') rotationVal = token.data.rotation + value;
-            else if (rotType == 'to') rotationVal = value;
-            
-            token.update({rotation: rotationVal});
-        }
-    }
-
-    async moveToken(token,dir){
-        const gridSize = canvas.scene.data.grid;
-        let x = token.x;
-        let y = token.y;
-
-        if (dir == 'up') y -= gridSize;
-        else if (dir == 'down') y += gridSize;
-        else if (dir == 'right') x += gridSize;
-        else if (dir == 'left') x -= gridSize;
-        else if (dir == 'upRight') {
-            x += gridSize;
-            y -= gridSize;
-        }
-        else if (dir == 'upLeft') {
-            x -= gridSize;
-            y -= gridSize;
-        }
-        else if (dir == 'downRight') {
-            x += gridSize;
-            y += gridSize;
-        }
-        else if (dir == 'downLeft') {
-            x -= gridSize;
-            y += gridSize;
-        }
-        else if (dir == 'center') {
-            let location = token.getCenter(x,y); 
-            canvas.animatePan(location);
-        }
-        if (game.user.isGM == false && (token.can(game.user,"control") == false || token.checkCollision(token.getCenter(x, y)))) return;
-        token.update({x:x,y:y});
-    };
-
-    moveCanvas(dir){
-        let viewPosition = canvas.scene._viewPosition;
-        const gridSize = canvas.scene.data.grid;
-        viewPosition.duration = 100;
-        
-        if (dir == 'up') viewPosition.y -= gridSize;
-        else if (dir == 'down') viewPosition.y += gridSize;
-        else if (dir == 'right') viewPosition.x += gridSize;
-        else if (dir == 'left') viewPosition.x -= gridSize;
-        else if (dir == 'upRight') {
-            viewPosition.x += gridSize;
-            viewPosition.y -= gridSize;
-        }
-        else if (dir == 'upLeft') {
-            viewPosition.x -= gridSize;
-            viewPosition.y -= gridSize;
-        }
-        else if (dir == 'downRight') {
-            viewPosition.x += gridSize;
-            viewPosition.y += gridSize;
-        }
-        else if (dir == 'downLeft') {
-            viewPosition.x -= gridSize;
-            viewPosition.y += gridSize;
-        }
-        else if (dir == 'center') {
-            viewPosition.x = (canvas.dimensions.sceneWidth+window.innerWidth)/2;
-            viewPosition.y = (canvas.dimensions.sceneHeight+window.innerHeight)/2;
-        }
-        canvas.animatePan(viewPosition);
-    }
-}

src/othercontrols.js

@@ -1,73 +1,95 @@
 import * as MODULE from "../MaterialDeck.js";
 import {streamDeck} from "../MaterialDeck.js";
+import {compatibleCore} from "./misc.js";
 
 export class OtherControls{
     constructor(){
         this.active = false;
         this.rollData = {};
+        this.rollOption = 'dialog';
     }
 
-    async updateAll(){
+    setRollOption(option) {
+        this.rollOption = option;
+        this.updateAll();
+    }
+
+    async updateAll(options={}){
         if (this.active == false) return;
-        for (let i=0; i<32; i++){   
-            const data = streamDeck.buttonContext[i];
-            if (data == undefined || data.action != 'other') continue;
-            await this.update(data.settings,data.context);
+        for (let device of streamDeck.buttonContext) {
+            if (device?.buttons == undefined) continue;
+            for (let i=0; i<device.buttons.length; i++){   
+                const data = device.buttons[i];
+                if (data == undefined || data.action != 'other') continue;
+                await this.update(data.settings,data.context,device.device,options);
+            }
         }
     }
 
-    update(settings,context){
+    update(settings,context,device,options={}){
         this.active = true;
         const mode = settings.otherMode ? settings.otherMode : 'pause';
 
         if (mode == 'pause')    //pause
-            this.updatePause(settings,context);
+            this.updatePause(settings,context,device,options);
+        else if (mode == 'move')     //move canvas
+            this.updateMove(settings,context,device,options);
         else if (mode == 'controlButtons')    //control buttons
-            this.updateControl(settings,context);
+            this.updateControl(settings,context,device,options);
         else if (mode == 'darkness')   //darkness
-            this.updateDarkness(settings,context);
+            this.updateDarkness(settings,context,device,options);
         else if (mode == 'rollDice')    //roll dice
-            this.updateRollDice(settings,context);
+            this.updateRollDice(settings,context,device,options);
         else if (mode == 'rollTables')    //roll tables
-            this.updateRollTable(settings,context);
+            this.updateRollTable(settings,context,device,options);
         else if (mode == 'sidebarTab')    //open sidebar tab
-            this.updateSidebar(settings,context);
+            this.updateSidebar(settings,context,device,options);
+        else if (mode == 'compendiumBrowser')    //open compendium browser
+            this.updateCompendiumBrowser(settings,context,device,options);
         else if (mode == 'compendium')    //open compendium
-            this.updateCompendium(settings,context);
+            this.updateCompendium(settings,context,device,options);
         else if (mode == 'journal')    //open journal
-            this.updateJournal(settings,context);
+            this.updateJournal(settings,context,device,options);
         else if (mode == 'chatMessage')
-            this.updateChatMessage(settings,context);
+            this.updateChatMessage(settings,context,device,options);
+        else if (mode == 'rollOptions')
+            this.updateRollOptions(settings,context,device,options);
     }
 
-    keyPress(settings,context){
+    keyPress(settings,context,device){
         const mode = settings.otherMode ? settings.otherMode : 'pause';
 
         if (mode == 'pause')     //pause
             this.keyPressPause(settings);
+        else if (mode == 'move')     //move canvas
+            this.keyPressMove(settings);
         else if (mode == 'controlButtons')    //control buttons
             this.keyPressControl(settings);
         else if (mode == 'darkness')    //darkness controll
             this.keyPressDarkness(settings);
         else if (mode == 'rollDice')    //roll dice
-            this.keyPressRollDice(settings,context);
+            this.keyPressRollDice(settings,context,device);
         else if (mode == 'rollTables')    //roll tables
             this.keyPressRollTable(settings);
         else if (mode == 'sidebarTab')    //sidebar
             this.keyPressSidebar(settings);
+        else if (mode == 'compendiumBrowser')    //open compendium browser
+            this.keyPressCompendiumBrowser(settings);
         else if (mode == 'compendium')    //open compendium
             this.keyPressCompendium(settings);
         else if (mode == 'journal')    //open journal
             this.keyPressJournal(settings);
         else if (mode == 'chatMessage')
             this.keyPressChatMessage(settings);
+        else if (mode == 'rollOptions')
+            this.keyPressRollOptions(settings);
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
-    updatePause(settings,context){
+    updatePause(settings,context,device,options={}){
         if (MODULE.getPermission('OTHER','PAUSE') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
 
@@ -86,7 +108,7 @@ export class OtherControls{
         }
         else if (pauseFunction == 'toggle')  //toggle
             src = 'modules/MaterialDeck/img/other/pause/playpause.png';
-        streamDeck.setIcon(context,src,{background:background,ring:2,ringColor:ringColor,overlay:true});
+        streamDeck.setIcon(context,device,src,{background:background,ring:2,ringColor:ringColor,overlay:true});
         streamDeck.setTitle('',context);
     }
 
@@ -97,22 +119,103 @@ export class OtherControls{
 
         if (pauseFunction == 'pause'){ //Pause game
             if (game.paused) return; 
-            game.togglePause();
+            game.togglePause(true,true);
         }
         else if (pauseFunction == 'resume'){ //Resume game
             if (game.paused == false) return; 
-            game.togglePause();
+            game.togglePause(false,true);
         }
         else if (pauseFunction == 'toggle') { //toggle
-            game.togglePause();
+            game.togglePause(!game.paused,true);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    updateMove(settings,context,device,options={}){
+        let url = '';
+        const dir = settings.dir ? settings.dir : 'center';
+        const background = settings.background ? settings.background : '#000000';
+        if (dir == 'center')  //center
+            url = "modules/MaterialDeck/img/move/center.png";
+        else if (dir == 'up') //up
+            url = "modules/MaterialDeck/img/move/up.png";
+        else if (dir == 'down') //down
+            url = "modules/MaterialDeck/img/move/down.png";
+        else if (dir == 'right') //right
+            url = "modules/MaterialDeck/img/move/right.png";
+        else if (dir == 'left') //left
+            url = "modules/MaterialDeck/img/move/left.png";
+        else if (dir == 'upRight') 
+            url = "modules/MaterialDeck/img/move/upright.png";
+        else if (dir == 'upLeft') 
+            url = "modules/MaterialDeck/img/move/upleft.png";
+        else if (dir == 'downRight') 
+            url = "modules/MaterialDeck/img/move/downright.png";
+        else if (dir == 'downLeft') 
+            url = "modules/MaterialDeck/img/move/downleft.png";
+        else if (dir == 'zoomIn') 
+            url = "modules/MaterialDeck/img/move/zoomin.png";
+        else if (dir ==  'zoomOut') 
+            url = "modules/MaterialDeck/img/move/zoomout.png";
+        
+        streamDeck.setIcon(context,device,url,{background:background,overlay:true});
+        streamDeck.setTitle('',context);
+    }
+
+    keyPressMove(settings){
+        if (canvas.scene == null) return;
+        const dir = settings.dir ? settings.dir : 'center';
+        if (dir ==  'zoomIn') {//zoom in
+            let viewPosition = canvas.scene._viewPosition;
+            viewPosition.scale = viewPosition.scale*1.05;
+            viewPosition.duration = 100;
+            canvas.animatePan(viewPosition);
+        }
+        else if (dir == 'zoomOut') {//zoom out
+            let viewPosition = canvas.scene._viewPosition;
+            viewPosition.scale = viewPosition.scale*0.95;
+            viewPosition.duration = 100;
+            canvas.animatePan(viewPosition);
+        }
+        else {
+            let viewPosition = canvas.scene._viewPosition;
+            const gridSize = canvas.scene.data.grid;
+            viewPosition.duration = 100;
+            
+            if (dir == 'up') viewPosition.y -= gridSize;
+            else if (dir == 'down') viewPosition.y += gridSize;
+            else if (dir == 'right') viewPosition.x += gridSize;
+            else if (dir == 'left') viewPosition.x -= gridSize;
+            else if (dir == 'upRight') {
+                viewPosition.x += gridSize;
+                viewPosition.y -= gridSize;
+            }
+            else if (dir == 'upLeft') {
+                viewPosition.x -= gridSize;
+                viewPosition.y -= gridSize;
+            }
+            else if (dir == 'downRight') {
+                viewPosition.x += gridSize;
+                viewPosition.y += gridSize;
+            }
+            else if (dir == 'downLeft') {
+                viewPosition.x -= gridSize;
+                viewPosition.y += gridSize;
+            }
+            else if (dir == 'center') {
+                viewPosition.x = (canvas.dimensions.sceneWidth+window.innerWidth)/2;
+                viewPosition.y = (canvas.dimensions.sceneHeight+window.innerHeight)/2;
+            }
+            canvas.animatePan(viewPosition);
         }
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////
     
-    updateControl(settings,context){
+    updateControl(settings,context,device,options={}){
         if (MODULE.getPermission('OTHER','CONTROL') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
         const control = settings.control ? settings.control : 'dispControls';
@@ -130,11 +233,12 @@ export class OtherControls{
             controlNr--;
 
             const selectedControl = ui.controls.controls[controlNr];
-            if (selectedControl.visible == false) {
-                streamDeck.noPermission(context,false);
-                return;
-            }
+            
             if (selectedControl != undefined){
+                if (selectedControl.visible == false) {
+                    streamDeck.noPermission(context,device,false);
+                    return;
+                }
                 if (tool == 'open'){  //open category
                     txt = game.i18n.localize(selectedControl.title);
                     src = selectedControl.icon;
@@ -153,7 +257,7 @@ export class OtherControls{
                 const selectedTool = selectedControl.tools[controlNr];
                 if (selectedTool != undefined){
                     if (selectedControl.visible == false || selectedTool.visible == false) {
-                        streamDeck.noPermission(context,false);
+                        streamDeck.noPermission(context,device,false);
                         return;
                     }
                     txt = game.i18n.localize(selectedTool.title);
@@ -171,7 +275,7 @@ export class OtherControls{
             const selectedControl = ui.controls.controls.find(c => c.name == control);
             if (selectedControl != undefined){
                 if (selectedControl.visible == false) {
-                    streamDeck.noPermission(context,false);
+                    streamDeck.noPermission(context,device,false);
                     return;
                 }
                 if (tool == 'open'){  //open category
@@ -184,7 +288,7 @@ export class OtherControls{
                     const selectedTool = selectedControl.tools.find(t => t.name == tool);
                     if (selectedTool != undefined){
                         if (selectedTool.visible == false) {
-                            streamDeck.noPermission(context,false);
+                            streamDeck.noPermission(context,device,false);
                             return;
                         }
                         txt = game.i18n.localize(selectedTool.title);
@@ -199,7 +303,7 @@ export class OtherControls{
                 }
             }
         }
-        streamDeck.setIcon(context,src,{background:background,ring:2,ringColor:ringColor});
+        streamDeck.setIcon(context,device,src,{background:background,ring:2,ringColor:ringColor});
         streamDeck.setTitle(txt,context);
     }
 
@@ -214,14 +318,24 @@ export class OtherControls{
             if (isNaN(controlNr)) controlNr = 1;
             controlNr--;
             const selectedControl = ui.controls.controls[controlNr];
+            
             if (selectedControl != undefined){
                 if (selectedControl.visible == false) {
-                    streamDeck.noPermission(context,false);
+                    streamDeck.noPermission(context,device,false);
                     return;
                 }
-                ui.controls.activeControl = 'token';
+                ui.controls.activeControl = selectedControl.name;
                 selectedControl.activeTool = selectedControl.activeTool;
-                canvas.getLayer(selectedControl.layer).activate();
+                if (compatibleCore("0.8.2")) {
+                    for (let layer of canvas.layers) {
+                        if (layer.options == undefined) continue;
+                        if (layer.options.name == selectedControl.layer) {
+                            layer.activate();
+                            break;
+                        }
+                    }
+                }
+                else canvas.getLayer(selectedControl.layer).activate();
             }
         }
         else if (control == 'dispTools'){  //displayed tools
@@ -231,13 +345,13 @@ export class OtherControls{
             const selectedControl = ui.controls.controls.find(c => c.name == ui.controls.activeControl);
             if (selectedControl != undefined){
                 if (selectedControl.visible == false) {
-                    streamDeck.noPermission(context,false);
+                    streamDeck.noPermission(context,device,false);
                     return;
                 }
                 const selectedTool = selectedControl.tools[controlNr];
                 if (selectedTool != undefined){
                     if (selectedTool.visible == false) {
-                        streamDeck.noPermission(context,false);
+                        streamDeck.noPermission(context,device,false);
                         return;
                     }
                     if (selectedTool.toggle) {
@@ -256,23 +370,41 @@ export class OtherControls{
             const selectedControl = ui.controls.controls.find(c => c.name == control);
             if (selectedControl != undefined){
                 if (selectedControl.visible == false) {
-                    streamDeck.noPermission(context,false);
+                    streamDeck.noPermission(context,device,false);
                     return;
                 }
                 if (tool == 'open'){  //open category
-                    ui.controls.activeControl = 'token';
+                    ui.controls.activeControl = control;
                     selectedControl.activeTool = selectedControl.activeTool;
-                    canvas.getLayer(selectedControl.layer).activate();
+                    if (compatibleCore("0.8.2")) {
+                        for (let layer of canvas.layers) {
+                            if (layer.options == undefined) continue;
+                            if (layer.options.name == selectedControl.layer) {
+                                layer.activate();
+                                break;
+                            }
+                        }
+                    }
+                    else canvas.getLayer(selectedControl.layer).activate();
                 }
                 else {
                     const selectedTool = selectedControl.tools.find(t => t.name == tool);
                     if (selectedTool != undefined){
                         if (selectedTool.visible == false) {
-                            streamDeck.noPermission(context,false);
+                            streamDeck.noPermission(context,device,false);
                             return;
                         }
                         ui.controls.activeControl = control;
-                        canvas.getLayer(selectedControl.layer).activate();
+                        if (compatibleCore("0.8.2")) {
+                            for (let layer of canvas.layers) {
+                                if (layer.options == undefined) continue;
+                                if (layer.options.name == selectedControl.layer) {
+                                    layer.activate();
+                                    break;
+                                }
+                            }
+                        }
+                        else canvas.getLayer(selectedControl.layer).activate();
                         if (selectedTool.toggle) {
                             selectedTool.active = !selectedTool.active;
                             selectedTool.onClick(selectedTool.active);
@@ -291,9 +423,9 @@ export class OtherControls{
 
     //////////////////////////////////////////////////////////////////////////////////////////
 
-    updateDarkness(settings,context){
+    updateDarkness(settings,context,device,options={}){
         if (MODULE.getPermission('OTHER','DARKNESS') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
         const func = settings.darknessFunction ? settings.darknessFunction : 'value';
@@ -316,7 +448,7 @@ export class OtherControls{
             txt += darkness;
         }
         streamDeck.setTitle(txt,context);
-        streamDeck.setIcon(context,src,{background:background});
+        streamDeck.setIcon(context,device,src,{background:background,overlay:true});
     }
 
     keyPressDarkness(settings) {
@@ -337,9 +469,9 @@ export class OtherControls{
 
     //////////////////////////////////////////////////////////////////////////////////////////
 
-    updateRollDice(settings,context){
+    updateRollDice(settings,context,device,options={}){
         if (MODULE.getPermission('OTHER','DICE') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
         const background = settings.background ? settings.background : '#000000';
@@ -348,10 +480,10 @@ export class OtherControls{
         if (settings.displayDiceName) txt = 'Roll: ' + settings.rollDiceFormula;
 
         streamDeck.setTitle(txt,context);
-        streamDeck.setIcon(context,'',{background:background});
+        streamDeck.setIcon(context,device,'',{background:background});
     }
 
-    keyPressRollDice(settings,context){
+    keyPressRollDice(settings,context,device){
         if (MODULE.getPermission('OTHER','DICE') == false ) return;
         if (settings.rollDiceFormula == undefined || settings.rollDiceFormula == '') return;
         const rollFunction = settings.rollDiceFunction ? settings.rollDiceFunction : 'public';
@@ -359,7 +491,7 @@ export class OtherControls{
         let actor;
         let tokenControlled = false;
 
-        if (MODULE.selectedTokenId != undefined) actor = canvas.tokens.children[0].children.find(p => p.id == MODULE.selectedTokenId).actor;
+        if (canvas.tokens.controlled[0] != undefined) actor = canvas.tokens.controlled[0].actor;
         if (actor != undefined) tokenControlled = true;
 
         let r;
@@ -389,16 +521,17 @@ export class OtherControls{
 
     //////////////////////////////////////////////////////////////////////////////////////////
 
-    updateRollTable(settings,context){
+    updateRollTable(settings,context,device,options={}){
         const name = settings.rollTableName;
         if (name == undefined) return;
         if (MODULE.getPermission('OTHER','TABLES') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
 
         const background = settings.background ? settings.background : '#000000';
         const table = game.tables.getName(name);
+        if (table == undefined) return;
 
         let txt = settings.displayRollName ? table.name : '';
         let src = settings.displayRollIcon ? table.data.img : '';
@@ -409,13 +542,13 @@ export class OtherControls{
         }
         else {
             if (table.permission < 2 && MODULE.getPermission('OTHER','TABLES_ALL') == false ) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
         }
 
         streamDeck.setTitle(txt,context);
-        streamDeck.setIcon(context,src,{background:background});
+        streamDeck.setIcon(context,device,src,{background:background});
     }
 
     keyPressRollTable(settings){
@@ -474,60 +607,102 @@ export class OtherControls{
         return icon;
     }
     
-    updateSidebar(settings,context){
+    updateSidebar(settings,context,device,options={}){
         if (MODULE.getPermission('OTHER','SIDEBAR') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
+        const popOut = settings.sidebarPopOut ? settings.sidebarPopOut : false;
         const sidebarTab = settings.sidebarTab ? settings.sidebarTab : 'chat';
         const background = settings.background ? settings.background : '#000000';
         const collapsed = ui.sidebar._collapsed;
+        const activeTab = ui.sidebar.activeTab;
         const ringOffColor = settings.offRing ? settings.offRing : '#000000';
         const ringOnColor = settings.onRing ? settings.onRing : '#00FF00';
-        const ringColor = (sidebarTab == 'collapse' && collapsed) ? ringOnColor : ringOffColor;
+        let ringColor = ringOffColor;
+        if (popOut && options.sidebarTab == sidebarTab) {
+            ringColor = options.renderPopout ? ringOnColor : ringOffColor;
+        }
+        else if (popOut == false) ringColor = (sidebarTab == 'collapse' && collapsed || (activeTab == sidebarTab)) ? ringOnColor : ringOffColor;
         const name = settings.displaySidebarName ? this.getSidebarName(sidebarTab) : '';
         const icon = settings.displaySidebarIcon ? this.getSidebarIcon(sidebarTab) : '';
 
         streamDeck.setTitle(name,context);
-        streamDeck.setIcon(context,icon,{background:background,ring:2,ringColor:ringColor});
+        streamDeck.setIcon(context,device,icon,{background:background,ring:2,ringColor:ringColor});
     }
 
     keyPressSidebar(settings){
         if (MODULE.getPermission('OTHER','SIDEBAR') == false ) return;
         const sidebarTab = settings.sidebarTab ? settings.sidebarTab : 'chat';
+        const popOut = settings.sidebarPopOut ? settings.sidebarPopOut : false;
         
         if (sidebarTab == 'collapse'){
             const collapsed = ui.sidebar._collapsed;
             if (collapsed) ui.sidebar.expand();
             else if (collapsed == false) ui.sidebar.collapse();
         }
-        else ui.sidebar.activateTab(sidebarTab);
+        else if (popOut == false) ui.sidebar.activateTab(sidebarTab);
+        else {
+            const element = document.getElementById(sidebarTab+"-popout");
+            if (element == null) ui?.[sidebarTab].renderPopout();
+            else element.getElementsByClassName("close")[0].click();
+        }
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////
 
-    updateCompendium(settings,context){
-        const name = settings.compendiumName;
-        if (name == undefined) return;
-        if (MODULE.getPermission('OTHER','COMPENDIUM') == false ) {
-            streamDeck.noPermission(context);
-            return;
-        }
-
-        const compendium = game.packs.entries.find(p=>p.metadata.label == name);
-        if (compendium == undefined) return;
-        if (compendium.private && MODULE.getPermission('OTHER','COMPENDIUM_ALL') == false) {
-            streamDeck.noPermission(context);
-            return;
-        }
+    updateCompendiumBrowser(settings,context,device,options={}){
+        let rendered = options.renderCompendiumBrowser;
+        if (rendered == undefined && game.system.id == "pf2e") rendered = (document.getElementById("app-1") != null);
+        else if (rendered == undefined) rendered = (document.getElementById("compendium-popout") != null);
         const background = settings.background ? settings.background : '#000000';
         const ringOffColor = settings.offRing ? settings.offRing : '#000000';
         const ringOnColor = settings.onRing ? settings.onRing : '#00FF00';
-        const ringColor = compendium.rendered ? ringOnColor : ringOffColor;
+        const ringColor = rendered ? ringOnColor : ringOffColor;
         const txt = settings.displayCompendiumName ? name : '';
 
         streamDeck.setTitle(txt,context);
-        streamDeck.setIcon(context,"",{background:background,ring:2,ringColor:ringColor});
+        streamDeck.setIcon(context,device,"",{background:background,ring:2,ringColor:ringColor});
+    }
+
+    keyPressCompendiumBrowser(settings){
+        let element = null;
+        if (game.system.id == "pf2e") element = document.getElementById("app-1")
+        else element = document.getElementById("compendium-popout");
+        const rendered = (element != null);
+
+        if (rendered) 
+            element.getElementsByClassName("close")[0].click();
+        else if (game.system.id == "pf2e")
+            document.getElementsByClassName("compendium-browser-btn")[0].click()
+        else
+            ui.compendium.renderPopout();
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////
+
+    updateCompendium(settings,context,device,options={}){
+        const name = settings.compendiumName;
+        if (name == undefined) return;
+        if (MODULE.getPermission('OTHER','COMPENDIUM') == false ) {
+            streamDeck.noPermission(context,device);
+            return;
+        }
+        const compendium = game.packs.find(p=>p.metadata.label == name);
+        if (compendium == undefined) return;
+        if (compendium.private && MODULE.getPermission('OTHER','COMPENDIUM_ALL') == false) {
+            streamDeck.noPermission(context,device);
+            return;
+        }
+        const rendered = compatibleCore("0.8.5") ? compendium.apps[0].rendered : compendium.rendered;
+        const background = settings.background ? settings.background : '#000000';
+        const ringOffColor = settings.offRing ? settings.offRing : '#000000';
+        const ringOnColor = settings.onRing ? settings.onRing : '#00FF00';
+        const ringColor = rendered ? ringOnColor : ringOffColor;
+        const txt = settings.displayCompendiumName ? name : '';
+
+        streamDeck.setTitle(txt,context);
+        streamDeck.setIcon(context,device,"",{background:background,ring:2,ringColor:ringColor});
     }
 
     keyPressCompendium(settings){
@@ -535,16 +710,17 @@ export class OtherControls{
         if (name == undefined) return;
         if (MODULE.getPermission('OTHER','COMPENDIUM') == false ) return;
 
-        const compendium = game.packs.entries.find(p=>p.metadata.label == name);
+        const compendium = game.packs.find(p=>p.metadata.label == name);
+        const rendered = compatibleCore("0.8.5") ? compendium.apps[0].rendered : compendium.rendered;
         if (compendium == undefined) return;
         if (compendium.private && MODULE.getPermission('OTHER','COMPENDIUM_ALL') == false) return;
-        if (compendium.rendered) compendium.close();
+        else if (rendered) compatibleCore("0.8.5") ? compendium.apps[0].close() : compendium.close();
         else compendium.render(true);
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////
 
-    updateJournal(settings,context){
+    updateJournal(settings,context,device,options={}){
         const name = settings.compendiumName;
         if (name == undefined) return;
 
@@ -552,22 +728,30 @@ export class OtherControls{
         if (journal == undefined) return;
 
         if (MODULE.getPermission('OTHER','JOURNAL') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
         if (journal.permission < 2 && MODULE.getPermission('OTHER','JOURNAL_ALL') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
+        let rendered = false;
+        
+        if (options?.sheet?.title == name) {
+            if (options.hook == 'renderJournalSheet') rendered = true;
+            else if (options.hook == 'closeJournalSheet') rendered = false;
+        }
+        else 
+            if (document.getElementById("journalentry-sheet-"+journal.id) != null) rendered = true;
 
         const background = settings.background ? settings.background : '#000000';
         const ringOffColor = settings.offRing ? settings.offRing : '#000000';
         const ringOnColor = settings.onRing ? settings.onRing : '#00FF00';
-        const ringColor = journal.sheet.rendered ? ringOnColor : ringOffColor;
+        const ringColor = rendered ? ringOnColor : ringOffColor;
         const txt = settings.displayCompendiumName ? name : '';
 
         streamDeck.setTitle(txt,context);
-        streamDeck.setIcon(context,"",{background:background,ring:2,ringColor:ringColor});
+        streamDeck.setIcon(context,device,"",{background:background,ring:2,ringColor:ringColor});
     }
 
     keyPressJournal(settings){
@@ -580,21 +764,20 @@ export class OtherControls{
         if (MODULE.getPermission('OTHER','JOURNAL') == false ) return;
         if (journal.permission < 2 && MODULE.getPermission('OTHER','JOURNAL_ALL') == false ) return;
 
-        const element = document.getElementById("journal-"+journal.id);
-        if (element == null) journal.render(true);
+        if (journal.sheet.rendered == false) journal.sheet.render(true);
         else journal.sheet.close();
     }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-    updateChatMessage(settings,context){
+    updateChatMessage(settings,context,device,options={}){
         if (MODULE.getPermission('OTHER','CHAT') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
         const background = settings.background ? settings.background : '#000000';
         streamDeck.setTitle("",context);
-        streamDeck.setIcon(context,"",{background:background});
+        streamDeck.setIcon(context,device,"",{background:background});
     }
 
     keyPressChatMessage(settings){
@@ -608,4 +791,25 @@ export class OtherControls{
         };
         ChatMessage.create(chatData, {});
     }
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+    updateRollOptions(settings,context,device,options={}){
+        const background = settings.background ? settings.background : '#000000';
+        const ringOffColor = settings.offRing ? settings.offRing : '#000000';
+        const ringOnColor = settings.onRing ? settings.onRing : '#00FF00';
+        const iconSrc = "modules/MaterialDeck/img/other/d20.png";
+        const rollOption = settings.rollOptionFunction ? settings.rollOptionFunction : 'normal';
+        const ringColor = (rollOption == this.rollOption) ? ringOnColor : ringOffColor;
+        streamDeck.setTitle("",context);
+        streamDeck.setIcon(context,device,iconSrc,{background:background,ring:2,ringColor:ringColor,overlay:true});
+    }
+
+    keyPressRollOptions(settings){
+        const rollOption = settings.rollOptionFunction ? settings.rollOptionFunction : 'normal';
+        if (this.rollOption != rollOption) {
+            this.rollOption = rollOption;
+            this.updateAll();
+        }
+    }
 }

src/playlist.js

@@ -1,5 +1,6 @@
 import * as MODULE from "../MaterialDeck.js";
 import {streamDeck} from "../MaterialDeck.js";
+import {compatibleCore} from "./misc.js";
 
 export class PlaylistControl{
     constructor(){
@@ -10,26 +11,29 @@ export class PlaylistControl{
 
     async updateAll(){
         if (this.active == false) return;
-        for (let i=0; i<32; i++){   
-            const data = streamDeck.buttonContext[i];
-            if (data == undefined || data.action != 'playlist') continue;
-            await this.update(data.settings,data.context);
+        for (let device of streamDeck.buttonContext) {
+            if (device?.buttons == undefined) continue;
+            for (let i=0; i<device.buttons.length; i++){   
+                const data = device.buttons[i];
+                if (data == undefined || data.action != 'playlist') continue;
+                await this.update(data.settings,data.context,device.device);
+            }
         }
     }
 
-    update(settings,context){
+    update(settings,context,device){
         if (MODULE.getPermission('PLAYLIST','PLAY') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
         this.active = true;
         const mode = settings.playlistMode ? settings.playlistMode : 'playlist';
         
         if (mode == 'playlist'){
-            this.updatePlaylist(settings,context);
+            this.updatePlaylist(settings,context,device);
         }
         else if (mode == 'track'){
-            this.updateTrack(settings,context);
+            this.updateTrack(settings,context,device);
         }
         else {
             const src = 'modules/MaterialDeck/img/playlist/stop.png';
@@ -37,18 +41,19 @@ export class PlaylistControl{
             const ringColor = (game.playlists.playing.length > 0) ? '#00FF00' : '#000000';
             const ring = (game.playlists.playing.length > 0) ? 2 : 1;
             const txt = settings.displayPlaylistName ? this.getPlaylist(this.playlistOffset).name : '';
-            streamDeck.setIcon(context,src,{background:background,ring:ring,ringColor:ringColor,overlay:true});
+            streamDeck.setIcon(context,device,src,{background:background,ring:ring,ringColor:ringColor,overlay:true});
             streamDeck.setTitle(txt,context);
         }
     }
 
-    updatePlaylist(settings,context){
+    updatePlaylist(settings,context,device){
         let name = "";
         let ringColor = "#000000"
         const background = settings.background ? settings.background : '#000000';
         const ringOffColor = settings.offRing ? settings.offRing : '#FF0000';
         const ringOnColor = settings.onRing ? settings.onRing : '#00FF00';
         const playlistType = settings.playlistType ? settings.playlistType : 'playStop';
+        let src = "modules/MaterialDeck/img/transparant.png";
 
         //Play/Stop
         if (playlistType == 'playStop'){
@@ -58,6 +63,7 @@ export class PlaylistControl{
             playlistNr += this.playlistOffset;
 
             let playlist = this.getPlaylist(playlistNr);
+            
             if (playlist != undefined){
                 if (playlist.playing) 
                     ringColor = ringOnColor;
@@ -71,7 +77,7 @@ export class PlaylistControl{
         else if (playlistType == 'offset') {
             let playlistOffset = parseInt(settings.offset);
             if (isNaN(playlistOffset)) playlistOffset = 0;
-            if (playlistOffset == this.playlistOffset) ringColor = ringOnColor;
+            ringColor = (playlistOffset == this.playlistOffset) ? ringOnColor : ringOffColor;
         }
         //Relative Offset
         else if (playlistType == 'relativeOffset') {
@@ -84,17 +90,18 @@ export class PlaylistControl{
             const targetPlaylist = this.getPlaylist(number);
             if (targetPlaylist != undefined) name = targetPlaylist.name;
         }
-        streamDeck.setIcon(context,"",{background:background,ring:2,ringColor:ringColor});
+        streamDeck.setIcon(context,device,src,{background:background,ring:2,ringColor:ringColor});
         streamDeck.setTitle(name,context);
     }
 
-    updateTrack(settings,context){
+    updateTrack(settings,context,device){
         let name = "";
         let ringColor = "#000000"
         const background = settings.background ? settings.background : '#000000';
         const ringOffColor = settings.offRing ? settings.offRing : '#FF0000';
         const ringOnColor = settings.onRing ? settings.onRing : '#00FF00';
         const playlistType = settings.playlistType ? settings.playlistType : 'playStop';
+        let src = "modules/MaterialDeck/img/transparant.png";
 
         //Play/Stop
         if (playlistType == 'playStop'){
@@ -109,7 +116,7 @@ export class PlaylistControl{
             
             let playlist = this.getPlaylist(playlistNr);
             if (playlist != undefined){
-                let track = playlist.data.sounds[trackNr];
+                const track = compatibleCore("0.8.1") ? playlist.sounds.contents[trackNr] : playlist.sounds[trackNr];
                 if (track != undefined){
                     if (track.playing) 
                         ringColor = ringOnColor;
@@ -124,12 +131,12 @@ export class PlaylistControl{
         else if (playlistType == 'offset') {
             let trackOffset = parseInt(settings.offset);
             if (isNaN(trackOffset)) trackOffset = 0;
-            if (trackOffset == this.trackOffset) ringColor = ringOnColor;
+            ringColor = (trackOffset == this.trackOffset) ? ringOnColor : ringOffColor;
         }
         //Relative Offset
         else if (playlistType == 'relativeOffset') {
         }
-        streamDeck.setIcon(context,"",{background:background,ring:2,ringColor:ringColor});
+        streamDeck.setIcon(context,device,src,{background:background,ring:2,ringColor:ringColor});
         streamDeck.setTitle(name,context);
     }
 
@@ -167,7 +174,7 @@ export class PlaylistControl{
         else return undefined;
     }
 
-    keyPress(settings,context){
+    keyPress(settings,context,device){
         if (MODULE.getPermission('PLAYLIST','PLAY') == false ) return;
         let playlistNr = settings.playlistNr;
         if (playlistNr == undefined || playlistNr < 1) playlistNr = 1;
@@ -191,7 +198,7 @@ export class PlaylistControl{
                     if (playlistMode == 'playlist')
                         this.playPlaylist(playlist,playlistNr);
                     else {
-                        let track = playlist.data.sounds[trackNr];
+                        const track = compatibleCore("0.8.1") ? playlist.sounds.contents[trackNr] : playlist.sounds[trackNr];
                         if (track != undefined){
                             this.playTrack(track,playlist,playlistNr);
                         }
@@ -276,7 +283,11 @@ export class PlaylistControl{
             }
             else if (mode == 2) await playlist.stopAll();
         }
-        await playlist.updateEmbeddedEntity("PlaylistSound", {_id: track._id, playing: play});
+        
+        if (compatibleCore("0.8.1") && play) await playlist.playSound(track);
+        else if (compatibleCore("0.8.1")) await playlist.stopSound(track);
+        else await playlist.updateEmbeddedEntity("PlaylistSound", {_id: track._id, playing: play});
+        
         playlist.update({playing: play});
     }
 }

src/scene.js

@@ -1,5 +1,6 @@
 import * as MODULE from "../MaterialDeck.js";
 import {streamDeck} from "../MaterialDeck.js";
+import {compatibleCore} from "./misc.js";
 
 export class SceneControl{
     constructor(){
@@ -10,14 +11,17 @@ export class SceneControl{
 
     async updateAll(){
         if (this.active == false) return;
-        for (let i=0; i<32; i++){   
-            const data = streamDeck.buttonContext[i];
-            if (data == undefined || data.action != 'scene') continue;
-            await this.update(data.settings,data.context);
+        for (let device of streamDeck.buttonContext) {
+            if (device?.buttons == undefined) continue;
+            for (let i=0; i<device.buttons.length; i++){   
+                const data = device.buttons[i];
+                if (data == undefined || data.action != 'scene') continue;
+                await this.update(data.settings,data.context,device.device);
+            }
         }
     }
 
-    update(settings,context){
+    update(settings,context,device){
         if (canvas.scene == null) return;
         this.active = true;
         const func = settings.sceneFunction ? settings.sceneFunction : 'visible';
@@ -31,7 +35,7 @@ export class SceneControl{
         let name = "";
         if (func == 'visible') { //visible scenes
             if (MODULE.getPermission('SCENE','VISIBLE') == false ) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
             let nr = parseInt(settings.sceneNr);
@@ -49,7 +53,7 @@ export class SceneControl{
         }
         else if (func == 'dir') {   //from directory
             if (MODULE.getPermission('SCENE','DIRECTORY') == false ) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
             let nr = parseInt(settings.sceneNr);
@@ -58,7 +62,7 @@ export class SceneControl{
 
             let sceneList = [];
             for (let i=0; i<ui.scenes.tree.children.length; i++){
-                const scenesInFolder = ui.scenes.tree.children[i].entities;
+                const scenesInFolder = compatibleCore("0.8.1") ? ui.scenes.tree.children[i].contents : ui.scenes.tree.children[i].entities;
                 for (let j=0; j<scenesInFolder.length; j++)
                     sceneList.push(scenesInFolder[j])
             }
@@ -84,7 +88,7 @@ export class SceneControl{
         }
         else if (func == 'any') {   //by name
             if (MODULE.getPermission('SCENE','NAME') == false ) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
             if (settings.sceneName == undefined || settings.sceneName == '') return;
@@ -99,7 +103,7 @@ export class SceneControl{
         }
         else if (func == 'active'){
             if (MODULE.getPermission('SCENE','ACTIVE') == false ) {
-                streamDeck.noPermission(context);
+                streamDeck.noPermission(context,device);
                 return;
             }
             const scene = game.scenes.active;
@@ -111,11 +115,11 @@ export class SceneControl{
         else if (func == 'offset'){
             let offset = parseInt(settings.sceneOffset);
             if (isNaN(offset)) offset = 0;
-            if (offset == this.sceneOffset) ringColor = ringOnColor;
-            else ringColor = ringOffColor;
+            ringColor = (offset == this.sceneOffset) ? ringOnColor : ringOffColor;
+            src = "modules/MaterialDeck/img/transparant.png";
         }
         streamDeck.setTitle(name,context);
-        streamDeck.setIcon(context,src,{background:background,ring:ring,ringColor:ringColor});
+        streamDeck.setIcon(context,device,src,{background:background,ring:ring,ringColor:ringColor});
     }
 
     keyPress(settings){
@@ -151,7 +155,7 @@ export class SceneControl{
 
             let sceneList = [];
             for (let i=0; i<ui.scenes.tree.children.length; i++){
-                const scenesInFolder = ui.scenes.tree.children[i].entities;
+                const scenesInFolder = compatibleCore("0.8.1") ? ui.scenes.tree.children[i].contents : ui.scenes.tree.children[i].entities;
                 for (let j=0; j<scenesInFolder.length; j++)
                     sceneList.push(scenesInFolder[j])
             }

src/settings.js

@@ -1,5 +1,5 @@
 import * as MODULE from "../MaterialDeck.js";
-import { playlistConfigForm, macroConfigForm, soundboardConfigForm } from "./misc.js";
+import { playlistConfigForm, macroConfigForm, soundboardConfigForm, downloadUtility } from "./misc.js";
 
 let userPermissions = {};
 const defaultEnable = [true,true,true,true];
@@ -18,13 +18,10 @@ const defaultUserPermissions = {
     },
     MACRO: {
         HOTBAR: [true,true,true,true],
+        BY_NAME: [false,false,true,true],
         MACROBOARD: [false,false,true,true],
         MACROBOARD_CONFIGURE: [false,false,true,true]
     },
-    MOVE: {
-        TOKEN: [true,true,true,true],
-        CANVAS: [true,true,true,true]
-    },
     OTHER: {
         PAUSE: [false,false,true,true],
         CONTROL: [true,true,true,true],
@@ -82,16 +79,6 @@ export const registerSettings = async function() {
         onChange: x => window.location.reload()
     });
 
-    game.settings.register(MODULE.moduleName,'streamDeckModel', {
-        name: "MaterialDeck.Sett.Model",
-        hint: "MaterialDeck.Sett.Model_Hint",
-        scope: "client",
-        config: true,
-        type:Number,
-        default:1,
-        choices:["MaterialDeck.Sett.Model_Mini","MaterialDeck.Sett.Model_Normal","MaterialDeck.Sett.Model_XL"],
-    });
-
     /**
      * Sets the ip address of the server
      */
@@ -116,6 +103,28 @@ export const registerSettings = async function() {
         
     });
 
+    game.settings.register(MODULE.moduleName, 'imageBrightness', {
+        name: "MaterialDeck.Sett.ImageBrightness",
+        hint: "MaterialDeck.Sett.ImageBrightnessHint",
+        default: 50,
+        type: Number,
+        scope: 'client',
+        range: { min: 0, max: 100, step: 1 },
+        config: true
+        
+    });
+
+    game.settings.register(MODULE.moduleName, 'nrOfConnMessages', {
+        name: "MaterialDeck.Sett.NrOfConnMessages",
+        hint: "MaterialDeck.Sett.NrOfConnMessagesHint",
+        default: 5,
+        type: Number,
+        scope: 'client',
+        range: { min: 0, max: 100, step: 1 },
+        config: true
+        
+    });
+
     //Create the Help button
     game.settings.registerMenu(MODULE.moduleName, 'helpMenu',{
         name: "MaterialDeck.Sett.Help",
@@ -138,6 +147,13 @@ export const registerSettings = async function() {
         config: false
     });
 
+    game.settings.registerMenu(MODULE.moduleName, 'downloadUtility',{
+        name: "MaterialDeck.DownloadUtility.Title",
+        label: "MaterialDeck.DownloadUtility.Title",
+        type: downloadUtility,
+        restricted: false
+    });
+
     /**
      * Playlist soundboard
      */
@@ -208,12 +224,14 @@ export const registerSettings = async function() {
     else {
         if (permissionSettings.permissions.TOKEN.NON_OWNED == undefined) permissionSettings.permissions.TOKEN.NON_OWNED = [false,false,true,true];
         if (permissionSettings.permissions.TOKEN.OBSERVER == undefined) permissionSettings.permissions.TOKEN.OBSERVER = [false,true,true,true];
+        if (permissionSettings.permissions.MACRO.BY_NAME == undefined) permissionSettings.permissions.MACRO.BY_NAME = [false,false,true,true];
     }
-    game.settings.set(MODULE.moduleName,'userPermission',permissionSettings);
-    
-
+    if (game.user.isGM)
+        game.settings.set(MODULE.moduleName,'userPermission',permissionSettings);      
 }
 
+
+
 export class helpMenu extends FormApplication {
     constructor(data, options) {
         super(data, options);
@@ -288,11 +306,7 @@ export class helpMenu extends FormApplication {
         }
 
         const actions = Object.entries(duplicate(settings.permissions)).reduce((arr, e) => {
-            //const perm = e[1];
-
             const perms = Object.entries(duplicate(e[1])).reduce((arr, p) => {
-                //const perm = e[1];
-                
                 let perm = {};
                 perm.roles = [p[1][0],p[1][1],p[1][2],p[1][3]]
                 perm.id = p[0];
@@ -310,8 +324,10 @@ export class helpMenu extends FormApplication {
             arr.push(cat);
             return arr;
           }, []);
-
-        const current = await game.settings.get("core", "permissions");
+        for (let i=0; i<actions.length; i++) {
+            if (actions[i].id == 'MOVE')
+                actions.splice(i,1);
+        }
         return {
           roles: Object.keys(CONST.USER_ROLES).reduce((obj, r) => {
             if ( r === "NONE" ) return obj;
@@ -334,7 +350,7 @@ export class helpMenu extends FormApplication {
         settings.enable = permissions.ENABLE;
         delete permissions.ENABLE;
         settings.permissions = permissions;
-        game.settings.set(MODULE.moduleName,'userPermission',settings);
+       // game.settings.set(MODULE.moduleName,'userPermission',settings);
     }
   
     async activateListeners(html) {

src/soundboard.js

@@ -1,27 +1,29 @@
 import * as MODULE from "../MaterialDeck.js";
 import {streamDeck} from "../MaterialDeck.js";
+import {compatibleCore} from "./misc.js";
 
 export class SoundboardControl{
     constructor(){
         this.active = false;
         this.offset = 0;
         this.activeSounds = [];
-        for (let i=0; i<64; i++)
-            this.activeSounds[i] = false;
     }
 
     async updateAll(){
         if (this.active == false) return;
-        for (let i=0; i<32; i++){   
-            const data = streamDeck.buttonContext[i];
-            if (data == undefined || data.action != 'soundboard') continue;
-            await this.update(data.settings,data.context);
+        for (let device of streamDeck.buttonContext) {
+            if (device?.buttons == undefined) continue;
+            for (let i=0; i<device.buttons.length; i++){   
+                const data = device.buttons[i];
+                if (data == undefined || data.action != 'soundboard') continue;
+                await this.update(data.settings,data.context,device.device);
+            }
         }
     }
 
-    update(settings,context){
+    update(settings,context,device){
         if (MODULE.getPermission('SOUNDBOARD','PLAY') == false ) {
-            streamDeck.noPermission(context);
+            streamDeck.noPermission(context,device);
             return;
         }
         this.active = true;
@@ -39,13 +41,13 @@ export class SoundboardControl{
             soundNr += this.offset;
 
             let soundboardSettings = game.settings.get(MODULE.moduleName, 'soundboardSettings');
-            ringColor = (this.activeSounds[soundNr]==false) ? soundboardSettings.colorOff[soundNr] : soundboardSettings.colorOn[soundNr];
+            ringColor = (this.activeSounds[soundNr]==undefined) ? soundboardSettings.colorOff[soundNr] : soundboardSettings.colorOn[soundNr];
 
             if (settings.displayName && soundboardSettings.name != undefined) txt = soundboardSettings.name[soundNr];
             if (settings.displayIcon && soundboardSettings.img != undefined) src = soundboardSettings.img[soundNr];
 
             streamDeck.setTitle(txt,context);
-            streamDeck.setIcon(context,src,{background:background,ring:2,ringColor:ringColor});
+            streamDeck.setIcon(context,device,src,{background:background,ring:2,ringColor:ringColor});
         }
         else if (mode == 'offset') { //Offset
             const ringOffColor = settings.offRing ? settings.offRing : '#000000';
@@ -57,7 +59,7 @@ export class SoundboardControl{
             else ringColor = ringOffColor;
 
             streamDeck.setTitle(txt,context);
-            streamDeck.setIcon(context,"",{background:background,ring:2,ringColor:ringColor});
+            streamDeck.setIcon(context,device,"",{background:background,ring:2,ringColor:ringColor});
         }
         else if (mode == 'stopAll') {   //Stop all sounds
             let src = 'modules/MaterialDeck/img/playlist/stop.png';
@@ -67,9 +69,9 @@ export class SoundboardControl{
                 if (this.activeSounds[i]) 
                     soundPlaying = true;
             if (soundPlaying)
-                streamDeck.setIcon(context,src,{background:background,ring:2,ringColor:'#00FF00',overlay:true});
+                streamDeck.setIcon(context,device,src,{background:background,ring:2,ringColor:'#00FF00',overlay:true});
             else
-                streamDeck.setIcon(context,src,{background:background,ring:1,ringColor:'#000000',overlay:true});
+                streamDeck.setIcon(context,device,src,{background:background,ring:1,ringColor:'#000000',overlay:true});
         }
     }
 
@@ -85,9 +87,9 @@ export class SoundboardControl{
 
             const playMode = game.settings.get(MODULE.moduleName,'soundboardSettings').mode[soundNr];
             const repeat = (playMode > 0) ? true : false;
-            const play = (this.activeSounds[soundNr] == false) ? true : false;
+            const play = (this.activeSounds[soundNr] == undefined) ? true : false;
 
-            this.playSound(soundNr,repeat,play);
+            this.prePlaySound(soundNr,repeat,play);
         }
         else if (mode == 'offset') { //Offset
             let offset = parseInt(settings.offset);
@@ -96,9 +98,9 @@ export class SoundboardControl{
             this.updateAll();
         }
         else if (mode == 'stopAll') {  //Stop All Sounds
-            for (let i=0; i<64; i++) {
-                if (this.activeSounds[i] != false){
-                    this.playSound(i,false,false);
+            for (let i=0; i<this.activeSounds.length; i++) {
+                if (this.activeSounds[i] != undefined){
+                    this.prePlaySound(i,false,false);
                 }
             }
         }
@@ -118,10 +120,10 @@ export class SoundboardControl{
         const playMode = game.settings.get(MODULE.moduleName,'soundboardSettings').mode[soundNr];
         
         if (playMode == 2)
-            this.playSound(soundNr,false,false);
+            this.prePlaySound(soundNr,false,false);
     }
 
-    async playSound(soundNr,repeat,play){  
+    async prePlaySound(soundNr,repeat,play){  
         const soundBoardSettings = game.settings.get(MODULE.moduleName,'soundboardSettings');
         const playlistId = (soundBoardSettings.selectedPlaylists != undefined) ? soundBoardSettings.selectedPlaylists[soundNr] : undefined;
         let src;
@@ -142,7 +144,7 @@ export class SoundboardControl{
             const soundId = soundBoardSettings.sounds[soundNr];
             const sounds = game.playlists.get(playlistId).sounds;
             if (sounds == undefined) return;
-            const sound = sounds.find(p => p._id == soundId);
+            const sound = compatibleCore("0.8.1") ? sounds.find(p => p.id == soundId) : sounds.find(p => p._id == soundId);
             if (sound == undefined) return;
             src = sound.path;
         }
@@ -160,25 +162,43 @@ export class SoundboardControl{
         };
         game.socket.emit(`module.MaterialDeck`, payload);
 
-        if (play){
-            volume *= game.settings.get("core", "globalInterfaceVolume");
+        this.playSound(soundNr,src,play,repeat,volume)
+    }
 
-            let howl = new Howl({src, volume, loop: repeat, onend: (id)=>{
-                if (repeat == false){
-                    this.activeSounds[soundNr] = false;
+    async playSound(soundNr,src,play,repeat,volume){
+        if (play){
+            volume *= game.settings.get("core", "globalAmbientVolume");
+
+            if (compatibleCore("0.8.1")) {
+                let newSound = new Sound(src);
+                if(newSound.loaded == false) await newSound.load({autoplay:true});
+                newSound.on('end', ()=>{
+                    if (repeat == false) {
+                        this.activeSounds[soundNr] = undefined;
+                        this.updateAll();
+                    }
+                });
+                newSound.play({loop:repeat,volume:volume});
+                this.activeSounds[soundNr] = newSound;
+            }
+            else {
+                let howl = new Howl({src, volume, loop: repeat, onend: (id)=>{
+                    if (repeat == false){
+                        this.activeSounds[soundNr] = undefined;
+                        this.updateAll();
+                    }
+                },
+                onstop: ()=>{
+                    this.activeSounds[soundNr] = undefined;
                     this.updateAll();
-                }
-            },
-            onstop: (id)=>{
-                this.activeSounds[soundNr] = false;
-                this.updateAll();
-            }});
-            howl.play();
-            this.activeSounds[soundNr] = howl;
+                }});
+                howl.play();
+                this.activeSounds[soundNr] = howl;
+            }
         }
         else {
-            this.activeSounds[soundNr].stop();
-            this.activeSounds[soundNr] = false;
+            if (this.activeSounds[soundNr] != undefined) this.activeSounds[soundNr].stop();
+            this.activeSounds[soundNr] = undefined;
         }
         this.updateAll();
     }

src/streamDeck.js

@@ -7,9 +7,7 @@ export class StreamDeck{
         this.tokenNameContext;
         this.tokenACContext;
         this.buttonContext = [];
-        for (let i=0; i<31; i++){
-            this.buttonContext[i] = undefined;
-        }
+        
         this.playlistTrackBuffer = [];
         this.playlistSelector = 0;
         this.trackSelector = 0;
@@ -36,19 +34,40 @@ export class StreamDeck{
        
     }
 
-    setContext(action,context,coordinates = {column:0,row:0},settings){
+    setContext(device,size,iteration,action,context,coordinates = {column:0,row:0},settings){
+        if (device == undefined) return;
+        if (this.buttonContext[iteration] == undefined) {
+            const deckSize = size.columns*size.rows;
+            let buttons = [];
+            for (let i=0; i<deckSize; i++){
+                buttons[i] = undefined;
+            }
+            this.buttonContext[iteration] = {
+                device: device,
+                size: size,
+                buttons: buttons
+            }
+        }
+
         const data = {
             context: context,
             action: action,
             settings: settings
         }
-        let num = coordinates.column + coordinates.row*8;
-        this.buttonContext[num] = data;
+
+        const num = coordinates.column + coordinates.row*size.columns;
+        this.buttonContext[iteration].buttons[num] = data;
     }
 
-    clearContext(action,coordinates = {column:0,row:0}){
-        let num = coordinates.column + coordinates.row*8;
-        this.buttonContext[num] = undefined;
+    clearContext(device,action,coordinates = {column:0,row:0}){
+        for (let d of this.buttonContext) {
+            if (d.device == device) {
+                const num = coordinates.column + coordinates.row*d.size.columns;
+                d.buttons[num] = undefined;
+                return;
+            }
+        }
+
         if (this.getActive(action) == false){
             if (action == 'token') MODULE.tokenControl.active = false; 
             else if (action == 'macro') MODULE.macroControl.active = false; 
@@ -127,7 +146,9 @@ export class StreamDeck{
                 newTxtArray[counter] = txtNewPart;
                 counter++;
             }
+            if (counter == 1 && newTxtArray[0] == "") counter = 0;
         }
+        
         for (let i=0; i<counter; i++){
             if (txtNew.length > 0)
                 txtNew += "\n";
@@ -177,11 +198,12 @@ export class StreamDeck{
         MODULE.sendWS(JSON.stringify(msg));
     }
 
-    setImage(image,context,nr,id){
+    setImage(image,context,device,nr,id){
         var json = {
             target: "SD",
             event: "setImage",
             context: context,
+            device: device,
             payload: {
                 nr: nr,
                 id: id,
@@ -192,11 +214,12 @@ export class StreamDeck{
         MODULE.sendWS(JSON.stringify(json));
     }
 
-    setBufferImage(context,nr,id){
+    setBufferImage(context,device,nr,id){
         var json = {
             target: "SD",
             event: "setBufferImage",
             context: context,
+            device: device,
             payload: {
                 nr: nr,
                 id: id,
@@ -206,7 +229,7 @@ export class StreamDeck{
         MODULE.sendWS(JSON.stringify(json));
     }
 
-    setIcon(context,src='',options = {}){
+    setIcon(context,device,src='',options = {}){
         if (src == null || src == undefined) src = '';
         if (src == '') src = 'modules/MaterialDeck/img/black.png';
         let background = options.background ? options.background : '#000000';
@@ -215,19 +238,27 @@ export class StreamDeck{
         let overlay = options.overlay ? options.overlay : false;
         let uses = options.uses ? options.uses : undefined;
         let clock = options.clock ? options.clock : false;
-        for (let i=0; i<32; i++){
-            if (clock != false) break;
-            if (this.buttonContext[i] == undefined) continue;
-            if (this.buttonContext[i].context == context) {
-                if (this.buttonContext[i].icon == src && this.buttonContext[i].ring == ring && this.buttonContext[i].ringColor == ringColor && this.buttonContext[i].background == background && this.buttonContext[i].uses == uses) 
-                    return;
-                this.buttonContext[i].icon = src;
-                this.buttonContext[i].ring = ring;
-                this.buttonContext[i].ringColor = ringColor;
-                this.buttonContext[i].background = background;
-                this.buttonContext[i].uses = uses;
+        
+        //if (src != 'modules/MaterialDeck/img/black.png')
+        for (let d of this.buttonContext) {
+            if (d.device == device) {
+                for (let i=0; i<d.buttons.length; i++){
+                    if (clock != false) break;
+                    if (d.buttons[i] == undefined) continue;
+                    if (d.buttons[i].context == context) {
+                        if (d.buttons[i].icon == src && d.buttons[i].ring == ring && d.buttons[i].ringColor == ringColor && d.buttons[i].background == background && d.buttons[i].uses == uses) 
+                            return;
+                        d.buttons[i].icon = src;
+                        d.buttons[i].ring = ring;
+                        d.buttons[i].ringColor = ringColor;
+                        d.buttons[i].background = background;
+                        d.buttons[i].uses = uses;
+                    }
+                }
+                break;
             }
         }
+
         const data = {
             url: src,
             background:background,
@@ -235,11 +266,12 @@ export class StreamDeck{
             ringColor:ringColor,
             overlay:overlay,
             uses:uses,
-            options:options
+            options:options,
+            devide:device
         }
         const imgBuffer = (clock == false) ? this.checkImageBuffer(data) : false;
         if (imgBuffer != false) {
-            this.setBufferImage(context,imgBuffer,this.getImageBufferId(data))
+            this.setBufferImage(context,device,imgBuffer,this.getImageBufferId(data))
             return;
         }
         
@@ -252,6 +284,7 @@ export class StreamDeck{
             target: "SD",
             event: 'setIcon',
             context: context,
+            device: device,
             url: src,
             format: format,
             background: background,
@@ -312,6 +345,7 @@ export class StreamDeck{
         if (data == undefined) 
             return;
         const context = data.context;
+        const device = data.device;
         var url = data.url;
         const format = data.format;
         var background = data.background;
@@ -354,10 +388,15 @@ export class StreamDeck{
         }
         else {
             
+        }
+        if (uses != undefined && uses.heart != undefined && (uses.available > 0 || uses.maximum != undefined)) {
+            const percentage = 102*uses.available/uses.maximum;
+            ctx.fillStyle = uses.heart;
+            ctx.fillRect(0, 121,144,-percentage);
         }
         if (format == 'icon' && url != ""){
             ctx.font = '600 90px "Font Awesome 5 Free"';
-            ctx.fillStyle = "gray";
+            ctx.fillStyle = "#545454";
             var elm = document.createElement('i');
             elm.className = url;
             elm.style.display = 'none';
@@ -372,14 +411,15 @@ export class StreamDeck{
             ctx.fillText(content[1], horOffset, vertOffset);
         }
 
-        if (format != 'jpg' && format != 'jpeg' && format != 'png' && format != 'webm' && format != 'webp' && format != 'gif' && format != 'svg') url = "modules/MaterialDeck/img/transparant.png";
+        if (format != 'jpg' && format != 'jpeg' && format != 'png' && format != 'PNG' && format != 'webm' && format != 'webp' && format != 'gif' && format != 'svg') url = "modules/MaterialDeck/img/transparant.png";
         //if (url == "") url = "modules/MaterialDeck/img/transparant.png"
         let resImageURL = url;
         let img = new Image();
         img.setAttribute('crossorigin', 'anonymous');
         img.onload = () => {
             if (format == 'color') ctx.filter = "opacity(0)";
-            if (data.overlay) ctx.filter = "brightness(60%)";
+            
+            if (data.overlay == true) ctx.filter = "brightness(" + game.settings.get(MODULE.moduleName,'imageBrightness') + "%)";
             //ctx.filter = "brightness(0) saturate(100%) invert(38%) sepia(62%) saturate(2063%) hue-rotate(209deg) brightness(90%) contrast(95%)";
             var imageAspectRatio = img.width / img.height;
             var canvasAspectRatio = canvas.width / canvas.height;
@@ -411,10 +451,13 @@ export class StreamDeck{
                 yStart = 0;
             }
             ctx.drawImage(img, xStart+margin, yStart+margin, renderableWidth - 2*margin, renderableHeight - 2*margin);
-            if (uses != undefined && (uses.available > 0 || uses.maximum != undefined)) {
-                let txt = uses.available;
-                if (uses.maximum != undefined) txt = uses.available + '/' + uses.maximum;
-                if (uses.maximum == undefined ) uses.maximum = 1;
+            if (uses != undefined && uses.heart == undefined) {
+                let txt = '';
+                if (uses.available != undefined) {
+                    txt = uses.available;
+                    if (uses.maximum != undefined) txt = uses.available + '/' + uses.maximum;
+                    if (uses.maximum == undefined ) uses.maximum = 1;
+                }
                 ctx.beginPath();
                 ctx.lineWidth = 4;
                 let green = Math.ceil(255*(uses.available/uses.maximum));
@@ -484,7 +527,7 @@ export class StreamDeck{
             var dataURL = canvas.toDataURL();
             canvas.remove();
             const nr = this.addToImageBuffer(dataURL,data);
-            this.setImage(dataURL,data.context,nr,this.getImageBufferId(data));
+            this.setImage(dataURL,data.context,device,nr,this.getImageBufferId(data));
         };
         img.src = resImageURL;
     }
@@ -526,11 +569,12 @@ export class StreamDeck{
         this.imageBuffer = [];
     }
 
-    noPermission(context,showTxt=true){
+    noPermission(context,device,showTxt=true, origin = ""){
+        console.warn("Material Deck: User lacks permission for function "+origin);
         const url = 'modules/MaterialDeck/img/black.png';
         const background = '#000000';
         const txt = showTxt ? 'no\npermission' : '';
-        this.setIcon(context,url,{background:background});
+        this.setIcon(context,device,url,{background:background});
         this.setTitle(txt,context);
     }
 }

src/systems/demonlord.js

@@ -0,0 +1,133 @@
+import {compatibleCore} from "../misc.js";
+
+export class demonlord{
+    constructor(){
+        
+    }
+
+    getHP(token) {
+        const hp = token.actor.data.data.characteristics.health;
+        return {
+            value: hp.value,
+            max: hp.max
+        }
+    }
+
+    getTempHP(token) {
+        return;
+    }
+
+    getAC(token) {
+        return token.actor.data.data.characteristics.defense;
+    }
+
+    getShieldHP(token) {
+        return;
+    }
+
+    getSpeed(token) {
+        return token.actor.data.data.characteristics.speed;
+    }
+
+    getInitiative(token) {
+        return token.actor.data.data.fastturn ? "FAST" : "SLOW";
+    }
+
+    toggleInitiative(token) {
+        token.actor.update({
+            'data.fastturn': !token.actor.data?.data?.fastturn
+        });
+        return;
+    }
+
+    getPassivePerception(token) {
+        return;
+    }
+
+    getPassiveInvestigation(token) {
+        return;
+    }
+
+    getAbility(token, ability) {
+        if (ability == undefined) ability = 'strength';
+        return token.actor.data.data.attributes?.[ability].value;
+    } 
+
+    getAbilityModifier(token, ability) {
+        if (ability == undefined) ability = 'str';
+        let val = token.actor.data.data.attributes?.[ability].modifier;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getAbilitySave(token, ability) {
+        return;
+    }
+
+    getSkill(token, skill) {
+        if (skill == undefined) skill = 'acr';
+        const val = token.actor.data.data.skills?.[skill].total;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getProficiency(token) {
+        return;
+    }
+
+    getConditionIcon(condition) {
+        if (condition == undefined) condition = 'removeAll';
+        if (condition == 'removeAll') return window.CONFIG.controlIcons.effects;
+        else return CONFIG.statusEffects.find(e => e.id === condition).icon;
+    }
+
+    getConditionActive(token,condition) {
+        if (condition == undefined) condition = 'removeAll';
+        return token.actor.effects.find(e => e.isTemporary === condition) != undefined;
+    }
+
+    async toggleCondition(token,condition) {
+        if (condition == undefined) condition = 'removeAll';
+        if (condition == 'removeAll'){
+            for( let effect of token.actor.effects)
+                await effect.delete();
+        }
+        else {
+            const effect = CONFIG.statusEffects.find(e => e.id === condition);
+            await token.toggleEffect(effect);
+        }
+        return true;
+    }
+
+    /**
+     * Roll
+     */
+     roll(token,roll,options,ability,skill,save) {
+        return;
+    }
+
+    /**
+     * Items
+     */
+    getItems(token,itemType) {
+        if (itemType == undefined) itemType = 'any';
+        const allItems = token.actor.items;
+        if (itemType == 'any') return allItems.filter(i => i.type == 'item');
+    }
+
+    getItemUses(item) {
+        return {available: item.data.data.quantity};
+    }
+
+    /**
+     * Spells
+     */
+     getSpells(token,level) {
+        if (level == undefined) level = 'any';
+        const allItems = token.actor.items;
+        if (level == 'any') return allItems.filter(i => i.type == 'spell')
+        else return allItems.filter(i => i.type == 'spell' && i.data.data.rank == level)
+    }
+
+    getSpellUses(token,level,item) {
+        return;
+    }
+}

src/systems/dnd35e.js

@@ -0,0 +1,198 @@
+import {compatibleCore} from "../misc.js";
+
+export class dnd35e{
+    constructor(){
+        
+    }
+
+    getHP(token) {
+        const hp = token.actor.data.data.attributes.hp;
+        return {
+            value: hp.value,
+            max: hp.max
+        }
+    }
+
+    getTempHP(token) {
+        const hp = token.actor.data.data.attributes.hp;
+        return {
+            value: (hp.temp == null) ? 0 : hp.temp,
+            max: (hp.tempmax == null) ? 0 : hp.tempmax
+        }
+    }
+
+    getAC(token) {
+        return token.actor.data.data.attributes.ac.normal.total;
+    }
+
+    getShieldHP(token) {
+        return;
+    }
+
+    getSpeed(token) {
+        const movement = token.actor.data.data.attributes.speed;
+        let speed = "";
+        if (movement.burrow.total > 0) speed += `Burrow: ${movement.burrow.total}Ft`;
+        if (movement.climb.total > 0) {
+            if (speed.length > 0) speed += '\n';
+            speed += `Climb: ${movement.climb.total}Ft`;
+        }
+        if (movement.fly.total > 0) {
+            if (speed.length > 0) speed += '\n';
+            speed += `Fly: ${movement.fly.total}Ft`;
+        }
+        if (movement.land.total > 0) {
+            if (speed.length > 0) speed += '\n';
+            speed += `Land: ${movement.land.total}Ft`;
+        }
+        if (movement.swim.total > 0) {
+            if (speed.length > 0) speed += '\n';
+            speed += `Swim: ${movement.swim.total}Ft`;
+        }
+        return speed;
+    }
+
+    getInitiative(token) {
+        let initiative = token.actor.data.data.attributes.init.total;
+        return (initiative >= 0) ? `+${initiative}` : initiative;
+    }
+
+    toggleInitiative(token) {
+        return;
+    }
+
+    getPassivePerception(token) {
+        return;
+    }
+
+    getPassiveInvestigation(token) {
+        return;
+    }
+
+    getAbility(token, ability) {
+        if (ability == undefined) ability = 'str';
+        return token.actor.data.data.abilities?.[ability].value;
+    } 
+
+    getAbilityModifier(token, ability) {
+        if (ability == undefined) ability = 'str';
+        let val = token.actor.data.data.abilities?.[ability].mod;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getAbilitySave(token, ability) {
+        if (ability == undefined) ability = 'fort';
+        let val = token.actor.data.data.attributes.savingThrows?.[ability].total;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getSkill(token, skill) {
+        if (skill == undefined) skill = 'apr';
+        const val = token.actor.data.data.skills?.[skill].mod;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getProficiency(token) {
+        const val = token.actor.data.data.attributes.prof;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getConditionIcon(condition) {
+        if (condition == undefined) condition = 'removeAll';
+        if (condition == 'removeAll') return window.CONFIG.controlIcons.effects;
+        else return CONFIG.statusEffects.find(e => e.id === condition).icon;
+    }
+
+    getConditionActive(token,condition) {
+        if (condition == undefined) condition = 'removeAll';
+        return token.actor.effects.find(e => e.isTemporary === condition) != undefined;
+    }
+
+    async toggleCondition(token,condition) {
+        if (condition == undefined) condition = 'removeAll';
+        if (condition == 'removeAll'){
+            for( let effect of token.actor.effects)
+                await effect.delete();
+        }
+        else {
+            const effect = CONFIG.statusEffects.find(e => e.id === condition);
+            await token.toggleEffect(effect);
+        }
+        return true;
+    }
+
+    /**
+     * Roll
+     */
+     roll(token,roll,options,ability,skill,save) {
+        if (roll == undefined) roll = 'ability';
+        if (ability == undefined) ability = 'str';
+        if (skill == undefined) skill = 'apr';
+        if (save == undefined) save = 'fort';
+
+        if (roll == 'ability') token.actor.rollAbilityTest(ability,options);
+        else if (roll == 'save') token.actor.rollSavingThrow(save, null, null,options);
+        else if (roll == 'skill') token.actor.rollSkill(skill,options);
+        else if (roll == 'initiative') token.actor.rollInitiative(options);
+        else if (roll == 'grapple') token.actor.rollGrapple(options);
+        else if (roll == 'bab') token.actor.rollBAB(options);
+        else if (roll == 'melee') token.actor.rollMelee(options);
+        else if (roll == 'ranged') token.actor.rollRanged(options);
+    }
+
+    /**
+     * Items
+     */
+    getItems(token,itemType) {
+        if (itemType == undefined) itemType = 'any';
+        const allItems = token.actor.items;
+        if (itemType == 'any') return allItems.filter(i => i.type == 'weapon' || i.type == 'equipment' || i.type == 'consumable' || i.type == 'loot' || i.type == 'container');
+        else if (game.system.id == 'D35E' && itemType == 'container') return allItems.filter(i => i.type == 'loot' && i.data.data.subType == itemType);
+        else {
+            if (itemType == 'gear' || itemType == 'ammo' || itemType == 'misc' || itemType == 'tradeGoods') 
+                return allItems.filter(i => i.type == 'loot' && i.data.data.subType == itemType);
+            else return allItems.filter(i => i.type == itemType);
+        }
+    }
+
+    getItemUses(item) {
+        return {available: item.data.data.quantity};
+    }
+
+    /**
+     * Features
+     */
+     getFeatures(token,featureType) {
+        if (featureType == undefined) featureType = 'any';
+        const allItems = token.actor.items;
+        if (featureType == 'any') return allItems.filter(i => i.type == 'class' || i.type == 'feat')
+        else return allItems.filter(i => i.type == featureType)
+    }
+
+    getFeatureUses(item) {
+        if (item.data.type == 'class') return {available: item.data.data.levels};
+        else return {
+            available: item.data.data.uses.value, 
+            maximum: item.data.data.uses.max
+        };
+    }
+
+    /**
+     * Spells
+     */
+     getSpells(token,level) {
+        if (level == undefined) level = 'any';
+        const allItems = token.actor.items;
+        if (level == 'any') return allItems.filter(i => i.type == 'spell')
+        else return allItems.filter(i => i.type == 'spell' && i.data.data.level == level)
+    }
+
+    getSpellUses(token,level,item) {
+        if (level == undefined) level = 'any';
+        if (item.data.data.level == 0) return;
+        return {
+            available: item.charges, 
+            maximum: item.maxCharges
+        }
+    }
+}

src/systems/dnd5e.js

@@ -0,0 +1,201 @@
+import {compatibleCore} from "../misc.js";
+
+export class dnd5e{
+    constructor(){
+        
+    }
+
+    getHP(token) {
+        const hp = token.actor.data.data.attributes.hp;
+        return {
+            value: hp.value,
+            max: hp.max
+        }
+    }
+
+    getTempHP(token) {
+        const hp = token.actor.data.data.attributes.hp;
+        return {
+            value: (hp.temp == null) ? 0 : hp.temp,
+            max: (hp.tempmax == null) ? 0 : hp.tempmax
+        }
+    }
+
+    getAC(token) {
+        return token.actor.data.data.attributes.ac.value;
+    }
+
+    getShieldHP(token) {
+        return;
+    }
+
+    getSpeed(token) {
+        const movement = token.actor.data.data.attributes.movement;
+        let speed = "";
+        if (movement != undefined){
+            if (movement.burrow > 0) speed += `${game.i18n.localize("DND5E.MovementBurrow")}: ${movement.burrow + movement.units}`;
+            if (movement.climb > 0) {
+                if (speed.length > 0) speed += '\n';
+                speed += `${game.i18n.localize("DND5E.MovementClimb")}: ${movement.climb + movement.units}`;
+            }
+            if (movement.fly > 0) {
+                if (speed.length > 0) speed += '\n';
+                speed += `${game.i18n.localize("DND5E.MovementFly")}: ${movement.fly + movement.units}`;
+            }
+            if (movement.hover > 0) {
+                if (speed.length > 0) speed += '\n';
+                speed += `${game.i18n.localize("DND5E.MovementHover")}: ${movement.hover + movement.units}`;
+            }
+            if (movement.swim > 0) {
+                if (speed.length > 0) speed += '\n';
+                speed += `${game.i18n.localize("DND5E.MovementSwim")}: ${movement.swim + movement.units}`;
+            }
+            if (movement.walk > 0) {
+                if (speed.length > 0) speed += '\n';
+                speed += `${game.i18n.localize("DND5E.MovementWalk")}: ${movement.walk + movement.units}`;
+            }
+        }
+        else {
+            const spd = token.actor.data.data.attributes.speed;
+            speed = spd.value;
+            if (spd.special.length > 0) speed + "\n" + spd.special;
+        }
+        return speed;
+    }
+
+    getInitiative(token) {
+        let initiative = token.actor.data.data.attributes.init.total;
+        return (initiative >= 0) ? `+${initiative}` : initiative;
+    }
+
+    toggleInitiative(token) {
+        return;
+    }
+
+    getPassivePerception(token) {
+        return token.actor.data.data.skills.prc.passive;
+    }
+
+    getPassiveInvestigation(token) {
+        return token.actor.data.data.skills.inv.passive;
+    }
+
+    getAbility(token, ability) {
+        if (ability == undefined) ability = 'str';
+        return token.actor.data.data.abilities?.[ability].value;
+    } 
+
+    getAbilityModifier(token, ability) {
+        if (ability == undefined) ability = 'str';
+        let val = token.actor.data.data.abilities?.[ability].mod;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getAbilitySave(token, ability) {
+        if (ability == undefined) ability = 'str';
+        let val = token.actor.data.data.abilities?.[ability].save;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getSkill(token, skill) {
+        if (skill == undefined) skill = 'acr';
+        const val = token.actor.data.data.skills?.[skill].total;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getProficiency(token) {
+        const val = token.actor.data.data.attributes.prof;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getConditionIcon(condition) {
+        if (condition == undefined) condition = 'removeAll';
+        if (condition == 'removeAll') return window.CONFIG.controlIcons.effects;
+        else return CONFIG.statusEffects.find(e => e.id === condition).icon;
+    }
+
+    getConditionActive(token,condition) {
+        if (condition == undefined) condition = 'removeAll';
+        return token.actor.effects.find(e => e.isTemporary === condition) != undefined;
+    }
+
+    async toggleCondition(token,condition) {
+        if (condition == undefined) condition = 'removeAll';
+        if (condition == 'removeAll'){
+            for( let effect of token.actor.effects)
+                await effect.delete();
+        }
+        else {
+            const effect = CONFIG.statusEffects.find(e => e.id === condition);
+            await token.toggleEffect(effect);
+        }
+        return true;
+    }
+
+    /**
+     * Roll
+     */
+     roll(token,roll,options,ability,skill,save) {
+        if (roll == undefined) roll = 'ability';
+        if (ability == undefined) ability = 'str';
+        if (skill == undefined) skill = 'acr';
+        if (save == undefined) save = 'str';
+
+        if (roll == 'ability') token.actor.rollAbilityTest(ability,options);
+        else if (roll == 'save') token.actor.rollAbilitySave(save,options);
+        else if (roll == 'skill') token.actor.rollSkill(skill,options);
+        else if (roll == 'initiative') token.actor.rollInitiative(options);
+        else if (roll == 'deathSave') token.actor.rollDeathSave(options);
+    }
+
+    /**
+     * Items
+     */
+    getItems(token,itemType) {
+        if (itemType == undefined) itemType = 'any';
+        const allItems = token.actor.items;
+        if (itemType == 'any') return allItems.filter(i => i.type == 'weapon' || i.type == 'equipment' || i.type == 'consumable' || i.type == 'loot' || i.type == 'container');
+        else return allItems.filter(i => i.type == itemType);
+    }
+
+    getItemUses(item) {
+        return {available: item.data.data.quantity};
+    }
+
+    /**
+     * Features
+     */
+    getFeatures(token,featureType) {
+        if (featureType == undefined) featureType = 'any';
+        const allItems = token.actor.items;
+        if (featureType == 'any') return allItems.filter(i => i.type == 'class' || i.type == 'feat')
+        else return allItems.filter(i => i.type == featureType)
+    }
+
+    getFeatureUses(item) {
+        if (item.data.type == 'class') return {available: item.data.data.levels};
+        else return {
+            available: item.data.data.uses.value, 
+            maximum: item.data.data.uses.max
+        };
+    }
+
+    /**
+     * Spells
+     */
+     getSpells(token,level) {
+        if (level == undefined) level = 'any';
+        const allItems = token.actor.items;
+        if (level == 'any') return allItems.filter(i => i.type == 'spell')
+        else return allItems.filter(i => i.type == 'spell' && i.data.data.level == level)
+    }
+
+    getSpellUses(token,level,item) {
+        if (level == undefined) level = 'any';
+        if (item.data.data.level == 0) return;
+        return {
+            available: token.actor.data.data.spells?.[`spell${level}`].value,
+            maximum: token.actor.data.data.spells?.[`spell${level}`].max
+        }
+    }
+}

src/systems/pf2e.js

@@ -0,0 +1,195 @@
+import {compatibleCore} from "../misc.js";
+
+export class pf2e{
+    constructor(){
+        
+    }
+
+    getHP(token) {
+        const hp = token.actor.data.data.attributes.hp;
+        return {
+            value: hp.value,
+            max: hp.max
+        }
+    }
+
+    getTempHP(token) {
+        const hp = token.actor.data.data.attributes.hp;
+        return {
+            value: (hp.temp == null) ? 0 : hp.temp,
+            max: (hp.tempmax == null) ? 0 : hp.tempmax
+        }
+    }
+
+    getAC(token) {
+        return token.actor.data.data.attributes.ac.value;
+    }
+
+    getShieldHP(token) {
+        return token.actor.data.data.attributes.shield.value;
+    }
+
+    getSpeed(token) {
+        let speed = token.actor.data.data.attributes.speed.breakdown;
+        const otherSpeeds = token.actor.data.data.attributes.speed.otherSpeeds;
+        if (otherSpeeds.length > 0)
+            for (let i=0; i<otherSpeeds.length; i++)
+                speed += `\n${otherSpeeds[i].type}: ${otherSpeeds[i].value}`;    
+        return speed;
+    }
+
+    getInitiative(token) {
+        let initiative = token.actor.data.data.attributes.init.value;
+        return (initiative >= 0) ? `+${initiative}` : initiative;
+    }
+
+    toggleInitiative(token) {
+        return;
+    }
+
+    getPassivePerception(token) {
+        return;
+    }
+
+    getPassiveInvestigation(token) {
+        return;
+    }
+
+    getAbility(token, ability) {
+        if (ability == undefined) ability = 'str';
+        return token.actor.data.data.abilities?.[ability].value;
+    } 
+
+    getAbilityModifier(token, ability) {
+        if (ability == undefined) ability = 'str';
+        let val = token.actor.data.data.abilities?.[ability].mod;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getAbilitySave(token, ability) {
+        if (ability == undefined) ability = 'fortitude';
+        else if (ability == 'fort') ability = 'fortitude';
+        else if (ability == 'ref') ability = 'reflex';
+        else if (ability == 'will') ability = 'will';
+        let val = token.actor.data.data.saves?.[ability].value;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getSkill(token, skill) {
+        if (skill == undefined) skill = 'acr';
+        const val = token.actor.data.data.skills?.[skill].totalModifier;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getProficiency(token) {
+        return;
+    }
+
+    getCondition(token,condition) {
+        if (condition == undefined || condition == 'removeAll') return undefined;
+        const Condition = condition.charAt(0).toUpperCase() + condition.slice(1);
+        const effects = token.actor.items.filter(i => i.type == 'condition');
+        return effects.find(e => e.name === Condition);
+    }
+
+    getConditionIcon(condition) {
+        if (condition == undefined) condition = 'removeAll';
+        if (condition == 'removeAll') return window.CONFIG.controlIcons.effects;
+        else return `${CONFIG.PF2E.statusEffects.effectsIconFolder}${condition}.webp`;
+    }
+
+    getConditionActive(token,condition) {
+        return this.getCondition(token,condition) != undefined;
+    }
+
+    async toggleCondition(token,condition) {
+        if (condition == undefined) condition = 'removeAll';
+        if (condition == 'removeAll'){
+            for( let effect of token.actor.items.filter(i => i.type == 'condition'))
+                await effect.delete();
+        }
+        else {
+            const effect = this.getCondition(token,condition);
+            if (effect == undefined) {
+                const Condition = condition.charAt(0).toUpperCase() + condition.slice(1);
+                const newCondition = game.pf2e.ConditionManager.getCondition(Condition);
+                newCondition.data.sources.hud = !0,
+                await game.pf2e.ConditionManager.addConditionToToken(newCondition, token);
+            }
+            else {
+                effect.delete();
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Roll
+     */
+     roll(token,roll,options,ability,skill,save) {
+        if (roll == undefined) roll = 'ability';
+        if (ability == undefined) ability = 'str';
+        if (skill == undefined) skill = 'acr';
+        if (save == undefined) save = 'fort';
+
+        if (roll == 'ability') token.actor.data.data.abilities?.[ability].roll(options);
+        else if (roll == 'save') {
+            let ability = save;
+            if (ability == 'fort') ability = 'fortitude';
+            else if (ability == 'ref') ability = 'reflex';
+            else if (ability == 'will') ability = 'will';
+            token.actor.data.data.saves?.[ability].roll(options);
+        }
+        else if (roll == 'skill') token.actor.data.data.skills?.[skill].roll(options);
+    }
+
+    /**
+     * Items
+     */
+    getItems(token,itemType) {
+        if (itemType == undefined) itemType = 'any';
+        const allItems = token.actor.items;
+        if (itemType == 'any') return allItems.filter(i => i.type == 'weapon' || i.type == 'equipment' || i.type == 'consumable' || i.type == 'loot' || i.type == 'container');
+        else return allItems.filter(i => i.type == itemType);
+    }
+
+    getItemUses(item) {
+        return {available: item.data.data.quantity.value};
+    }
+    
+    /**
+     * Features
+     */
+     getFeatures(token,featureType) {
+        if (featureType == undefined) featureType = 'any';
+        const allItems = token.actor.items;
+        if (featureType == 'any') return allItems.filter(i => i.type == 'class' || i.type == 'feat')
+        else return allItems.filter(i => i.type == featureType)
+    }
+
+    getFeatureUses(item) {
+        if (item.data.type == 'class') return {available: item.actor.data.data.details.level.value};
+        else return;
+    }
+
+    /**
+     * Spells
+     */
+    getSpells(token,level) {
+        if (level == undefined) level = 'any';
+        const allItems = token.actor.items;
+        if (level == 'any') return allItems.filter(i => i.type == 'spell')
+        else return allItems.filter(i => i.type == 'spell' && i.data.data.level.value == level)
+    }
+
+    getSpellUses(token,level,item) {
+        if (level == undefined) level = 'any';
+        if (item.data.data.level.value == 0) return;
+        const spellbook = token.actor.items.filter(i => i.data.type === 'spellcastingEntry')[0];
+        if (spellbook == undefined) return;
+        return {
+            available: spellbook.data.data.slots?.[`slot${level}`].value,
+            maximum: spellbook.data.data.slots?.[`slot${level}`].max
+        }
+    }
+}

src/systems/tokenHelper.js

@@ -0,0 +1,241 @@
+import {dnd5e} from "./dnd5e.js"
+import {dnd35e} from "./dnd35e.js"
+import {pf2e} from "./pf2e.js"
+import {demonlord} from "./demonlord.js";
+import {compatibleCore} from "../misc.js";
+
+export class TokenHelper{
+    constructor(){
+        this.system;
+        this.setSystem();
+    }
+
+    setSystem() {
+        if (game.system.id == 'D35E' || game.system.id == 'pf1') this.system = new dnd35e();
+        else if (game.system.id == 'pf2e') this.system = new pf2e();
+        else if (game.system.id == 'demonlord') this.system = new demonlord();
+        else this.system = new dnd5e();     //default to dnd5e
+    }
+
+    /***********************************************************************
+     * System agnostic functions
+     ***********************************************************************/
+    getToken(type,identifier) {
+        if (type == 'selected') return this.getSelectedToken();
+        else if (type != 'selected' && identifier == '') return;
+        else if (type == 'tokenName') return this.getTokenFromTokenName(identifier);
+        else if (type == 'actorName') return this.getTokenFromActorName(identifier);
+        else if (type == 'tokenId') return this.getTokenFromTokenId(identifier);
+        else if (type == 'actorId') return this.getTokenFromActorId(identifier);
+    }
+    getTokenFromTokenId(id) {
+        return canvas.tokens.children[0].children.find(p => p.id == id);
+    }
+
+    getTokenFromTokenName(name) {
+        return canvas.tokens.children[0].children.find(p => p.name == name);
+    }
+
+    getTokenFromActorId(id) {
+        return canvas.tokens.children[0].children.find(p => p.actor.id == id);
+    }
+
+    getTokenFromActorName(name) {
+        return canvas.tokens.children[0].children.find(p => p.actor.name == name);
+    }
+
+    getSelectedToken() {
+        return canvas.tokens.controlled[0];
+    }
+
+    moveToken(token,dir){
+        if (dir == undefined) dir = 'up';
+        const gridSize = canvas.scene.data.grid;
+        let x = token.x;
+        let y = token.y;
+
+        if (dir == 'up') y -= gridSize;
+        else if (dir == 'down') y += gridSize;
+        else if (dir == 'right') x += gridSize;
+        else if (dir == 'left') x -= gridSize;
+        else if (dir == 'upRight') {
+            x += gridSize;
+            y -= gridSize;
+        }
+        else if (dir == 'upLeft') {
+            x -= gridSize;
+            y -= gridSize;
+        }
+        else if (dir == 'downRight') {
+            x += gridSize;
+            y += gridSize;
+        }
+        else if (dir == 'downLeft') {
+            x -= gridSize;
+            y += gridSize;
+        }
+        else if (dir == 'center') {
+            let location = token.getCenter(x,y); 
+            canvas.animatePan(location);
+        }
+        if (game.user.isGM == false && game.paused == true && (token.can(game.user,"control") == false || token.checkCollision(token.getCenter(x, y)))) return;
+        if (compatibleCore("0.8.1")) token.document.update({x:x,y:y});
+        else token.update({x:x,y:y});
+    };
+
+    rotateToken(token,move,value) {
+        if (move == undefined) move = 'to';
+        value = isNaN(parseInt(value)) ? 0 : parseInt(value);
+
+        let rotationVal;
+        if (move == 'by') rotationVal = token.data.rotation + value;
+        else rotationVal = value;
+        
+        if (compatibleCore("0.8.1")) token.document.update({rotation: rotationVal});
+        else token.update({rotation: rotationVal});
+    }
+
+    ///////////////////////////////////////////////
+
+    /**
+     * Get name/id
+     */
+    getTokenName(token) {
+        return token.name;
+    }
+
+    getTokenId(token) {
+        return token.id;
+    }
+
+    getActorName(token) {
+        return token.actor.name;
+    }
+
+    getActorId(token) {
+        return token.actor.id;
+    }
+
+    ////////////////////////////////////////////////////
+    getTokenIcon(token) {
+        return token.data.img;
+    }
+
+    getActorIcon(token) {
+        return token.actor.data.img;
+    }
+
+    /***********************************************************************
+     * System agnostic functions
+     ***********************************************************************/
+    getHP(token) {
+        return this.system.getHP(token);
+    }
+
+    getTempHP(token) {
+        return this.system.getTempHP(token);
+    }
+
+    getAC(token) {
+        return this.system.getAC(token);
+    }
+
+    getShieldHP(token) {
+        return this.system.getShieldHP(token);
+    }
+
+    getSpeed(token) {
+        return this.system.getSpeed(token);
+    }
+
+    getInitiative(token) {
+        return this.system.getInitiative(token);
+    }
+
+    toggleInitiative(token) {
+        return this.system.toggleInitiative(token);
+    }
+
+    getPassivePerception(token) {
+        return this.system.getPassivePerception(token);
+    }
+
+    getPassiveInvestigation(token) {
+        return this.system.getPassiveInvestigation(token);
+    }
+
+    getAbility(token, ability) {
+        return this.system.getAbility(token, ability);
+    }
+
+    getAbilityModifier(token, ability) {
+        return this.system.getAbilityModifier(token, ability);
+    }
+
+    getAbilitySave(token, ability) {
+        return this.system.getAbilitySave(token, ability);
+    }
+
+    getSkill(token, skill) {
+        return this.system.getSkill(token, skill);
+    }
+
+    getProficiency(token) {
+        return this.system.getProficiency(token);
+    }
+
+    /**
+     * Conditions
+     */
+    getConditionIcon(condition) {
+        return this.system.getConditionIcon(condition);
+    }
+
+    getConditionActive(token,condition) {
+        return this.system.getConditionActive(token,condition);
+    }
+
+    toggleCondition(token,condition) {
+        return this.system.toggleCondition(token,condition);
+    }
+
+    /**
+     * Roll
+     */
+     roll(token,roll,options,ability,skill,save) {
+        return this.system.roll(token,roll,options,ability,skill,save);
+    }
+
+    /**
+     * Items
+     */
+    getItems(token,itemType) {
+        return this.system.getItems(token,itemType);
+    }
+
+    getItemUses(item) {
+        return this.system.getItemUses(item);
+    }
+
+    /**
+     * Features
+     */
+    getFeatures(token,featureType) {
+        return this.system.getFeatures(token,featureType);
+    }
+
+    getFeatureUses(item) {
+        return this.system.getFeatureUses(item);
+    }
+
+    /**
+     * Spells
+     */
+     getSpells(token,level) {
+        return this.system.getSpells(token,level);
+    }
+
+    getSpellUses(token,level,item) {
+        return this.system.getSpellUses(token,level,item);
+    }
+}

templates/downloadUtility.html

@@ -0,0 +1,94 @@
+<form autocomplete="off" onsubmit="event.preventDefault()">
+    <style>
+        .columnLabel {
+            width:25%;
+            text-align: left;
+        }
+        .columnVersion {
+            width:15%;
+            text-align: left;
+        }
+        .columnOS {
+            width:15%;
+        }
+        .columnButton {
+            width:15%;
+        }
+        .btn {
+            width:100%;
+        }
+    </style>
+    
+    <h2>{{localize "MaterialDeck.DownloadUtility.Plugin"}}</h2>
+
+    <table style="width:100%; min-width:400px">
+        <tr>
+          <th class='columnLabel'></th>
+          <th class='columnVersion'>{{localize "MaterialDeck.DownloadUtility.Current"}}</th>
+          <th class='columnVersion'>{{localize "MaterialDeck.DownloadUtility.Minimum"}}</th>
+          <th class='columnVersion'>{{localize "MaterialDeck.DownloadUtility.Latest"}}</th>
+          <th class='columnOS'>{{localize "MaterialDeck.DownloadUtility.OS"}}</th>
+          <th class='columnButton'>{{localize "MaterialDeck.DownloadUtility.Download"}}</th>
+        </tr>
+
+        <tr>
+          <td class='columnLabel'>{{localize "MaterialDeck.DownloadUtility.SDplugin"}}</td>
+          <td class='columnVersion'>{{localSdVersion}}</td>
+          <td class='columnVersion'>{{minimumSdVersion}}</td>
+          <td class='columnVersion' id='masterSdVersion'>{{masterSdVersion}}</td>
+          <td class='columnOS'></td>
+          <td class='columnButton'>
+            <button type="button" class='btn' id='downloadSd' {{#if sdDlDisable}}disabled{{/if}}>
+                <i class="fas fa-download"></i>
+            </button>
+          </td>
+        </tr>
+
+        <tr>
+          <td class='columnLabel'>{{localize "MaterialDeck.DownloadUtility.MSserver"}}</td>
+          <td class='columnVersion'>{{localMsVersion}}</td>
+          <td class='columnVersion'>{{minimumMsVersion}}</td>
+          <td class='columnVersion' id='masterMsVersion'>{{masterMsVersion}}</td>
+          <td class='columnOS'>
+            <select id="os" default="" {{#if msDlDisable}}disabled{{/if}}>
+                <option value="win">{{localize "MaterialDeck.DownloadUtility.Windows"}}</option>
+                <option value="macos">{{localize "MaterialDeck.DownloadUtility.Macos"}}</option>
+                <option value="linux">{{localize "MaterialDeck.DownloadUtility.Linux"}}</option>
+                <option value="source">{{localize "MaterialDeck.DownloadUtility.Source"}}</option>
+            </select>
+          </td>
+          <td class='columnButton'>
+            <button type="button" class='btn' id='downloadMs' {{#if msDlDisable}}disabled{{/if}}>
+                <i class="fas fa-download"></i>
+            </button>
+          </td>
+        </tr>
+      </table> 
+      <br>
+      <h2>{{localize "MaterialDeck.DownloadUtility.Profiles"}}</h2>
+
+      <table style="width:100%; min-width:400px">
+        <tr>
+          <th style='text-align: left;'>{{localize "MaterialDeck.DownloadUtility.Name"}}</th>
+          <th class='columnButton'>{{localize "MaterialDeck.DownloadUtility.Download"}}</th>
+        </tr>
+        <div id='profileContents'>
+          {{#each profiles as |p|}}
+            <tr>
+              <td>{{p.label}}</td>
+              <td class='columnButton'>
+                <button type="button" class='btn' id='dlProfile-{{p.id}}' name='downloadProfile' {{#if ../profileDlDisable}}disabled{{/if}}>
+                    <i class="fas fa-download"></i>
+                </button>
+              </td>
+            </tr>
+          {{/each}}
+        </div>
+      </table> 
+      
+      <button type="button" id='refresh'>
+        <i class="fas fa-redo"></i>
+        {{localize "MaterialDeck.DownloadUtility.Refresh"}}
+    </button>
+
+</form>

templates/exportDialog.html

@@ -0,0 +1,12 @@
+<form autocomplete="off" onsubmit="event.preventDefault()">
+    <p>{{content}}</p>
+
+    <div class="form-group"> 
+        <label>{{localize "MaterialDeck.Filename"}}: </label>
+        <input type="text" name="name" value="{{name}}" id="name" style="width:100%;" >
+    </div>
+
+    <button type="submit" name="submit">
+        <i></i>{{localize "MaterialDeck.Export"}}
+    </button>
+</form>

templates/helpMenu.html

@@ -1,6 +1,7 @@
 <form autocomplete="off" onsubmit="event.preventDefault()">
 
     <div style="width:1200px">
+
         <h1>Introduction</h1>
         Material Deck is a Foundry VTT module that allows you to control certain Foundry functions using an Elgato Stream Deck. 
         A Stream Deck is a device that has physical buttons with displays behind them. Material Deck uses this to, for example, 
@@ -16,22 +17,35 @@
         <a href="https://github.com/CDeenen/MaterialDeck/releases">Module</a><br>
         <a href="https://github.com/CDeenen/MaterialDeck_SD/releases">Stream Deck</a><br>
         <a href="https://github.com/CDeenen/MaterialServer/releases">Server</a><br>
+        You can use the download utility in the module settings to download the Stream Deck plugin, Stream Deck profiles and Material Server.
 
         <h1>Getting Started</h1>
         Besides installing this module, you also need to install and run some other things.
 
         <h2>Installing the Stream Deck Software and Plugin</h2>
+        YOu have to download and install the <a href="https://www.elgato.com/en/gaming/downloads">Stream Deck software</a>. 
+        You then need to install the plugin. There is a delay between when the plugin get's updated and the update being pushed in the store. 
+        If you try to install the plugin right after an update, you might not have the latest version. Manual installation is better in that case.
+        <br>
+        <h3>Stream Deck Store</h3>
         <ol>
-            <li>Download and install the <a href="https://www.elgato.com/en/gaming/downloads">Stream Deck software</a></li>
-            <li>Download the latest plugin file (com.cdeenen.materialdeck.streamDeckPlugin) from <a href="https://github.com/CDeenen/MaterialDeck_SD/releases">here</a></li>
+            <li>Open the Stream Deck application</li>
+            <li>Press 'More Actions' in the lower right</li>
+            <li>Search (top right) or scroll to find Material Deck</li>
+            <li>Press the 'Install' button</li>
+        </ol>
+
+        <h3>Manually</h3>
+        <ol>
+            <li>Download the latest plugin file using the download utility in the module settings, or download it (com.cdeenen.materialdeck.streamDeckPlugin) from <a href="https://github.com/CDeenen/MaterialDeck_SD/releases">here</a></li>
             <li>Double-click the file, this should open the Stream Deck software</li>
             <li>Press 'Install' in the pop-up</li>
         </ol>
 
-        <h2>Installing the Stream Deck Profile (optional)</h2>
+        <h2>Installing a Stream Deck Profile (optional)</h2>
         You can create your own profile, but it is recommended to start with one of the pre-made profiles. Currently, there is a profile for the normal and XL Stream Deck variants.
         <ol>
-            <li>Download the latest profile (ending with .streamDeckProfile) from <a href="https://github.com/CDeenen/MaterialDeck_SD/releases">here</a></li>
+            <li>Download the latest plugin file using the download utility in the module settings, or download one (ending with .streamDeckProfile) from <a href="https://github.com/CDeenen/MaterialDeck_SD/releases">here</a></li>
             <li>Double-click the file, this should load the profile into the Stream Deck software</li>
         </ol>
 
@@ -54,6 +68,8 @@
         There are four buttons at the top:
         <ul>
             <li>Help</li>
+            <li>User Permission Configuration</li>
+            <li>Download Utility</li>
             <li>Playlist Configuration</li>
             <li>Macro Configuration</li>
             <li>Soundboard Configuration</li>
@@ -62,16 +78,16 @@
         <br>
         Below the buttons you will find the following settings:
         <ul>
-            <li><b>Enable Module</b> - Ticking this box enabled the module</li>
-            <li><b>Stream Deck Model</b> - Select the model of your Stream Deck. This is optional, as it only changes the amount of macros and sounds that 
-                you can assign in the macro and soundboard configuration screens. If you have a smaller Stream Deck, you might not want to 
-                have a screen filled with 64 macros, since you probably won't use that many (you can, if you want to, though)</li>
+            <li><b>Enable Module</b> - Ticking this box enabled the module for the client</li>
             <li><b>Material Server Address</b> - Fill in the address of Material Server (usually if you run it on the same computer as 
                 you're using for Foundry, this can be localhost:3001). This is not necessarily the IP address of Foundry! It is the IP 
                 address of the computer that's running Material Server. The default value will work for 99% of people, only change it if 
                 you know what you're doing. More info on Material Server can be found <a href="https://github.com/CDeenen/MaterialServer/blob/master/README.md">here</a></li>
             <li><b>Image Cache Size</b> - Sets the amount of images to store in the image cache. The image cache will locally store all images sent to the Stream Deck. 
                 This improves the update speed, but increases memory usage.</li>
+            <li><b>Image Brightness</b> - Sets the brightness of the default white images for better readibility of the text. If Image Cache Size is large, it'll take a while for 
+                the new brightness setting to be applied. A refresh will give instantaneous results.</li>
+            <li><b>Number of Connection Warnings</b> - Sets the number of times you will get a warning when Material Deck cannot connect to Material Server. Will be unlimited if set to 0.</li>
         </ul>
 
         <BR CLEAR="right" />
@@ -86,6 +102,17 @@
 
         <BR CLEAR="right" />
 
+        <h2>Download Utility</h2>
+        <img src="modules/MaterialDeck/wiki/img/DownloadUtility.png" align="right" HSPACE="5" width="350">
+        The download utility allows you to easily check the current version of the Stream Deck plugin and Material Server, and gives you the option to download the latest version.<br>
+        Please note that the current version of Material Server is at the moment not supported.<br>
+        <br>
+        At the bottom you can also download the default profiles from <a href="https://github.com/CDeenen/MaterialDeck_SD/releases">Github</a><div class=""></div><br>
+        <br>
+        The refresh button at the bottom refreshes the page in case there was a connection issue.
+
+        <BR CLEAR="right" />
+
         <h2>Playlist Configuration</h2>
         <img src="modules/MaterialDeck/wiki/img/PlaylistConfig.png" align="right" HSPACE="5" width="350">
         The playlist configuration screen configures the playlists that you control using the <a href="https://github.com/CDeenen/MaterialDeck/wiki/Playlist-Action">Playlist action</a>.<br>
@@ -116,10 +143,11 @@
         <b>Note:</b> While you can assign the same playlist to multiple playlists in this configuration screen, only the play method of the first instance will be applied.
 
         <h2>Macro Configuration</h2>
-        The Macro Configuration screen is to configure the macro board for the <a href="https://github.com/CDeenen/MaterialDeck/wiki/Macro-Action">Macro action</a>.<br>
+        The Macro Configuration screen is to configure the macroboard for the <a href="https://github.com/CDeenen/MaterialDeck/wiki/Macro-Action">Macro action</a>.<br>
         <br>
-        The screen is divided into a number of boxes, each labeled 'Macro #', where each represents a single macro and its settings. The number of macros you can see 
-        depends on what Stream Deck model you've set up in the module configuration.<br>
+        The screen is divided into 32 boxes, each labeled 'Macro #', where each represents a single macro and its settings. This screen will be refered to as a page.
+        By pressing the arrows at the top right and top left, you can go to the next or previous page. There is no limit to the amount of pages you can add, but if you 
+        have a lot of pages, at some point you might notice some performance issues.<br>
         <br>
         For each macro there are 3 options: 
         <ul>
@@ -131,13 +159,25 @@
             <li><b>Background</b> - Color picker to set the background color of the Stream Deck button</li>
         </ul>
 
+        <br>
+        At the bottom you have the following buttons:
+        <ul>
+            <li><b>Clear Page</b> - Clears all the macros on the current page. Please note that this is irreversible.</li>
+            <li><b>Clear All</b> - Clears all the macros. Please note that this is irreversible.</li>
+            <li><b>Import</b> - Import the macroboard from a file. This will override your current macroboard, and is irreversible.</li>
+            <li><b>Export</b> - Export your macroboard to a file.</li>
+        </ul>
+        When importing and exporting, you only import/export the metadata, not the actual macros. This means that you need to have the same macros in both the source and target Foundry client,
+        or you might run into issues.
+
         <img src="modules/MaterialDeck/wiki/img/MacroConfig.png" align="center" HSPACE="5" width="100%">
 
         <h2>Soundboard Configuration</h2>
         The Soundboard Configuration screen is used to configure the soundboard for the <a href="https://github.com/CDeenen/MaterialDeck/wiki/Soundboard-Action">Soundboard action</a>.<br>
         <br>
-        Similar to the Macro Configuration screen, the screen is divided into a number of boxes, each labeled 'Sound #', where each represents a single sound and its settings. 
-        The number of sounds you can see depends on what Stream Deck model you've set up in the module configuration.<br>
+        Similar to the Macro Configuration screen, the screen is divided into boxes, each labeled 'Sound #', where each represents a single sound and its settings. This screen will be refered to as a page.
+        By pressing the arrows at the top right and top left, you can go to the next or previous page. There is no limit to the amount of pages you can add, but if you 
+        have a lot of pages, at some point you might notice some performance issues.<br>
         <br>
         For each sound there are multiple options:
         <ul>
@@ -163,6 +203,17 @@
             <li><b>Volume</b> - The playback volume of the sound. The final playback volume is also determined by the Interface Volume slider in Foundry's 'Audio Playlists' tab.</li>
         </ul>
 
+        <br>
+        At the bottom you have the following buttons:
+        <ul>
+            <li><b>Clear Page</b> - Clears all the sounds on the current page. Please note that this is irreversible.</li>
+            <li><b>Clear All</b> - Clears all the sounds. Please note that this is irreversible.</li>
+            <li><b>Import</b> - Import the soundboard from a file. This will override your current soundboard, and is irreversible.</li>
+            <li><b>Export</b> - Export your soundboard to a file.</li>
+        </ul>
+        When importing and exporting, you only import/export the metadata, not the actual audio files. This means that you need to have the same audio files in the same relative location in both the source and target Foundry client,
+        or you might run into issues.
+
         <img src="modules/MaterialDeck/wiki/img/SoundboardConfig.png" align="center" HSPACE="5" width="100%">
 
         <h1>Customization</h1>
@@ -180,7 +231,6 @@
             <li><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action">Combat Tracker Action</a></li>
             <li><a href="https://github.com/CDeenen/MaterialDeck/wiki/External-Modules">External Modules</a></li>
             <li><a href="https://github.com/CDeenen/MaterialDeck/wiki/Macro-Action">Macro Action</a></li>
-            <li><a href="https://github.com/CDeenen/MaterialDeck/wiki/Move-Action">Move Action</a></li>
             <li><a href="https://github.com/CDeenen/MaterialDeck/wiki/Other-Actions">Other Actions</a></li>
             <li><a href="https://github.com/CDeenen/MaterialDeck/wiki/Playlist-Action">Playlist Action</a></li>
             <li><a href="https://github.com/CDeenen/MaterialDeck/wiki/Scene-Action">Scene Action</a></li>
@@ -188,10 +238,6 @@
             <li><a href="https://github.com/CDeenen/MaterialDeck/wiki/Token-Action">Token Action</a></li>
         </ul>
 
-        <h1>Software Versions & Module Incompatibilities</h1>
-        <b>Foundry VTT:</b> Tested on 0.7.9<br>
-        <b>Module Incompatibilities:</b> None known.<br>
-
         <h1>Feedback</h1>
         If you have any suggestions or bugs to report, feel free to create an issue, contact me on Discord (Cris#6864), or send me an email: cdeenen@outlook.com.
 

templates/importDialog.html

@@ -0,0 +1,13 @@
+<form autocomplete="off" onsubmit="event.preventDefault()">
+    <p>{{content}}</p>
+    <p><b>{{ localize "MaterialDeck.ImportDialog.Warning" }}</b></p>
+
+    <div class="form-group upload-file">
+        <label><i class="fas fa-upload fa-fw"></i> {{ localize "FILES.Upload" }}</label>
+        <input type="file" name="upload" id="uploadJson">
+    </div>
+
+    <button type="submit" name="submit">
+        <i></i>{{localize "MaterialDeck.Import"}}
+    </button>
+</form>

templates/macroConfig.html

@@ -6,21 +6,38 @@
             max-width: 166px;
             height: {{height}}px;
         }
+        .navigation {
+            flex:1;
+            max-width: 8%;
+        }
     </style>
 
+    <div class="navigationDiv" style="width:100%; display:flex; flex-direction:row;">
+        <button type="button" class="navigation" id="navPrev" {{prevDisabled}}>
+            <i class="fas fa-arrow-left"></i>
+        </button>
+        <p style="width:84%; text-align:center; padding: 0px 0; font-size: 20px"><b>
+            {{localize "MaterialDeck.Perm.MACRO.label"}}: {{macroRange}} {{localize "MaterialDeck.Of"}} {{totalMacros}}
+        </b></p>
+        <button type="button" class="navigation" id="navNext">
+            <i class="fas fa-arrow-right"></i>
+        </button>
+    </div>
+    <hr>
+
     {{#each macroData}}
-        <div class="form-group">
+        <div class="form-group" style="width:100%">
             {{#each this.dataThis}}
-                <div class="boxed" style="padding: 5px; margin:2px">
+                <div class="boxed" style="padding: 5px; margin:2px; width:10%">
                     <div style="text-align:center;">                    
                         {{localize "MaterialDeck.Macro"}} {{this.iteration}}
                     </div>
                     <div>
-                        <select name="macros" class="macros-select" id="macros{{this.iteration}}" default="" style="max-width:140px;">
+                        <select name="macros" class="macros-select" id="macros{{this.iteration}}" default="" style="width:100%;">
                             {{#select this.macro}}
                                 <option value="">{{localize "MaterialDeck.None"}}</option>
                                 {{#each ../../macros}}
-                                <option value="{{this._id}}">{{this.name}}</option>
+                                <option value="{{this.id}}">{{this.name}}</option>
                                 {{/each}}
                             {{/select}}
                         </select>
@@ -38,4 +55,20 @@
             {{/each}}
         </div>
     {{/each}}
+    <hr>
+    <div class="navigationDiv" style="width:100%; display:flex; flex-direction:row;">
+        <button type="button" class="navigation" id="clearPage">
+            <i></i>{{localize "MaterialDeck.ClearPage"}}
+        </button>
+        <button type="button" class="navigation" id="clearAll">
+            <i></i>{{localize "MaterialDeck.ClearAll"}}
+        </button>
+        <p style="width:68%;"></p>
+        <button type="button" class="navigation" id="import">
+            <i></i>{{localize "MaterialDeck.Import"}}
+        </button>
+        <button type="button" class="navigation" id="export">
+            <i></i>{{localize "MaterialDeck.Export"}}
+        </button>
+    </div>
 </form>

templates/playlistConfig.html

@@ -26,7 +26,7 @@
                 {{#select this.playlist}}
                     <option value="">{{localize "MaterialDeck.None"}}</option>
                     {{#each ../playlists}}
-                    <option value="{{this._id}}">{{this.name}}</option>
+                    <option value="{{this.id}}">{{this.name}}</option>
                     {{/each}}
                 {{/select}}
             </select>

templates/soundboardConfig.html

@@ -6,12 +6,29 @@
             max-width: 166px;
             height: 300px;
         }
+
+        .navigation {
+            flex:1;
+        }
     </style>
 
+    <div class="navigation" style="width:100%; display:flex; flex-direction:row;">
+        <button type="button" class="navigation" id="navPrev" {{prevDisabled}}>
+            <i class="fas fa-arrow-left"></i>
+        </button>
+        <p style="flex:15; text-align:center; padding: 0px 0; font-size: 20px"><b>
+            {{localize "MaterialDeck.Sounds"}}: {{soundRange}} {{localize "MaterialDeck.Of"}} {{totalSounds}}
+        </b></p>
+        <button type="button" class="navigation" id="navNext">
+            <i class="fas fa-arrow-right"></i>
+        </button>
+    </div>
+    <hr>
+    
     {{#each soundData}}
-        <div class="form-group">
+        <div class="form-group" style="width:100%">
             {{#each this.dataThis}}
-                <div class="boxed" style="padding: 5px; margin:2px">
+                <div class="boxed" style="padding: 5px; margin:2px; width:10%">
                     <div style="text-align:center;">                    
                         {{localize "MaterialDeck.Sound"}} {{this.iteration}}
                     </div>
@@ -87,4 +104,20 @@
             {{/each}}
         </div>
     {{/each}}
+    <hr>
+    <div class="navigation" style="width:100%; display:flex; flex-direction:row;">
+        <button type="button" class="navigation" id="clearPage">
+            <i></i>{{localize "MaterialDeck.ClearPage"}}
+        </button>
+        <button type="button" class="navigation" id="clearAll">
+            <i></i>{{localize "MaterialDeck.ClearAll"}}
+        </button>
+        <p style="flex:15;"></p>
+        <button type="button" class="navigation" id="import">
+            <i></i>{{localize "MaterialDeck.Import"}}
+        </button>
+        <button type="button" class="navigation" id="export">
+            <i></i>{{localize "MaterialDeck.Export"}}
+        </button>
+    </div>
 </form>