Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer

2026-07-17 09:04:27 +00:00 · 2020-12-04 14:19:08 +01:00
parent 6eb202af0b 9c959d14e0
commit 75a1a699a7
12 changed files with 5197 additions and 3630 deletions
@@ -1192,7 +1192,7 @@ void Sidebar::update_sliced_info_sizer()

                        double spool_weight = filament_preset->config.opt_float("filament_spool_weight", 0);
                        if (spool_weight != 0.0) {
-                            new_label += "\n      " + _L("(weight with spool)");
+                            new_label += "\n      " + _L("(including spool)");
                            info_text += wxString::Format(" (%.2f)\n", filament_weight + spool_weight);
                        }
                    }