Merge branch 'master' of https://github.com/Ultimaker/Cura

resources/definitions/fdmprinter.def.json

@@ -2072,7 +2072,7 @@
                     "default_value": 25,
                     "minimum_value": "0.0001",
                     "minimum_value_warning": "1",
-                    "maximum_value": "machine_max_feedrate_e",
+                    "maximum_value": "machine_max_feedrate_e if retraction_enable else float('inf')",
                     "maximum_value_warning": "70",
                     "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"",
                     "settable_per_mesh": false,
@@ -2087,7 +2087,7 @@
                             "type": "float",
                             "default_value": 25,
                             "minimum_value": "0.0001",
-                            "maximum_value": "machine_max_feedrate_e",
+                            "maximum_value": "machine_max_feedrate_e if retraction_enable else float('inf')",
                             "minimum_value_warning": "1",
                             "maximum_value_warning": "70",
                             "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"",
@@ -2103,7 +2103,7 @@
                             "type": "float",
                             "default_value": 25,
                             "minimum_value": "0.0001",
-                            "maximum_value": "machine_max_feedrate_e",
+                            "maximum_value": "machine_max_feedrate_e if retraction_enable else float('inf')",
                             "minimum_value_warning": "1",
                             "maximum_value_warning": "70",
                             "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"",
@@ -2204,7 +2204,7 @@
                     "default_value": 20,
                     "minimum_value": "0.1",
                     "minimum_value_warning": "1",
-                    "maximum_value": "machine_max_feedrate_e",
+                    "maximum_value": "machine_max_feedrate_e if retraction_enable else float('inf')",
                     "maximum_value_warning": "70",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
@@ -2221,7 +2221,7 @@
                             "value": "switch_extruder_retraction_speeds",
                             "minimum_value": "0.1",
                             "minimum_value_warning": "1",
-                            "maximum_value": "machine_max_feedrate_e",
+                            "maximum_value": "machine_max_feedrate_e if retraction_enable else float('inf')",
                             "maximum_value_warning": "70",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
@@ -2237,7 +2237,7 @@
                             "value": "switch_extruder_retraction_speeds",
                             "minimum_value": "0.1",
                             "minimum_value_warning": "1",
-                            "maximum_value": "machine_max_feedrate_e",
+                            "maximum_value": "machine_max_feedrate_e if retraction_enable else float('inf')",
                             "maximum_value_warning": "70",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true