Skip to content

Commit 4b44d44

Browse files
authored
[Automated] Merged develop into target master
2 parents e639e08 + 47b217b commit 4b44d44

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1516
-883
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
# Changelog
33
All notable changes to Mainsail will be documented in this file.
44

5+
## [2.11.2](https://github.com/mainsail-crew/mainsail/releases/tag/v2.11.2) - 2024-05-04
6+
### Bug Fixes and Improvements
7+
8+
- **maintenance**: Fix overdue check from printtime based entries ([#1871](https://github.com/mainsail-crew/mainsail/pull/1871))
9+
- **spoolman**: Fix search for spool-id ([#1872](https://github.com/mainsail-crew/mainsail/pull/1872))
10+
- Calc multiplicator for set_pin gcode ([#1870](https://github.com/mainsail-crew/mainsail/pull/1870))
11+
512
## [2.11.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.11.1) - 2024-05-01
613
### Bug Fixes and Improvements
714

package-lock.json

Lines changed: 88 additions & 95 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mainsail",
3-
"version": "2.11.2",
3+
"version": "2.12.0",
44
"private": true,
55
"decription": "a klipper web interface",
66
"author": {
@@ -33,13 +33,13 @@
3333
"@codemirror/view": "^6.0.3",
3434
"@jaames/iro": "^5.5.2",
3535
"@lezer/highlight": "^1.0.0",
36-
"@sindarius/gcodeviewer": "^3.7.8",
36+
"@sindarius/gcodeviewer": "^3.7.11",
3737
"@uiw/codemirror-theme-vscode": "^4.19.11",
3838
"axios": "^1.6.0",
3939
"codemirror": "^6.0.1",
4040
"core-js": "^3.16.0",
4141
"detect-browser": "^5.3.0",
42-
"echarts": "^5.2.2",
42+
"echarts": "^5.5.0",
4343
"echarts-gl": "^2.0.8",
4444
"hls.js": "^1.3.3",
4545
"jmuxer": "^2.0.5",

public/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"defaultLocale": "en",
3-
"defaultTheme": "dark",
3+
"defaultMode": "dark",
4+
"defaultTheme": "mainsail",
45
"hostname": null,
56
"port": null,
67
"path": null,
375 KB
Loading

public/img/themes/sidebarLogo-btt.svg

Lines changed: 10 additions & 0 deletions
Loading
Lines changed: 15 additions & 0 deletions
Loading

public/img/themes/sidebarLogo-ldo.svg

Lines changed: 7 additions & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)