3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2.3'

Browse source
This commit is contained in:
Ghostkeeper 2016-11-01 16:07:18 +01:00
commit 6fa36f7c09
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/definitions/ultimaker3.def.json
View file

@ -154,7 +154,6 @@
"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(line_width * 0.3 / 0.35, 2)" }, "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
"wall_thickness": { "value": "1" }, "wall_thickness": { "value": "1" }
"xy_offset": { "value": "-0.14", "comment": "This is a hack to compensate for oversized prints. CURA-2845" }
} }
} }

6
resources/qml/Actions.qml
View file

@ -131,7 +131,11 @@ Item
id: resetProfileAction; id: resetProfileAction;
enabled: Cura.MachineManager.hasUserSettings enabled: Cura.MachineManager.hasUserSettings
text: catalog.i18nc("@action:inmenu menubar:profile","&Discard current settings"); text: catalog.i18nc("@action:inmenu menubar:profile","&Discard current settings");
onTriggered: Cura.ContainerManager.clearUserContainers(); onTriggered:
{
forceActiveFocus();
Cura.ContainerManager.clearUserContainers();
}
} }
Action Action