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

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

Browse Source
This commit is contained in:
Ian Paschal 2018-03-02 17:06:01 +01:00
commit 3fe8709fd8
8 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,6 @@
"raft_margin": { "value": "10" }, "raft_margin": { "value": "10" },
"raft_surface_layers": { "value": "1" }, "raft_surface_layers": { "value": "1" },
"retraction_amount": { "value": "2" }, "retraction_amount": { "value": "2" },
"retraction_combing": { "default_value": "noskin" },
"retraction_count_max": { "value": "10" }, "retraction_count_max": { "value": "10" },
"retraction_extrusion_window": { "value": "1" }, "retraction_extrusion_window": { "value": "1" },
"retraction_hop": { "value": "2" }, "retraction_hop": { "value": "2" },
@ -154,6 +153,7 @@
"travel_avoid_distance": { "value": "3" }, "travel_avoid_distance": { "value": "3" },
"wall_0_inset": { "value": "0" }, "wall_0_inset": { "value": "0" },
"wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" }, "wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" },
"wall_thickness": { "value": "1" } "wall_thickness": { "value": "1" },
"zig_zaggify_infill": { "value": "True" }
} }
} }

10
resources/qml/Actions.qml
View File

@ -236,6 +236,16 @@ Item
onTriggered: CuraActions.deleteSelection(); onTriggered: CuraActions.deleteSelection();
} }
Action //Also add backspace as the same function as delete because on Macintosh keyboards the button called "delete" is actually a backspace, and the user expects it to function as a delete.
{
id: backspaceSelectionAction
text: catalog.i18ncp("@action:inmenu menubar:edit", "Delete &Selected Model", "Delete &Selected Models", UM.Selection.selectionCount)
enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection
iconName: "edit-delete"
shortcut: StandardKey.Backspace
onTriggered: CuraActions.deleteSelection()
}
Action Action
{ {
id: centerSelectionAction; id: centerSelectionAction;

2
resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
View File

@ -44,7 +44,7 @@ retraction_extrusion_window = 1
retraction_hop = 1.5 retraction_hop = 1.5
retraction_hop_enabled = True retraction_hop_enabled = True
retraction_hop_only_when_collides = True retraction_hop_only_when_collides = True
retraction_min_travel = 0.8 retraction_min_travel = =line_width * 2
retraction_prime_speed = 15 retraction_prime_speed = 15
skin_overlap = 5 skin_overlap = 5
speed_equalize_flow_enabled = True speed_equalize_flow_enabled = True

2
resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
View File

@ -45,7 +45,7 @@ retraction_extrusion_window = 1
retraction_hop = 1.5 retraction_hop = 1.5
retraction_hop_enabled = True retraction_hop_enabled = True
retraction_hop_only_when_collides = True retraction_hop_only_when_collides = True
retraction_min_travel = 0.8 retraction_min_travel = =line_width * 2
retraction_prime_speed = 15 retraction_prime_speed = 15
skin_overlap = 5 skin_overlap = 5
speed_equalize_flow_enabled = True speed_equalize_flow_enabled = True

2
resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
View File

@ -42,7 +42,7 @@ retraction_extrusion_window = 1
retraction_hop = 1.5 retraction_hop = 1.5
retraction_hop_enabled = True retraction_hop_enabled = True
retraction_hop_only_when_collides = True retraction_hop_only_when_collides = True
retraction_min_travel = 0.8 retraction_min_travel = =line_width * 2
retraction_prime_speed = 15 retraction_prime_speed = 15
skin_overlap = 5 skin_overlap = 5
speed_equalize_flow_enabled = True speed_equalize_flow_enabled = True

2
resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
View File

@ -40,7 +40,7 @@ retraction_count_max = 12
retraction_extra_prime_amount = 0.5 retraction_extra_prime_amount = 0.5
retraction_hop = 1.5 retraction_hop = 1.5
retraction_hop_only_when_collides = False retraction_hop_only_when_collides = False
retraction_min_travel = 0.8 retraction_min_travel = =line_width * 2
retraction_prime_speed = 15 retraction_prime_speed = 15
skin_line_width = =round(line_width * 0.78 / 0.8, 2) skin_line_width = =round(line_width * 0.78 / 0.8, 2)
speed_print = 30 speed_print = 30

2
resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
View File

@ -41,7 +41,7 @@ retraction_count_max = 12
retraction_extra_prime_amount = 0.5 retraction_extra_prime_amount = 0.5
retraction_hop = 1.5 retraction_hop = 1.5
retraction_hop_only_when_collides = False retraction_hop_only_when_collides = False
retraction_min_travel = 0.8 retraction_min_travel = =line_width * 2
retraction_prime_speed = 15 retraction_prime_speed = 15
skin_line_width = =round(line_width * 0.78 / 0.8, 2) skin_line_width = =round(line_width * 0.78 / 0.8, 2)
speed_print = 30 speed_print = 30

2
resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
View File

@ -40,7 +40,7 @@ retraction_count_max = 12
retraction_extra_prime_amount = 0.5 retraction_extra_prime_amount = 0.5
retraction_hop = 1.5 retraction_hop = 1.5
retraction_hop_only_when_collides = False retraction_hop_only_when_collides = False
retraction_min_travel = 0.8 retraction_min_travel = =line_width * 2
retraction_prime_speed = 15 retraction_prime_speed = 15
skin_line_width = =round(line_width * 0.78 / 0.8, 2) skin_line_width = =round(line_width * 0.78 / 0.8, 2)
speed_print = 30 speed_print = 30