Merge remote-tracking branch 'upstream/master' into mb-improve-overhanging-walls

2025-11-02 20:52:20 -07:00 · 2018-07-26 21:07:17 +01:00 · 2018-07-26 21:07:17 +01:00 · aa8535f374
commit aa8535f374
parent 9e0b79469b e509078943
328 changed files with 2585 additions and 1226 deletions
--- a/resources/definitions/101Hero.def.json
+++ b/resources/definitions/101Hero.def.json
@ -24,7 +24,6 @@
        "machine_depth": { "default_value": 149.86 },
        "machine_height": { "default_value": 99.822 },
        "machine_center_is_zero": { "default_value": true },
-        "machine_nozzle_size": { "default_value": 0.4 },
        "machine_head_with_fans_polygon": {
            "default_value": [
                [ 0, 0 ],
--- a/resources/definitions/3dator.def.json
+++ b/resources/definitions/3dator.def.json
@ -18,7 +18,6 @@

    "overrides": {
        "machine_name": { "default_value": "3Dator" },
-        "machine_nozzle_size": { "default_value": 0.5 },
        "speed_travel": { "default_value": 120 },
        "prime_tower_size": { "default_value": 8.660254037844387 },
        "infill_sparse_density": { "default_value": 20 },
--- a/resources/definitions/alya3dp.def.json
+++ b/resources/definitions/alya3dp.def.json
@ -26,9 +26,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_polygon": {
            "default_value": [
                [75, 18],
--- a/resources/definitions/anycubic_i3_mega.def.json
+++ b/resources/definitions/anycubic_i3_mega.def.json
@ -45,10 +45,6 @@
        {
            "default_value": false
        },
-        "machine_nozzle_size":
-        {
-            "default_value": 0.4
-        },
        "gantry_height":
        {
            "default_value": 0
--- a/resources/definitions/bfb.def.json
+++ b/resources/definitions/bfb.def.json
@ -21,7 +21,6 @@
        "prime_tower_size": { "default_value": 7.745966692414834 },
        "machine_name": { "default_value": "BFB_Test" },
        "machine_heated_bed": { "default_value": false },
-        "machine_nozzle_size": { "default_value": 0.5 },
        "speed_layer_0": { "default_value": 25 },
        "machine_width": { "default_value": 275 },
        "machine_gcode_flavor": { "default_value": "BFB" },
--- a/resources/definitions/builder_premium_large.def.json
+++ b/resources/definitions/builder_premium_large.def.json
@ -54,7 +54,6 @@
        "prime_tower_position_y": { "default_value": 178 },
        "prime_tower_wipe_enabled": { "default_value": false },
        "prime_tower_min_volume": { "default_value": 50 },
-        "dual_pre_wipe": { "default_value": false },

        "prime_blob_enable": { "enabled": true },

--- a/resources/definitions/builder_premium_medium.def.json
+++ b/resources/definitions/builder_premium_medium.def.json
@ -54,7 +54,6 @@
        "prime_tower_position_y": { "default_value": 178 },
        "prime_tower_wipe_enabled": { "default_value": false },
        "prime_tower_min_volume": { "default_value": 50 },
-        "dual_pre_wipe": { "default_value": false },

        "prime_blob_enable": { "enabled": true },

--- a/resources/definitions/builder_premium_small.def.json
+++ b/resources/definitions/builder_premium_small.def.json
@ -53,7 +53,6 @@
        "prime_tower_position_y": { "default_value": 178 },
        "prime_tower_wipe_enabled": { "default_value": false },
        "prime_tower_min_volume": { "default_value": 50 },
-        "dual_pre_wipe": { "default_value": false },

        "prime_blob_enable": { "enabled": true },

--- a/resources/definitions/cartesio.def.json
+++ b/resources/definitions/cartesio.def.json
@ -15,7 +15,7 @@
        "has_variants": true,

        "variants_name": "Tool",
-        "preferred_variant_name": "0.8 mm",
+        "preferred_variant_name": "0.8mm thermoplastic extruder",
        "preferred_material": "generic_pla",
        "preferred_quality_type": "normal",

@ -44,7 +44,7 @@
        "material_print_temp_wait": { "default_value": false },
        "material_bed_temp_wait": { "default_value": false },
        "prime_tower_enable": { "default_value": false },
-        "prime_tower_wall_thickness": { "resolve": 0.7 },
+        "prime_tower_min_volume": { "value": "0.7" },
        "prime_tower_size": { "value": 24.0 },
        "prime_tower_position_x": { "value": 125 },
        "prime_tower_position_y": { "value": 70 },
--- a/resources/definitions/creality_cr10.def.json
+++ b/resources/definitions/creality_cr10.def.json
@ -31,9 +31,6 @@
                [30, 34]
            ]
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "layer_height_0": {
            "default_value": 0.2
        },
--- a/resources/definitions/custom.def.json
+++ b/resources/definitions/custom.def.json
@ -1,6 +1,6 @@
 {
    "version": 2,
-    "name": "Custom FDM printer",
+    "name": "Custom FFF printer",
    "inherits": "fdmprinter",
    "metadata": {
        "visible": true,
--- a/resources/definitions/dagoma_discoeasy200.def.json
+++ b/resources/definitions/dagoma_discoeasy200.def.json
@ -9,6 +9,8 @@
        "file_formats": "text/x-gcode",
        "platform": "discoeasy200.stl",
        "platform_offset": [ 105, -59, 280],
+        "has_machine_quality": true,
+        "has_materials": true,
        "machine_extruder_trains":
        {
            "0": "dagoma_discoeasy200_extruder_0"
@ -27,37 +29,46 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_with_fans_polygon": {
            "default_value": [
-                [17, 70],
-                [17, -40],
-                [-17, -40],
-                [17, 70]
+                [-17, -70],
+                [-17, 40],
+                [17, 40],
+                [17, -70]
            ]
        },
        "gantry_height": {
            "default_value": 10
        },
        "machine_start_gcode": {
-            "default_value": ";Gcode by Cura\nG90\nM106 S250\nG28 X Y\nG1 X50\nM109 S180\nG28\nM104 S{material_print_temperature_layer_0}\nG29\nM107\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E10\nG92 E0\nG1 Z3\nG1 F6000\n"
+            "default_value": ";Gcode by Cura\nG90\nM106 S255\nG28 X Y\nG1 X50\nM109 R90\nG28\nM104 S{material_print_temperature_layer_0}\nG29\nM107\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E10\nG92 E0\nG1 Z3\nG1 F6000\n"
        },
        "machine_end_gcode": {
            "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 F3000\nG90\nG28 X Y\nM107\nM84\n"
        },
+        "default_material_print_temperature": {
+            "default_value": 205
+        },
        "speed_print": {
            "default_value": 60
        },
        "speed_travel": {
-            "value": "100"
+            "default_value": 100
        },
        "retraction_amount": {
            "default_value": 3.5
        },
        "retraction_speed": {
            "default_value": 50
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "skirt_line_count": {
+            "default_value": 2
+        },
+        "layer_height_0": {
+            "default_value": 0.26
        }
    }
 }
--- a/resources/definitions/dagoma_neva.def.json
+++ b/resources/definitions/dagoma_neva.def.json
@ -1,5 +1,4 @@
 {
-    "id": "Dagoma_neva",
    "name": "Dagoma NEVA",
    "version": 2,
    "inherits": "fdmprinter",
@ -10,6 +9,8 @@
        "file_formats": "text/x-gcode",
        "platform": "neva.stl",
        "platform_offset": [ 0, 0, 0],
+        "has_machine_quality": true,
+        "has_materials": true,
        "machine_extruder_trains":
        {
            "0": "dagoma_neva_extruder_0"
@ -28,15 +29,12 @@
        "machine_center_is_zero": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_with_fans_polygon": {
            "default_value": [
-                [17, 40],
-                [17, -70],
-                [-17, -70],
-                [17, 40]
+                [-36, -42],
+                [-36, 42],
+                [36, 42],
+                [36, -42]
            ]
        },
        "gantry_height": {
@ -46,14 +44,17 @@
            "default_value": "elliptic"
        },
        "machine_gcode_flavor": {
-            "default_value": "RepRap (RepRap)"
+            "default_value": "RepRap"
        },
        "machine_start_gcode": {
-            "default_value": ";Gcode by Cura\nG90\nG28\nM109 S100\nG29\nM104 S{material_print_temperature_layer_0}\nG0 X0 Y-85\nG0 Z0.26\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n"
+            "default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n"
        },
        "machine_end_gcode": {
            "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n"
        },
+        "default_material_print_temperature": {
+            "default_value": 205
+        },
        "speed_print": {
            "default_value": 40
        },
@ -65,6 +66,15 @@
        },
        "retraction_speed": {
            "default_value": 60
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "skirt_line_count": {
+            "default_value": 2
+        },
+        "layer_height_0": {
+            "default_value": 0.26
        }
    }
 }
--- a/resources/definitions/dagoma_neva_magis.def.json
+++ b/resources/definitions/dagoma_neva_magis.def.json
@ -0,0 +1,80 @@
+{
+    "name": "Dagoma NEVA Magis",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Dagoma",
+        "manufacturer": "Dagoma",
+        "file_formats": "text/x-gcode",
+        "platform": "neva.stl",
+        "platform_offset": [ 0, 0, 0],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "machine_extruder_trains":
+        {
+            "0": "dagoma_neva_magis_extruder_0"
+        }
+    },
+    "overrides": {
+        "machine_width": {
+            "default_value": 195.55
+        },
+        "machine_height": {
+            "default_value": 205
+        },
+        "machine_depth": {
+            "default_value": 195.55
+        },
+        "machine_center_is_zero": {
+            "default_value": true
+        },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [-36, -42],
+                [-36, 42],
+                [36, 42],
+                [36, -42]
+            ]
+        },
+        "gantry_height": {
+          "default_value": 0
+        },
+        "machine_shape": {
+            "default_value": "elliptic"
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap"
+        },
+        "machine_start_gcode": {
+            "default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n"
+        },
+        "default_material_print_temperature": {
+            "default_value": 205
+        },
+        "speed_print": {
+            "default_value": 40
+        },
+        "speed_travel": {
+            "default_value": 120
+        },
+        "retraction_amount": {
+            "default_value": 3.8
+        },
+        "retraction_speed": {
+            "default_value": 60
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "skirt_line_count": {
+            "default_value": 2
+        },
+        "layer_height_0": {
+            "default_value": 0.26
+        }
+    }
+}
--- a/resources/definitions/deltabot.def.json
+++ b/resources/definitions/deltabot.def.json
@ -22,7 +22,6 @@
        "speed_wall_0": { "default_value": 30 },
        "speed_topbottom": { "default_value": 30 },
        "layer_height": { "default_value": 0.2 },
-        "machine_nozzle_size": { "default_value": 0.5 },
        "speed_print": { "default_value": 30 },
        "speed_infill": { "default_value": 30 },
        "machine_extruder_count": { "default_value": 1 },
--- a/resources/definitions/deltacomb.def.json
+++ b/resources/definitions/deltacomb.def.json
@ -23,7 +23,6 @@
        "machine_height":                        { "default_value": 250 },
        "machine_depth":                         { "default_value": 190 },
        "machine_center_is_zero":                { "default_value": true },
-        "machine_nozzle_size":                   { "default_value": 0.4 },
        "machine_gcode_flavor":                  { "default_value": "RepRap (Marlin/Sprinter)" },
        "machine_start_gcode":                   { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."},
        "machine_end_gcode":                     { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" },
@ -35,7 +34,7 @@
        "material_initial_print_temperature":    { "value": "material_print_temperature" },
        "material_print_temperature_layer_0":    { "value": "material_print_temperature + 5" },
        "travel_avoid_distance":                 { "default_value": 1, "value": "1" },
-        "speed_print" :                          { "default_value": 60 },
+        "speed_print" :                          { "default_value": 70 },
        "speed_travel":                          { "value": "150.0" },
        "speed_infill":                          { "value": "round(speed_print * 1.05, 0)" },
        "speed_topbottom":                       { "value": "round(speed_print * 0.95, 0)" },
@ -53,6 +52,9 @@
        "top_bottom_thickness":                  { "default_value": 0.6 },
        "support_z_distance":                    { "value": "layer_height * 2" },
        "support_bottom_distance":               { "value": "layer_height" },
-        "support_use_towers" :                   { "default_value": false }
+        "support_use_towers" :                   { "default_value": false },
+        "jerk_wall_0" :                          { "value": "30" },
+        "jerk_travel" :                          { "default_value": 20 },
+        "acceleration_travel" :                  { "value": 10000 }
    }
 }
--- a/resources/definitions/easyarts_ares.def.json
+++ b/resources/definitions/easyarts_ares.def.json
@ -52,9 +52,6 @@
        "bottom_thickness": {
            "default_value": 1
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "speed_print": {
            "default_value": 75
        },
--- a/resources/definitions/fabtotum.def.json
+++ b/resources/definitions/fabtotum.def.json
@ -35,7 +35,6 @@
        "machine_depth": { "default_value": 234 },
        "machine_center_is_zero": { "default_value": false },
        "machine_heated_bed": {	"default_value": true },
-        "machine_nozzle_size": { "default_value": 0.4 },
        "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [-75, -18], [18, 35], [18, -18]] },
        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
        "machine_max_feedrate_x": { "default_value": 250 },
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@ -1074,7 +1074,7 @@
                    "maximum_value_warning": "top_layers - 1",
                    "type": "int",
                    "value": "0",
-                    "limit_to_extruder": "roofing_extruder_nr",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                    "settable_per_mesh": true,
                    "enabled": "top_layers > 0"
                },
@ -1196,6 +1196,16 @@
                    "limit_to_extruder": "top_bottom_extruder_nr",
                    "settable_per_mesh": true
                },
+                "connect_skin_polygons":
+                {
+                    "label": "Connect Top/Bottom Polygons",
+                    "description": "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "top_bottom_pattern == 'concentric'",
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
                "skin_angles":
                {
                    "label": "Top/Bottom Line Directions",
@ -1644,7 +1654,18 @@
                    "type": "bool",
                    "default_value": false,
                    "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'",
-                    "enabled": "infill_pattern == 'grid' or infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'cross' or infill_pattern == 'cross_3d'",
+                    "enabled": "infill_pattern == 'lines' or infill_pattern == 'grid' or infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'cross' or infill_pattern == 'cross_3d'",
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
+                "connect_infill_polygons":
+                {
+                    "label": "Connect Infill Polygons",
+                    "description": "Connect infill paths where they run next to each other. For infill patterns which consist of several closed polygons, enabling this setting greatly reduces the travel time.",
+                    "type": "bool",
+                    "default_value": true,
+                    "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_multiplier % 2 == 0",
+                    "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_multiplier % 2 == 0",
                    "limit_to_extruder": "infill_extruder_nr",
                    "settable_per_mesh": true
                },
@ -1680,6 +1701,18 @@
                    "limit_to_extruder": "infill_extruder_nr",
                    "settable_per_mesh": true
                },
+                "infill_multiplier":
+                {
+                    "label": "Infill Line Multiplier",
+                    "description": "Convert each infill line to this many lines. The extra lines do not cross over each other, but avoid each other. This makes the infill stiffer, but increases print time and material usage.",
+                    "default_value": 1,
+                    "type": "int",
+                    "minimum_value": "1",
+                    "maximum_value_warning": "infill_line_distance / infill_line_width",
+                    "enabled": "infill_sparse_density > 0 and not spaghetti_infill_enabled and infill_pattern != 'zigzag'",
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
                "sub_div_rad_add":
                {
                    "label": "Cubic Subdivision Shell",
@ -4247,6 +4280,27 @@
                        }
                    }
                },
+                "support_fan_enable":
+                {
+                    "label": "Fan Speed Override",
+                    "description": "When enabled, the print cooling fan speed is altered for the skin regions immediately above the support.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "support_enable",
+                    "settable_per_mesh": false
+                },
+                "support_supported_skin_fan_speed":
+                {
+                    "label": "Supported Skin Fan Speed",
+                    "description": "Percentage fan speed to use when printing the skin regions immediately above the support. Using a high fan speed can make the support easier to remove.",
+                    "unit": "%",
+                    "minimum_value": "0",
+                    "maximum_value": "100",
+                    "default_value": 100,
+                    "type": "float",
+                    "enabled": "support_enable and support_fan_enable",
+                    "settable_per_mesh": false
+                },
                "support_use_towers":
                {
                    "label": "Use Towers",
@ -4992,32 +5046,12 @@
                    "description": "The minimum volume for each layer of the prime tower in order to purge enough material.",
                    "unit": "mm³",
                    "type": "float",
-                    "default_value": 10,
-                    "value": "8.48 if prime_tower_circular else 10",
+                    "default_value": 5,
                    "minimum_value": "0",
-                    "maximum_value_warning": "round((resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height'), 2) if prime_tower_circular else resolveOrValue('prime_tower_size') ** 2 * resolveOrValue('layer_height')",
+                    "maximum_value_warning": "((resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height') if prime_tower_circular else resolveOrValue('prime_tower_size') ** 2 * resolveOrValue('layer_height')) - sum(extruderValues('prime_tower_min_volume')) + prime_tower_min_volume",
                    "enabled": "resolveOrValue('prime_tower_enable')",
                    "settable_per_mesh": false,
-                    "settable_per_extruder": true,
-                    "children":
-                    {
-                        "prime_tower_wall_thickness":
-                        {
-                            "label": "Prime Tower Thickness",
-                            "description": "The thickness of the hollow prime tower. A thickness larger than half the Prime Tower Minimum Volume will result in a dense prime tower.",
-                            "unit": "mm",
-                            "type": "float",
-                            "default_value": 2,
-                            "value": "round(max(2 * prime_tower_line_width, (0.5 * (prime_tower_size - math.sqrt(max(0, prime_tower_size ** 2 - 4 * prime_tower_min_volume / (3.14159 * layer_height))))) if prime_tower_circular else (0.5 * (prime_tower_size - math.sqrt(max(0, prime_tower_size ** 2 - prime_tower_min_volume / layer_height))))), 3)",
-                            "resolve": "max(extruderValues('prime_tower_wall_thickness'))",
-                            "minimum_value": "0.001",
-                            "minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width')) - 0.0001",
-                            "maximum_value_warning": "prime_tower_size / 2",
-                            "enabled": "prime_tower_enable",
-                            "settable_per_mesh": false,
-                            "settable_per_extruder": false
-                        }
-                    }
+                    "settable_per_extruder": true
                },
                "prime_tower_position_x":
                {
@ -5072,29 +5106,6 @@
                    "settable_per_mesh": false,
                    "settable_per_extruder": true
                },
-                "dual_pre_wipe":
-                {
-                    "label": "Wipe Nozzle After Switch",
-                    "description": "After switching extruder, wipe the oozed material off of the nozzle on the first thing printed. This performs a safe slow wipe move at a place where the oozed material causes least harm to the surface quality of your print.",
-                    "type": "bool",
-                    "enabled": "resolveOrValue('prime_tower_enable')",
-                    "default_value": true,
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true
-                },
-                "prime_tower_purge_volume":
-                {
-                    "label": "Prime Tower Purge Volume",
-                    "description": "Amount of filament to be purged when wiping on the prime tower. Purging is useful for compensating the filament lost by oozing during inactivity of the nozzle.",
-                    "type": "float",
-                    "enabled": "resolveOrValue('prime_tower_enable') and dual_pre_wipe",
-                    "unit": "mm³",
-                    "default_value": 0,
-                    "minimum_value": "0",
-                    "maximum_value_warning": "2.5",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true
-                },
                "ooze_shield_enabled":
                {
                    "label": "Enable Ooze Shield",
@ -5195,6 +5206,7 @@
                    "type": "bool",
                    "default_value": true,
                    "value": "extruders_enabled_count > 1",
+                    "enabled": "all(p != 'surface' for p in extruderValues('magic_mesh_surface_mode'))",
                    "settable_per_mesh": false,
                    "settable_per_extruder": false,
                    "settable_per_meshgroup": true
@ -5205,7 +5217,7 @@
                    "description": "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes.",
                    "type": "bool",
                    "default_value": true,
-                    "enabled": "carve_multiple_volumes",
+                    "enabled": "carve_multiple_volumes and all(p != 'surface' for p in extruderValues('magic_mesh_surface_mode'))",
                    "settable_per_mesh": false,
                    "settable_per_extruder": false,
                    "settable_per_meshgroup": true
--- a/resources/definitions/felixtec4dual.def.json
+++ b/resources/definitions/felixtec4dual.def.json
@ -44,7 +44,6 @@
        "retraction_amount": { "default_value": 1 },
        "retraction_speed": { "default_value": 50},
        "material_flow": { "default_value": 87 },
-        "machine_nozzle_size": { "default_value": 0.35 },
        "adhesion_type": { "default_value": "skirt" },
        "skirt_brim_minimal_length": { "default_value": 130},

--- a/resources/definitions/gmax15plus.def.json
+++ b/resources/definitions/gmax15plus.def.json
@ -27,7 +27,6 @@
        "machine_depth": { "default_value": 406 },
        "machine_height": { "default_value": 533 },
        "machine_center_is_zero": { "default_value": false },
-        "machine_nozzle_size": { "default_value": 0.5 },
        "layer_height": { "default_value": 0.2 },
        "layer_height_0": { "default_value": 0.3 },
        "retraction_amount": { "default_value": 1 },
--- a/resources/definitions/gmax15plus_dual.def.json
+++ b/resources/definitions/gmax15plus_dual.def.json
@ -28,7 +28,6 @@
        "machine_depth": { "default_value": 406 },
        "machine_height": { "default_value": 533 },
        "machine_center_is_zero": { "default_value": false },
-        "machine_nozzle_size": { "default_value": 0.5 },
        "layer_height": { "default_value": 0.2 },
        "layer_height_0": { "default_value": 0.3 },
        "retraction_amount": { "default_value": 1 },
--- a/resources/definitions/grr_neo.def.json
+++ b/resources/definitions/grr_neo.def.json
@ -29,9 +29,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.5
-        },
        "machine_head_polygon": {
            "default_value": [
                [-75, -18],
--- a/resources/definitions/imade3d_jellybox.def.json
+++ b/resources/definitions/imade3d_jellybox.def.json
@ -26,7 +26,6 @@
        "machine_width": { "default_value": 170 },
        "machine_height": { "default_value": 145 },
        "machine_depth": { "default_value": 160 },
-        "machine_nozzle_size": { "default_value": 0.4 },
        "machine_heated_bed": { "default_value": true },
        "machine_center_is_zero": { "default_value": false },
        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
--- a/resources/definitions/innovo_inventor.def.json
+++ b/resources/definitions/innovo_inventor.def.json
@ -32,9 +32,6 @@
        "machine_center_is_zero": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_polygon": {
            "default_value": [
                [-43.7, -19.2],
--- a/resources/definitions/kemiq_q2_beta.def.json
+++ b/resources/definitions/kemiq_q2_beta.def.json
@ -34,9 +34,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_nozzle_heat_up_speed": {
            "default_value": 2
        },
--- a/resources/definitions/kemiq_q2_gama.def.json
+++ b/resources/definitions/kemiq_q2_gama.def.json
@ -35,9 +35,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_nozzle_heat_up_speed": {
            "default_value": 2
        },
--- a/resources/definitions/kossel_mini.def.json
+++ b/resources/definitions/kossel_mini.def.json
@ -32,9 +32,6 @@
        "machine_center_is_zero": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_gcode_flavor": {
            "default_value": "RepRap (Marlin/Sprinter)"
        },
--- a/resources/definitions/kossel_pro.def.json
+++ b/resources/definitions/kossel_pro.def.json
@ -31,9 +31,6 @@
        "machine_center_is_zero": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.35
-        },
        "machine_gcode_flavor": {
            "default_value": "RepRap (Marlin/Sprinter)"
        },
