Merge remote-tracking branch 'origin/main' into smaller-prime-tower

This commit is contained in:
Erwan MATHIEU 2024-06-19 15:15:37 +02:00
commit 44c23dd612
3 changed files with 11 additions and 1 deletions

View File

@ -93,7 +93,7 @@ jobs:
enterprise: ${{ github.event.inputs.enterprise == 'true' }} enterprise: ${{ github.event.inputs.enterprise == 'true' }}
staging: ${{ github.event.inputs.staging == 'true' }} staging: ${{ github.event.inputs.staging == 'true' }}
architecture: X64 architecture: X64
operating_system: ubuntu-22.04 operating_system: self-hosted-Ubuntu22-X64
secrets: inherit secrets: inherit
macos-installer: macos-installer:

View File

@ -1342,6 +1342,15 @@
"limit_to_extruder": "wall_0_extruder_nr", "limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"z_seam_on_vertex":
{
"label": "Z Seam On Vertex",
"description": "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)",
"type": "bool",
"default_value": true,
"settable_per_mesh": true,
"enabled": "z_seam_type == 'back' or z_seam_type == 'shortest'"
},
"z_seam_position": "z_seam_position":
{ {
"label": "Z Seam Position", "label": "Z Seam Position",

View File

@ -41,6 +41,7 @@ xy_offset_layer_0
hole_xy_offset hole_xy_offset
hole_xy_offset_max_diameter hole_xy_offset_max_diameter
z_seam_type z_seam_type
z_seam_on_vertex
z_seam_position z_seam_position
z_seam_x z_seam_x
z_seam_y z_seam_y