3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Jaime van Kessel 2015-08-24 13:27:20 +02:00
commit b587be273f
4 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/settings/dual_extrusion_printer.json
View file

@ -4,7 +4,15 @@
"inherits": "fdmprinter.json", "inherits": "fdmprinter.json",
"machine_settings": { "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 }, "machine_use_extruder_offset_to_offset_coords": { "default": false },

16
resources/settings/fdmprinter.json
View file

@ -306,7 +306,7 @@
"default": 6, "default": 6,
"type": "int", "type": "int",
"visible": false, "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, "default": 6,
"type": "int", "type": "int",
"visible": false, "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", "type": "float",
"default": 0, "default": 0,
"visible": false "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
} }
} }
}, },

9
resources/settings/ultimaker2.json
View file

@ -13,15 +13,6 @@
"machine_extruder_trains": [ "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": { "machine_nozzle_size": {
"default": 0.4 "default": 0.4
}, },

9
resources/settings/ultimaker_original.json
View file

@ -18,15 +18,6 @@
"machine_extruder_trains": [ "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": { "machine_nozzle_size": {
"default": 0.4 "default": 0.4
}, },