diff --git a/resources/settings/dual_extrusion_printer.json b/resources/settings/dual_extrusion_printer.json index 64e9060c76..1b034ccd76 100644 --- a/resources/settings/dual_extrusion_printer.json +++ b/resources/settings/dual_extrusion_printer.json @@ -4,7 +4,15 @@ "inherits": "fdmprinter.json", "machine_settings": { - "extruder_nr": { "default": 0 }, + "extruder_nr": { + "label": "Extruder", + "description": "The extruder train used for printing. This is used in multi-extrusion.", + "type": "int", + "default": 0, + "min_value": 0, + "max_value": 16, + "inherit_function": "extruder_nr" + }, "machine_use_extruder_offset_to_offset_coords": { "default": false }, diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index 6aae7644b5..6a91a43eab 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -306,7 +306,7 @@ "default": 6, "type": "int", "visible": false, - "inherit_function": "math.ceil(parent_value / layer_height)" + "inherit_function": "0 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" } } }, @@ -326,7 +326,7 @@ "default": 6, "type": "int", "visible": false, - "inherit_function": "math.ceil(parent_value / layer_height)" + "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" } } } @@ -418,6 +418,18 @@ "type": "float", "default": 0, "visible": false + }, + "z_seam_type": { + "label": "Z Seam Alignment", + "description": "Starting point of each part in a layer. When parts in consecutive layers start at the same point a vertical seam may show on the print. When aligning these at the back, the seam is easiest to remove. When placed randomly the inaccuracies at the part start will be less noticable. When taking the shortest path the print will be more quick.", + "type": "enum", + "options": [ + "Back", + "Shortest", + "Random" + ], + "default": "Shortest", + "visible": false } } }, diff --git a/resources/settings/ultimaker2.json b/resources/settings/ultimaker2.json index 598a9327c1..30814fe859 100644 --- a/resources/settings/ultimaker2.json +++ b/resources/settings/ultimaker2.json @@ -13,15 +13,6 @@ "machine_extruder_trains": [ { - "extruder_nr": { - "label": "Extruder", - "description": "The extruder train used for printing. This is used in multi-extrusion.", - "type": "int", - "default": 0, - "min_value": 0, - "max_value": 16, - "inherit_function": "extruder_nr" - }, "machine_nozzle_size": { "default": 0.4 }, diff --git a/resources/settings/ultimaker_original.json b/resources/settings/ultimaker_original.json index 9b34404c54..555c7e7363 100644 --- a/resources/settings/ultimaker_original.json +++ b/resources/settings/ultimaker_original.json @@ -18,15 +18,6 @@ "machine_extruder_trains": [ { - "extruder_nr": { - "label": "Extruder", - "description": "The extruder train used for printing. This is used in multi-extrusion.", - "type": "int", - "default": 0, - "min_value": 0, - "max_value": 16, - "inherit_function": "extruder_nr" - }, "machine_nozzle_size": { "default": 0.4 },