GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 10:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.8' into CURA-11967_fix_material_print_temp_prepend_not_being_disabled

Browse Source
This commit is contained in:
Erwan MATHIEU 2024-07-09 15:41:49 +02:00 committed by GitHub
commit 716fe44916
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/definitions/Mark2_for_Ultimaker2.def.json
View File

@ -67,13 +67,13 @@
"layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
"layer_start_x": "layer_start_x":
{ {
"value": 105.0, "enabled": false,
"enabled": false "value": 105.0
}, },
"layer_start_y": "layer_start_y":
{ {
"value": 27.0, "enabled": false,
"enabled": false "value": 27.0
}, },
"line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
"machine_acceleration": { "default_value": 3000 }, "machine_acceleration": { "default_value": 3000 },

8
resources/definitions/dxu.def.json
View File

@ -52,13 +52,13 @@
"layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
"layer_start_x": "layer_start_x":
{ {
"value": 180.0, "enabled": false,
"enabled": false "value": 180.0
}, },
"layer_start_y": "layer_start_y":
{ {
"value": 160.0, "enabled": false,
"enabled": false "value": 160.0
}, },
"line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
"machine_acceleration": { "default_value": 3000 }, "machine_acceleration": { "default_value": 3000 },

4
resources/definitions/fdmprinter.def.json
View File

@ -1347,7 +1347,7 @@
"label": "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.)", "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", "type": "bool",
"default_value": true, "default_value": false,
"settable_per_mesh": true, "settable_per_mesh": true,
"enabled": "z_seam_type == 'back' or z_seam_type == 'shortest'" "enabled": "z_seam_type == 'back' or z_seam_type == 'shortest'"
}, },
@ -8275,7 +8275,7 @@
"minimum_value_warning": "2", "minimum_value_warning": "2",
"maximum_value": "90", "maximum_value": "90",
"default_value": 90, "default_value": 90,
"value": "wall_overhang_angle", "value": "support_angle",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"wall_overhang_speed_factor": "wall_overhang_speed_factor":