Skip to content

Commit

Permalink
Merge branch '5.8' into CURA-11967_fix_material_print_temp_prepend_no…
Browse files Browse the repository at this point in the history
…t_being_disabled
  • Loading branch information
wawanbreton authored Jul 9, 2024
2 parents 8e32672 + 8f69b3a commit 716fe44
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions resources/definitions/Mark2_for_Ultimaker2.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@
"layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
"layer_start_x":
{
"value": 105.0,
"enabled": false
"enabled": false,
"value": 105.0
},
"layer_start_y":
{
"value": 27.0,
"enabled": false
"enabled": false,
"value": 27.0
},
"line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
"machine_acceleration": { "default_value": 3000 },
Expand Down
8 changes: 4 additions & 4 deletions resources/definitions/dxu.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
"layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
"layer_start_x":
{
"value": 180.0,
"enabled": false
"enabled": false,
"value": 180.0
},
"layer_start_y":
{
"value": 160.0,
"enabled": false
"enabled": false,
"value": 160.0
},
"line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
"machine_acceleration": { "default_value": 3000 },
Expand Down
4 changes: 2 additions & 2 deletions resources/definitions/fdmprinter.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@
"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,
"default_value": false,
"settable_per_mesh": true,
"enabled": "z_seam_type == 'back' or z_seam_type == 'shortest'"
},
Expand Down Expand Up @@ -8275,7 +8275,7 @@
"minimum_value_warning": "2",
"maximum_value": "90",
"default_value": 90,
"value": "wall_overhang_angle",
"value": "support_angle",
"settable_per_mesh": true
},
"wall_overhang_speed_factor":
Expand Down

0 comments on commit 716fe44

Please sign in to comment.