From 79cfc5769af36229ca4118012741160925727284 Mon Sep 17 00:00:00 2001
From: Cristian Deenen <cdeenen@outlook.com>
Date: Mon, 30 May 2022 02:06:57 +0200
Subject: [PATCH] v1.4.10

---
 MaterialDeck.js                |  4 ++--
 changelog.md                   | 12 ++++++++++++
 lang/en.json                   |  3 ++-
 lang/ja.json                   |  3 ++-
 module.json                    |  2 +-
 src/misc.js                    |  2 +-
 templates/downloadUtility.html |  7 ++++---
 7 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/MaterialDeck.js b/MaterialDeck.js
index 17dd2a9..0a15ed0 100644
--- a/MaterialDeck.js
+++ b/MaterialDeck.js
@@ -70,9 +70,9 @@ async function analyzeWSmessage(msg){
             system: gamingSystem
         }
         ws.send(JSON.stringify(msg));
-        
+        if (data.MSversion) msVersion = data.MSversion;
 
-        console.log("streamdeck connected to server");
+        console.log("streamdeck connected to server", msVersion);
         streamDeck.resetImageBuffer();
     }
 
diff --git a/changelog.md b/changelog.md
index dc48fcc..c64ac31 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,16 @@
 # Changelog Material Deck Module
+### v1.4.10 - 30-05-2022
+Fixes:
+<ul>
+    <li>Stream Deck plugin v1.4.10 was not properly recognized as compatible</li>
+</ul>
+
+Additions;
+<ul>
+    <li>Material Server version is now displayed in the Download Utility (MS v1.1.0+)</li>
+</ul>
+
+
 ### v1.4.9 - 16-04-2022
 Fixes:
 <ul>
diff --git a/lang/en.json b/lang/en.json
index f049ad8..c68262e 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -205,7 +205,8 @@
     "MaterialDeck.DownloadUtility.SDplugin": "SD Plugin",
     "MaterialDeck.DownloadUtility.MSserver": "Material Server",
     "MaterialDeck.DownloadUtility.Windows": "Windows",
-    "MaterialDeck.DownloadUtility.Macos": "MacOS",
+    "MaterialDeck.DownloadUtility.MacosM1": "MacOS (M1)",
+    "MaterialDeck.DownloadUtility.MacosIntel": "MacOS (Intel)",
     "MaterialDeck.DownloadUtility.Linux": "Linux",
     "MaterialDeck.DownloadUtility.Source": "Source",
     "MaterialDeck.DownloadUtility.Profiles": "Profiles",
diff --git a/lang/ja.json b/lang/ja.json
index c8e0416..56782b6 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -200,7 +200,8 @@
     "MaterialDeck.DownloadUtility.SDplugin": "SDプラグイン",
     "MaterialDeck.DownloadUtility.MSserver": "Material Server",
     "MaterialDeck.DownloadUtility.Windows": "Windows",
-    "MaterialDeck.DownloadUtility.Macos": "MacOS",
+    "MaterialDeck.DownloadUtility.MacosM1": "MacOS (M1)",
+    "MaterialDeck.DownloadUtility.MacosIntel": "MacOS (Intel)",
     "MaterialDeck.DownloadUtility.Linux": "Linux",
     "MaterialDeck.DownloadUtility.Source": "ソース",
     "MaterialDeck.DownloadUtility.Profiles": "プロファイル",
diff --git a/module.json b/module.json
index 98ac69e..282fabc 100644
--- a/module.json
+++ b/module.json
@@ -2,7 +2,7 @@
   "name": "MaterialDeck",
   "title": "Material Deck",
   "description": "Material Deck allows you to control Foundry using an Elgato Stream Deck",
-  "version": "1.4.9",
+  "version": "1.4.10",
   "author": "CDeenen",
   "authors": {
     "name": "CDeenen",
diff --git a/src/misc.js b/src/misc.js
index d033618..6e7d825 100644
--- a/src/misc.js
+++ b/src/misc.js
@@ -1184,7 +1184,7 @@ export class downloadUtility extends FormApplication {
         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';
+        else if (reqType == 'MS') url = 'https://raw.githubusercontent.com/CDeenen/MaterialServer/master/package.json';
         const elementId = reqType == 'SD' ? 'masterSdVersion' : 'masterMsVersion';
 
         var request = new XMLHttpRequest();
diff --git a/templates/downloadUtility.html b/templates/downloadUtility.html
index 3718f73..0e82b36 100644
--- a/templates/downloadUtility.html
+++ b/templates/downloadUtility.html
@@ -51,9 +51,10 @@
           <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="win32-x64">{{localize "MaterialDeck.DownloadUtility.Windows"}}</option>
+                <option value="macos-x64">{{localize "MaterialDeck.DownloadUtility.MacosIntel"}}</option>
+                <option value="macos-arm64">{{localize "MaterialDeck.DownloadUtility.MacosM1"}}</option>
+                <option value="linux-x64">{{localize "MaterialDeck.DownloadUtility.Linux"}}</option>
                 <option value="source">{{localize "MaterialDeck.DownloadUtility.Source"}}</option>
             </select>
           </td>