Merge branch 'develop'

Signed-off-by: Pedro Lamas <[email protected]>

Author: pedrolamas

package-lock.json

@@ -32,19 +32,19 @@
   "main": "index.js",
   "dependencies": {
     "@ctrl/tinycolor": "^4.1.0",
-    "@fontsource/raleway": "^5.2.5",
-    "@fontsource/roboto": "^5.2.5",
+    "@fontsource/raleway": "^5.2.6",
+    "@fontsource/roboto": "^5.2.6",
     "@irojs/iro-core": "^1.2.1",
     "@jaames/iro": "^5.5.2",
-    "axios": "^1.9.0",
+    "axios": "^1.10.0",
     "consola": "^3.4.2",
-    "dompurify": "^3.2.5",
+    "dompurify": "^3.2.6",
     "echarts": "^5.6.0",
     "echarts-gl": "^2.0.9",
-    "hls.js": "^1.6.2",
+    "hls.js": "^1.6.5",
     "jwt-decode": "^4.0.0",
     "lodash-es": "^4.17.21",
-    "marked": "^15.0.11",
+    "marked": "^15.0.12",
     "marked-base-url": "^1.1.6",
     "md5": "^2.3.0",
     "monaco-editor": "^0.52.2",
@@ -55,7 +55,7 @@
     "path-browserify": "^1.0.1",
     "qr-scanner": "^1.4.2",
     "qrcode.vue": "^1.7.0",
-    "semver": "^7.7.1",
+    "semver": "^7.7.2",
     "shlex": "^2.1.2",
     "sortablejs": "^1.15.6",
     "uuid": "^11.1.0",
@@ -80,33 +80,33 @@
     "@types/jsdom": "^21.1.7",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.5",
-    "@types/node": "^22.15.17",
+    "@types/node": "^22.15.30",
     "@types/semver": "^7.7.0",
     "@types/sortablejs": "^1.15.8",
     "@vitejs/plugin-vue2": "^2.3.3",
     "@vue/eslint-config-typescript": "^14.5.0",
     "@vue/test-utils": "^1.3.6",
     "@vue/tsconfig": "~0.1.3",
-    "eslint": "^9.26.0",
-    "eslint-plugin-regexp": "^2.7.0",
+    "eslint": "^9.29.0",
+    "eslint-plugin-regexp": "^2.9.0",
     "eslint-plugin-vue": "^9.33.0",
     "husky": "^9.1.7",
     "jsdom": "^26.1.0",
     "mockdate": "^3.0.5",
     "monaco-vscode-textmate-theme-converter": "^0.1.7",
     "neostandard": "^0.12.1",
-    "rollup": "^4.40.2",
+    "rollup": "^4.43.0",
     "sass": "~1.32.13",
     "skott": "^0.35.4",
     "standard-version": "^9.5.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.0",
-    "unplugin-vue-components": "^28.5.0",
+    "typescript-eslint": "^8.34.0",
+    "unplugin-vue-components": "^28.7.0",
     "vite": "^6.3.5",
     "vite-plugin-checker": "^0.9.3",
     "vite-plugin-monaco-editor-esm": "^2.0.2",
     "vite-plugin-pwa": "^1.0.0",
-    "vitest": "^3.1.3",
+    "vitest": "^3.2.3",
     "vue-debounce-decorator": "^1.0.1",
     "vue-i18n-extract": "^2.0.7",
     "vue-template-compiler": "^2.7.16",

package.json

@@ -147,6 +147,16 @@
         "src": "logo_vzbot.svg"
       }
     },
+    {
+      "name": "Z-Bolt",
+      "color": "#2196F3",
+      "isDark": true,
+      "logo": {
+        "src": "logo_z-bolt.svg",
+        "dark": "#232323",
+        "light": "#ffffff"
+      }
+    },
     {
       "name": "ZeroG",
       "color": "#e34234",

public/config.json

@@ -139,6 +139,16 @@
         "src": "logo_vzbot.svg"
       }
     },
+    {
+      "name": "Z-Bolt",
+      "color": "#2196F3",
+      "isDark": true,
+      "logo": {
+        "src": "logo_z-bolt.svg",
+        "dark": "#232323",
+        "light": "#ffffff"
+      }
+    },
     {
       "name": "ZeroG",
       "color": "#e34234",

public/logo_z-bolt.svg

@@ -144,8 +144,14 @@ export default class MacroCategorySettings extends Vue {
   }
 
   get macros () {
+    if (!this.search) {
+      return this.macrosForCategory
+    }
+
+    const search = this.search.toLowerCase()
+
     return this.macrosForCategory
-      .filter((macro: Macro) => !this.search ? true : macro.name.includes(this.search.toLowerCase()))
+      .filter(macro => macro.name.toLowerCase().includes(search))
   }
 
   set macros (macros: Macro[]) {

server/config.json

@@ -3,7 +3,7 @@
     v-model="open"
     scrollable
     :max-width="$vuetify.breakpoint.mdAndDown ? '90vw' : '75vw'"
-    :title="$tc('app.spoolman.title.spool_selection', targetMacro ? 2 : 1, { macro: targetMacro })"
+    :title="$tc('app.spoolman.title.spool_selection', targetMacro ? 2 : 1, { macro: targetMacro?.toUpperCase() })"
     title-shadow
   >
     <template #menu>

src/components/settings/macros/MacroCategorySettings.vue

@@ -255,7 +255,7 @@ export default class SpoolmanCard extends Mixins(StateMixin) {
 
     return macros
       .filter((macro): macro is MacroWithSpoolId => macro.variables != null && 'spool_id' in macro.variables)
-      .sort((a, b) => a.name.localeCompare(b.name))
+      .sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()))
   }
 
   get remainingFilamentUnit (): SpoolmanRemainingFilamentUnit {

src/components/widgets/spoolman/SpoolSelectionDialog.vue

@@ -249,7 +249,7 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
 
       tools.push({
         name: loadFilamentMacro.name.toUpperCase(),
-        label: loadFilamentMacro.name === 'm701' ? 'M701 (Load Filament)' : undefined,
+        label: loadFilamentMacro.name.toLowerCase() === 'm701' ? 'M701 (Load Filament)' : undefined,
         icon: '$loadFilament',
         disabled: !(ignoreMinExtrudeTemp || this.extruderReady)
       })
@@ -262,7 +262,7 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
 
       tools.push({
         name: unloadFilamentMacro.name.toUpperCase(),
-        label: unloadFilamentMacro.name === 'm702' ? 'M702 (Unload Filament)' : undefined,
+        label: unloadFilamentMacro.name.toLowerCase() === 'm702' ? 'M702 (Unload Filament)' : undefined,
         icon: '$unloadFilament',
         disabled: !(ignoreMinExtrudeTemp || this.extruderReady)
       })
@@ -273,7 +273,7 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
     if (cleanNozzleMacro) {
       tools.push({
         name: cleanNozzleMacro.name.toUpperCase(),
-        label: cleanNozzleMacro.name === 'g12' ? 'G12 (Clean the Nozzle)' : undefined,
+        label: cleanNozzleMacro.name.toLowerCase() === 'g12' ? 'G12 (Clean the Nozzle)' : undefined,
         icon: '$cleanNozzle'
       })
     }