Merge branch 'mb-more-z-seam-options' of https://github.com/smartavionics/Cura

This commit is contained in:
Jaime van Kessel 2017-09-01 13:22:13 +02:00
commit 2b54d75453

View file

@ -1228,7 +1228,8 @@
{
"back": "User Specified",
"shortest": "Shortest",
"random": "Random"
"random": "Random",
"sharpest_corner": "Sharpest Corner"
},
"default_value": "shortest",
"limit_to_extruder": "wall_0_extruder_nr",
@ -1258,6 +1259,23 @@
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"z_seam_corner":
{
"label": "Seam Corner Preference",
"description": "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner.",
"type": "enum",
"options":
{
"z_seam_corner_none": "None",
"z_seam_corner_inner": "Hide Seam",
"z_seam_corner_outer": "Expose Seam",
"z_seam_corner_any": "Hide or Expose Seam"
},
"default_value": "z_seam_corner_inner",
"enabled": "z_seam_type != 'random'",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"z_seam_relative":
{
"label": "Z Seam Relative",