--- a/resources/definitions/makeR_pegasus.def.json
+++ b/resources/definitions/makeR_pegasus.def.json
@ -33,9 +33,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_polygon": {
            "default_value": [
                [-75, -18],
--- a/resources/definitions/makeR_prusa_tairona_i3.def.json
+++ b/resources/definitions/makeR_prusa_tairona_i3.def.json
@ -33,9 +33,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_polygon": {
            "default_value": [
                [-75, -18],
--- a/resources/definitions/makeit_pro_l.def.json
+++ b/resources/definitions/makeit_pro_l.def.json
@ -30,9 +30,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_with_fans_polygon":
        {
            "default_value": [
--- a/resources/definitions/makeit_pro_m.def.json
+++ b/resources/definitions/makeit_pro_m.def.json
@ -30,9 +30,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_with_fans_polygon":
        {
            "default_value": [
--- a/resources/definitions/maker_starter.def.json
+++ b/resources/definitions/maker_starter.def.json
@ -33,9 +33,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "gantry_height": {
            "default_value": 55
        },
--- a/resources/definitions/malyan_m180.def.json
+++ b/resources/definitions/malyan_m180.def.json
@ -29,9 +29,6 @@
        "machine_center_is_zero": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_with_fans_polygon": {
            "default_value": [
                [ -75, 35 ],
--- a/resources/definitions/malyan_m200.def.json
+++ b/resources/definitions/malyan_m200.def.json
@ -9,6 +9,7 @@
        "category": "Other",
        "file_formats": "text/x-gcode",
        "platform": "malyan_m200_platform.stl",
+        "platform_offset": [0, -0.25, 0],
        "has_machine_quality": true,
        "has_materials": true,
        "preferred_quality_type": "normal",
@ -60,10 +61,6 @@
        "machine_height": { "default_value": 120 },
        "machine_heated_bed": { "default_value": true },
        "machine_center_is_zero": { "default_value": false },
-        "machine_nozzle_size": {
-            "default_value": 0.4,
-            "minimum_value": 0.15
-        },
        "machine_max_feedrate_x": { "default_value": 150 },
        "machine_max_feedrate_y": { "default_value": 150 },
        "machine_max_feedrate_z": { "default_value": 1.5 },
--- a/resources/definitions/mankati_fullscale_xt_plus.def.json
+++ b/resources/definitions/mankati_fullscale_xt_plus.def.json
@ -20,7 +20,6 @@
        "machine_height": { "default_value": 300 },
        "machine_heated_bed": { "default_value": true },

-        "machine_nozzle_size": { "default_value": 0.4 },
        "machine_head_with_fans_polygon": {
            "default_value": [
                [ -3,  3 ],
--- a/resources/definitions/mendel90.def.json
+++ b/resources/definitions/mendel90.def.json
@ -70,9 +70,6 @@
        "gantry_height": {
            "default_value": 55
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_with_fans_polygon":
        {
            "default_value": [
--- a/resources/definitions/monoprice_select_mini_v2.def.json
+++ b/resources/definitions/monoprice_select_mini_v2.def.json
@ -20,6 +20,10 @@

    "overrides": {
        "machine_name": { "default_value": "Monoprice Select Mini V2" },
+        "machine_end_gcode":
+        {
+            "default_value": "G0 X0 Y120;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)"
+        },
        "adhesion_type": { "default_value": "brim" },
        "retraction_combing": { "default_value": "noskin" },
        "retraction_amount" : { "default_value": 2.5},
--- a/resources/definitions/ord.def.json
+++ b/resources/definitions/ord.def.json
@ -24,7 +24,6 @@
        "infill_sparse_density": { "default_value": 15 },
        "speed_travel": { "default_value": 150 },
        "layer_height": { "default_value": 0.3 },
-        "machine_nozzle_size": { "default_value": 0.35 },
        "material_print_temperature": { "default_value": 240 },
        "machine_extruder_count": { "default_value": 5 },
        "machine_heated_bed": { "default_value": true },
--- a/resources/definitions/peopoly_moai.def.json
+++ b/resources/definitions/peopoly_moai.def.json
@ -28,9 +28,6 @@
        "machine_depth": {
            "default_value": 130
        },
-        "machine_nozzle_size": {
-            "default_value": 0.067
-        },
        "machine_head_with_fans_polygon":
        {
            "default_value": [
--- a/resources/definitions/printrbot_play.def.json
+++ b/resources/definitions/printrbot_play.def.json
@ -21,7 +21,6 @@
        "machine_depth": { "default_value": 100 },
        "machine_height": { "default_value": 130 },
        "machine_center_is_zero": { "default_value": false },
-        "machine_nozzle_size": { "default_value": 0.4 },
        "layer_height": { "default_value": 0.2 },
        "layer_height_0": { "default_value": 0.3 },
        "retraction_amount": { "default_value": 0.7 },
--- a/resources/definitions/printrbot_simple.def.json
+++ b/resources/definitions/printrbot_simple.def.json
@ -22,7 +22,6 @@
        "machine_height": { "default_value": 150 },
        "machine_depth": { "default_value": 140 },
        "machine_center_is_zero": { "default_value": false },
-        "machine_nozzle_size": { "default_value": 0.4 },
        "machine_head_with_fans_polygon": {
            "default_value": [
                [-49, 20],
--- a/resources/definitions/printrbot_simple_extended.def.json
+++ b/resources/definitions/printrbot_simple_extended.def.json
@ -22,7 +22,6 @@
        "machine_height": { "default_value": 235 },
        "machine_depth": { "default_value": 150 },
        "machine_center_is_zero": { "default_value": false },
-        "machine_nozzle_size": { "default_value": 0.4 },
        "machine_head_with_fans_polygon": {
            "default_value": [
                [ 55, -20 ],
--- a/resources/definitions/printrbot_simple_makers_kit.def.json
+++ b/resources/definitions/printrbot_simple_makers_kit.def.json
@ -19,7 +19,6 @@
        "machine_width": { "default_value": 100 },
        "machine_depth": { "default_value": 100 },
        "machine_height": { "default_value": 115 },
-        "machine_nozzle_size": { "default_value": 0.4 },
        "machine_head_with_fans_polygon": {
            "default_value": [
                [-40, 1000],
--- a/resources/definitions/prusa_i3.def.json
+++ b/resources/definitions/prusa_i3.def.json
@ -32,9 +32,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_polygon": {
            "default_value": [
                [-75, -18],
@ -43,6 +40,14 @@
                [18, -18]
            ]
        },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [-75, -18],
+                [-75, 35],
+                [18, 35],
+                [18, -18]
+            ]
+        },
        "gantry_height": {
            "default_value": 55
        },
--- a/resources/definitions/prusa_i3_mk2.def.json
+++ b/resources/definitions/prusa_i3_mk2.def.json
@ -24,7 +24,6 @@
        "machine_depth": { "default_value": 210 },
        "machine_center_is_zero": { "default_value": false },
        "material_bed_temperature": { "default_value": 55 },
-        "machine_nozzle_size": { "default_value": 0.4 },
        "layer_height": { "default_value": 0.1 },
        "layer_height_0": { "default_value": 0.15 },
        "retraction_amount": { "default_value": 0.8 },
--- a/resources/definitions/prusa_i3_xl.def.json
+++ b/resources/definitions/prusa_i3_xl.def.json
@ -32,9 +32,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_polygon": {
            "default_value": [
                [-75, -18],
--- a/resources/definitions/raise3D_N2_dual.def.json
+++ b/resources/definitions/raise3D_N2_dual.def.json
@ -33,9 +33,6 @@
        "machine_heated_bed": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_nozzle_heat_up_speed": {
            "default_value": 6
        },
--- a/resources/definitions/raise3D_N2_plus_dual.def.json
+++ b/resources/definitions/raise3D_N2_plus_dual.def.json
@ -33,9 +33,6 @@
        "machine_heated_bed": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_nozzle_heat_up_speed": {
            "default_value": 6
        },
--- a/resources/definitions/raise3D_N2_plus_single.def.json
+++ b/resources/definitions/raise3D_N2_plus_single.def.json
@ -32,9 +32,6 @@
        "machine_heated_bed": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_nozzle_heat_up_speed": {
            "default_value": 6
        },
@ -70,7 +67,7 @@
        },
        "machine_start_gcode": {
            "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing…\nM1001\n"
-	},
+        },
        "machine_end_gcode": {
            "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84"
        },
--- a/resources/definitions/raise3D_N2_single.def.json
+++ b/resources/definitions/raise3D_N2_single.def.json
@ -32,9 +32,6 @@
        "machine_heated_bed": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_nozzle_heat_up_speed": {
            "default_value": 6
        },
--- a/resources/definitions/rigid3d_mucit.def.json
+++ b/resources/definitions/rigid3d_mucit.def.json
@ -69,9 +69,6 @@
        "machine_depth": {
            "default_value": 150
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_gcode_flavor": {
            "default_value": "RepRap"
        },
--- a/resources/definitions/rigid3d_zero2.def.json
+++ b/resources/definitions/rigid3d_zero2.def.json
@ -80,9 +80,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "gantry_height": {
            "default_value": 25
        },
--- a/resources/definitions/rigidbot_big.def.json
+++ b/resources/definitions/rigidbot_big.def.json
@ -28,9 +28,6 @@
        "machine_heated_bed": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "gantry_height": {
            "default_value": 0
        },
--- a/resources/definitions/seemecnc_artemis.def.json
+++ b/resources/definitions/seemecnc_artemis.def.json
@ -26,7 +26,6 @@
        "machine_height": { "default_value": 530 },
        "machine_max_feedrate_z": { "default_value": 400 },
        "machine_name": { "default_value": "Artemis" },
-        "machine_nozzle_size": { "default_value": 0.5 },
        "machine_shape": { "default_value": "elliptic" },
        "machine_width": { "default_value": 290 },
        "relative_extrusion": { "default_value": false },
--- a/resources/definitions/seemecnc_v32.def.json
+++ b/resources/definitions/seemecnc_v32.def.json
@ -26,7 +26,6 @@
        "machine_height": { "default_value": 395 },
        "machine_max_feedrate_z": { "default_value": 300 },
        "machine_name": { "default_value": "Rostock Max V3.2" },
-        "machine_nozzle_size": { "default_value": 0.5 },
        "machine_shape": { "default_value": "elliptic" },
        "machine_width": { "default_value": 265 },
        "relative_extrusion": { "default_value": false },
--- a/resources/definitions/tevo_blackwidow.def.json
+++ b/resources/definitions/tevo_blackwidow.def.json
@ -43,10 +43,6 @@
        {
            "default_value": false
        },
-        "machine_nozzle_size":
-        {
-            "default_value": 0.4
-        },
        "gantry_height":
        {
            "default_value": 0
--- a/resources/definitions/tevo_tarantula.def.json
+++ b/resources/definitions/tevo_tarantula.def.json
@ -24,7 +24,6 @@
        "machine_height": { "default_value": 200 },
        "machine_depth": { "default_value": 200 },
        "machine_center_is_zero": { "default_value": false },
-        "machine_nozzle_size": { "default_value": 0.4 },
        "machine_head_polygon":
        {
            "default_value":
--- a/resources/definitions/tevo_tornado.def.json
+++ b/resources/definitions/tevo_tornado.def.json
@ -8,7 +8,10 @@
        "manufacturer": "Tevo",
        "file_formats": "text/x-gcode",
        "icon": "icon_ultimaker2.png",
-        "has_materials": true
+        "has_materials": true,
+        "machine_extruder_trains": {
+            "0": "tevo_tornado_extruder_0"
+        }
    },
    "overrides": {
        "machine_name": { 
@ -34,12 +37,6 @@
                [30, 34]
            ]
        },
-        "material_diameter": {
-            "default_value": 1.75
-        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "top_bottom_thickness": {
            "default_value": 1.2
        },
--- a/resources/definitions/ubuild-3d_mr_bot_280.def.json
+++ b/resources/definitions/ubuild-3d_mr_bot_280.def.json
@ -27,7 +27,6 @@
        "machine_depth": { "default_value": 275 },
        "machine_center_is_zero": { "default_value": false },
        "material_bed_temperature": { "default_value": 70 },
-        "machine_nozzle_size": { "default_value": 0.4 },
        "layer_height_0": { "default_value": 0.1 },
        "retraction_amount": { "default_value": 2 },
        "retraction_speed": { "default_value": 50 },
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@ -54,10 +54,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4,
-            "minimum_value": "0.001"
-        },
        "gantry_height": {
            "default_value": 48
        },
--- a/resources/definitions/ultimaker_original.def.json
+++ b/resources/definitions/ultimaker_original.def.json
@ -35,9 +35,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_with_fans_polygon":
        {
            "default_value": [
--- a/resources/definitions/ultimaker_original_dual.def.json
+++ b/resources/definitions/ultimaker_original_dual.def.json
@ -37,9 +37,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
        "machine_head_with_fans_polygon":
        {
            "default_value": [
--- a/resources/definitions/uni_print_3d.def.json
+++ b/resources/definitions/uni_print_3d.def.json
@ -11,7 +11,10 @@
        "manufacturer": "TheCoolTool",
        "file_formats": "text/x-ngc;text/x-gcode",
        "platform": "uni_print_3d_platform.stl",
-        "platform_offset": [0, 0, 0]
+        "platform_offset": [0, 0, 0],
+        "machine_extruder_trains": {
+            "0": "uni_print_3d_extruder_0"
+        }
    },

    "overrides": {
@ -21,8 +24,6 @@
        "machine_height": { "default_value": 230 },
        "machine_depth": { "default_value": 220 },
        "machine_center_is_zero": { "default_value": true },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 },
        "machine_nozzle_heat_up_speed": { "default_value": 2.0 },
        "machine_nozzle_cool_down_speed": { "default_value": 2.0 },
        "machine_head_shape_min_x": { "default_value": 75 },
--- a/resources/definitions/uniqbot_one.def.json
+++ b/resources/definitions/uniqbot_one.def.json
@ -30,9 +30,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.5
-        },
        "gantry_height": {
            "default_value": 55
        },
--- a/resources/definitions/vertex_delta_k8800.def.json
+++ b/resources/definitions/vertex_delta_k8800.def.json
@ -30,9 +30,6 @@
    "machine_shape": {
      "default_value": "elliptic"
    },
-    "machine_nozzle_size": {
-      "default_value": 0.35
-    },
    "machine_head_shape_min_x": {
      "default_value": 0
    },
--- a/resources/definitions/vertex_k8400.def.json
+++ b/resources/definitions/vertex_k8400.def.json
@ -42,9 +42,6 @@
        "machine_center_is_zero": {
            "default_value": false
        },
-        "machine_nozzle_size": {
-            "default_value": 0.35
-        },
        "machine_head_polygon": {
            "default_value": [
                [-60, -18],
--- a/resources/definitions/vertex_k8400_dual.def.json
+++ b/resources/definitions/vertex_k8400_dual.def.json
@ -43,9 +43,6 @@
        "machine_use_extruder_offset_to_offset_coords": {
            "default_value": true
        },
-        "machine_nozzle_size": {
-            "default_value": 0.35
-        },
        "machine_head_polygon": {
            "default_value": [
                [-60, -18],
--- a/resources/definitions/wanhao_d4s.def.json
+++ b/resources/definitions/wanhao_d4s.def.json
@ -11,6 +11,9 @@
    "has_materials": true,
    "platform": "wanhao_225_145_platform.obj",
    "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_d4s_extruder_0"
+    },
    "platform_offset": [
      0,
      -28,
@ -33,9 +36,6 @@
    "machine_heated_bed": {
      "default_value": true
    },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
    "machine_gcode_flavor": {
      "default_value": "RepRap (Marlin/Sprinter)"
    },
@ -44,9 +44,6 @@
    },
    "machine_end_gcode": {
      "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
    }
  }
 }
--- a/resources/definitions/wanhao_d6.def.json
+++ b/resources/definitions/wanhao_d6.def.json
@ -11,6 +11,9 @@
    "has_materials": true,
    "platform": "wanhao_200_200_platform.obj",
    "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_d6_extruder_0"
+    },
    "platform_offset": [
      0,
      -28,
@ -33,9 +36,6 @@
    "machine_depth": {
      "default_value": 200
    },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
    "machine_heated_bed": {
      "default_value": true
    },
@ -50,9 +50,6 @@
    },
    "machine_end_gcode": {
      "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
    }
  }
 }
--- a/resources/definitions/wanhao_d6_plus.def.json
+++ b/resources/definitions/wanhao_d6_plus.def.json
@ -11,6 +11,9 @@
    "has_materials": true,
    "platform": "wanhao_200_200_platform.obj",
    "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_d6_plus_extruder_0"
+    },
    "platform_offset": [
      0,
      -28,
@ -30,9 +33,6 @@
    "machine_depth": {
      "default_value": 200
    },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
    "machine_heated_bed": {
      "default_value": true
    },
@ -44,9 +44,6 @@
    },
    "machine_end_gcode": {
      "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
    }
  }
 }
--- a/resources/definitions/wanhao_duplicator5S.def.json
+++ b/resources/definitions/wanhao_duplicator5S.def.json
@ -11,6 +11,9 @@
    "has_materials": true,
    "platform": "wanhao_300_200_platform.obj",
    "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_duplicator5S_extruder_0"
+    },
    "platform_offset": [
      0,
      -28,
@ -36,9 +39,6 @@
    "machine_heated_bed": {
      "default_value": false
    },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
    "machine_gcode_flavor": {
      "default_value": "RepRap (Marlin/Sprinter)"
    },
@ -47,9 +47,6 @@
    },
    "machine_end_gcode": {
      "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 3
    }
  }
 }
--- a/resources/definitions/wanhao_duplicator5Smini.def.json
+++ b/resources/definitions/wanhao_duplicator5Smini.def.json
@ -11,6 +11,9 @@
    "has_materials": true,
    "platform": "wanhao_300_200_platform.obj",
    "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_duplicator5Smini_extruder_0"
+    },
    "platform_offset": [
      0,
      -28,
@ -33,9 +36,6 @@
    "machine_heated_bed": {
      "default_value": false
    },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
    "machine_gcode_flavor": {
      "default_value": "RepRap (Marlin/Sprinter)"
    },
@ -44,9 +44,6 @@
    },
    "machine_end_gcode": {
      "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 3
    }
  }
 }
--- a/resources/definitions/wanhao_i3.def.json
+++ b/resources/definitions/wanhao_i3.def.json
@ -11,6 +11,9 @@
    "has_materials": true,
    "platform": "wanhao_200_200_platform.obj",
    "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_i3_extruder_0"
+    },
    "platform_offset": [
      0,
      -28,
@ -33,9 +36,6 @@
    "machine_heated_bed": {
      "default_value": true
    },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
    "machine_gcode_flavor": {
      "default_value": "RepRap (Marlin/Sprinter)"
    },
@ -44,9 +44,6 @@
    },
    "machine_end_gcode": {
      "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
    }
  }
 }
--- a/resources/definitions/wanhao_i3mini.def.json
+++ b/resources/definitions/wanhao_i3mini.def.json
@ -11,6 +11,9 @@
    "has_materials": true,
    "platform": "wanhao_110_110_platform.obj",
    "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_i3mini_extruder_0"
+    },
    "platform_offset": [
      0,
      -15,
@ -33,9 +36,6 @@
    "machine_heated_bed": {
      "default_value": false
    },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
    "machine_gcode_flavor": {
      "default_value": "RepRap (Marlin/Sprinter)"
    },
@ -44,9 +44,6 @@
    },
    "machine_end_gcode": {
      "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
    }
  }
 }
--- a/resources/definitions/wanhao_i3plus.def.json
+++ b/resources/definitions/wanhao_i3plus.def.json
@ -11,6 +11,9 @@
    "has_materials": true,
    "platform": "wanhao_200_200_platform.obj",
    "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_i3plus_extruder_0"
+    },
    "platform_offset": [
      0,
      -28,
@ -33,9 +36,6 @@
    "machine_heated_bed": {
      "default_value": true
    },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
    "machine_gcode_flavor": {
      "default_value": "RepRap (Marlin/Sprinter)"
    },
@ -44,9 +44,6 @@
    },
    "machine_end_gcode": {
      "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
    }
  }
 }