From 46a01b80bd53e62bb38d2945e12bc97da8c70f37 Mon Sep 17 00:00:00 2001 From: OllisGit Date: Tue, 25 May 2021 12:32:24 +0200 Subject: [PATCH] New Version 1.4.2 - B #164 missing 'h' - B Ticket PjH 148 wrong weight was picked --- README.md | 1 - octoprint_SpoolManager/__init__.py | 2 +- octoprint_SpoolManager/templates/SpoolManager_tab.jinja2 | 2 +- setup.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 82587d41..b927bc84 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ If you like it, I would be thankful about a cup of coffee :) ## Tested with: - OctoPrint 1.5.2: with Python 3.6.8 and Python 2.7.9 -- OctoPrint 1.4.2: OPEN ## Included features diff --git a/octoprint_SpoolManager/__init__.py b/octoprint_SpoolManager/__init__.py index c873c4fb..59d2151e 100644 --- a/octoprint_SpoolManager/__init__.py +++ b/octoprint_SpoolManager/__init__.py @@ -477,7 +477,7 @@ def api_getSelectedSpoolInformations(self): "colorName": spoolModel.colorName, "color": spoolModel.color, "cost": spoolModel.cost, - "weight": spoolModel.weight + "weight": spoolModel.totalWeight } result.append(spoolData) diff --git a/octoprint_SpoolManager/templates/SpoolManager_tab.jinja2 b/octoprint_SpoolManager/templates/SpoolManager_tab.jinja2 index 9e24950d..006559d8 100644 --- a/octoprint_SpoolManager/templates/SpoolManager_tab.jinja2 +++ b/octoprint_SpoolManager/templates/SpoolManager_tab.jinja2 @@ -42,7 +42,7 @@ Show spools: all | hide empty | - ide inactive + hide inactive diff --git a/setup.py b/setup.py index c4da145b..1dfd11ee 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module # -plugin_version = "1.4.1" +plugin_version = "1.4.2" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module