3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
ChrisTerBeke 2017-09-11 10:56:41 +02:00
commit 8a518ff610
3 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/definitions/fdmprinter.def.json
View file

@ -5003,6 +5003,17 @@
"enabled": "magic_spiralize", "enabled": "magic_spiralize",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false
},
"relative_extrusion":
{
"label": "Relative Extrusion",
"description": "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the Gcode. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps. Irrespective of this setting, the extrusion mode will always be set to absolute before any Gcode script is output.",
"type": "bool",
"default_value": false,
"value": "machine_gcode_flavor==\"RepRap (RepRap)\"",
"enabled": true,
"settable_per_mesh": false,
"settable_per_extruder": false
} }
} }
}, },

5
resources/definitions/ultimaker.def.json
View file

@ -31,6 +31,11 @@
{ {
"minimum_value": "0", "minimum_value": "0",
"maximum_value": "machine_width" "maximum_value": "machine_width"
},
"relative_extrusion":
{
"value": false,
"enabled": false
} }
} }
} }

6
resources/themes/cura-light/theme.json
View file

@ -166,7 +166,7 @@
"setting_control_highlight": [255, 255, 255, 0], "setting_control_highlight": [255, 255, 255, 0],
"setting_control_border": [127, 127, 127, 255], "setting_control_border": [127, 127, 127, 255],
"setting_control_border_highlight": [12, 169, 227, 255], "setting_control_border_highlight": [12, 169, 227, 255],
"setting_control_text": [127, 127, 127, 255], "setting_control_text": [27, 27, 27, 255],
"setting_control_depth_line": [127, 127, 127, 255], "setting_control_depth_line": [127, 127, 127, 255],
"setting_control_button": [127, 127, 127, 255], "setting_control_button": [127, 127, 127, 255],
"setting_control_button_hover": [70, 84, 113, 255], "setting_control_button_hover": [70, 84, 113, 255],
@ -197,7 +197,7 @@
"checkbox_border": [64, 69, 72, 255], "checkbox_border": [64, 69, 72, 255],
"checkbox_border_hover": [12, 169, 227, 255], "checkbox_border_hover": [12, 169, 227, 255],
"checkbox_mark": [119, 122, 124, 255], "checkbox_mark": [119, 122, 124, 255],
"checkbox_text": [166, 168, 169, 255], "checkbox_text": [27, 27, 27, 255],
"mode_switch": [255, 255, 255, 255], "mode_switch": [255, 255, 255, 255],
"mode_switch_hover": [255, 255, 255, 255], "mode_switch_hover": [255, 255, 255, 255],
@ -225,7 +225,7 @@
"message_progressbar_background": [255, 255, 255, 255], "message_progressbar_background": [255, 255, 255, 255],
"message_progressbar_control": [12, 169, 227, 255], "message_progressbar_control": [12, 169, 227, 255],
"tool_panel_background": [31, 36, 39, 255], "tool_panel_background": [255, 255, 255, 255],
"status_offline": [0, 0, 0, 255], "status_offline": [0, 0, 0, 255],
"status_ready": [0, 205, 0, 255], "status_ready": [0, 205, 0, 255],