mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-12 07:19:05 +08:00
Merge branch 'master' of https://github.com/Ultimaker/Cura
This commit is contained in:
Jaime van Kessel
commit
5188fcc44d
@ -256,6 +256,37 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"dual": {
|
||||
"label": "Dual Extrusion",
|
||||
"visible": true,
|
||||
"icon": "category_dual",
|
||||
"settings": {
|
||||
"extruder_nr": {
|
||||
"label": "Extruder",
|
||||
"description": "The extruder train used for printing. This is used in multi-extrusion.",
|
||||
"type": "int",
|
||||
"default": 0,
|
||||
"min_value": 0,
|
||||
"max_value": 16,
|
||||
"inherit_function": "extruder_nr"
|
||||
},
|
||||
"prime_tower_size": {
|
||||
"label": "Prime Tower Size",
|
||||
"description": "Print a tower next to the print which serves to prime the material after each nozzle switch. A size of 0 corresponds to no prime tower at all.",
|
||||
"type": "float",
|
||||
"unit": "mm",
|
||||
"default": 15,
|
||||
"min_value": 0,
|
||||
"max_value_warning": 20
|
||||
},
|
||||
"prime_tower_wipe_enabled": {
|
||||
"label": "Wipe Nozzle on Prime tower",
|
||||
"description": "After printing the prime tower with the one nozzle, wipe the oozed material from the other nozzle off on the prime tower.",
|
||||
"type": "boolean",
|
||||
"default": false
|
||||
}
|
||||
}
|
||||
},
|
||||
"shell": {
|
||||
"label": "Shell",
|
||||
"visible": true,
|
||||
@ -1124,11 +1155,20 @@
|
||||
"description": "Different options that help in preventing corners from lifting due to warping. Brim adds a single-layer-thick flat area around your object which is easy to cut off afterwards, and it is the recommended option. Raft adds a thick grid below the object and a thin interface between this and your object. (Note that enabling the brim or raft disables the skirt.)",
|
||||
"type": "enum",
|
||||
"options": [
|
||||
"None",
|
||||
"Skirt",
|
||||
"Brim",
|
||||
"Raft"
|
||||
],
|
||||
"default": "None"
|
||||
"default": "Skirt"
|
||||
},
|
||||
"adhesion_extruder_nr": {
|
||||
"label": "Platform Adhesion Extruder",
|
||||
"description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.",
|
||||
"type": "int",
|
||||
"default": 0,
|
||||
"min_value": 0,
|
||||
"max_value": 16,
|
||||
"inherit_function": "extruder_nr"
|
||||
},
|
||||
"skirt_line_count": {
|
||||
"label": "Skirt Line Count",
|
||||
@ -1137,7 +1177,7 @@
|
||||
"default": 1,
|
||||
"active_if": {
|
||||
"setting": "adhesion_type",
|
||||
"value": "None"
|
||||
"value": "Skirt"
|
||||
}
|
||||
},
|
||||
"skirt_gap": {
|
||||
@ -1148,7 +1188,7 @@
|
||||
"default": 3,
|
||||
"active_if": {
|
||||
"setting": "adhesion_type",
|
||||
"value": "None"
|
||||
"value": "Skirt"
|
||||
}
|
||||
},
|
||||
"skirt_minimal_length": {
|
||||
@ -1159,7 +1199,7 @@
|
||||
"default": 250,
|
||||
"active_if": {
|
||||
"setting": "adhesion_type",
|
||||
"value": "None"
|
||||
"value": "Skirt"
|
||||
}
|
||||
},
|
||||
"brim_line_count": {
|
||||
@ -1504,6 +1544,30 @@
|
||||
"type": "boolean",
|
||||
"default": true
|
||||
},
|
||||
"support_extruder_nr": {
|
||||
"label": "Support Extruder",
|
||||
"description": "The extruder train to use for printing the support. This is used in multi-extrusion.",
|
||||
"type": "int",
|
||||
"default": 0,
|
||||
"min_value": 0,
|
||||
"max_value": 16,
|
||||
"inherit_function": "extruder_nr",
|
||||
"children": {
|
||||
"support_roof_extruder_nr": {
|
||||
"label": "Hammock Extruder",
|
||||
"description": "The extruder train to use for printing the hammock. This is used in multi-extrusion.",
|
||||
"type": "int",
|
||||
"default": 0,
|
||||
"min_value": 0,
|
||||
"max_value": 16,
|
||||
"inherit": true,
|
||||
"active_if": {
|
||||
"setting": "support_roof_enable",
|
||||
"value": true
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"support_type": {
|
||||
"label": "Placement",
|
||||
"description": "Where to place support structures. The placement can be restricted such that the support structures won't rest on the model, which could otherwise cause scarring.",
|
||||
|
||||
3379
resources/themes/cura/icons/category_dual.svg
Normal file
3379
resources/themes/cura/icons/category_dual.svg
Normal file
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 247 KiB |
94
resources/themes/cura/icons/category_shield.svg
Normal file
94
resources/themes/cura/icons/category_shield.svg
Normal file
@ -0,0 +1,94 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<svg
|
||||
xmlns:i="&#38;#38;#38;ns_ai;"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
width="30px"
|
||||
height="30px"
|
||||
viewBox="0 0 30 30"
|
||||
enable-background="new 0 0 30 30"
|
||||
xml:space="preserve"
|
||||
id="svg2"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="category_shield.svg"><metadata
|
||||
id="metadata21"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs19" /><sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1104"
|
||||
id="namedview17"
|
||||
showgrid="false"
|
||||
inkscape:zoom="22.627417"
|
||||
inkscape:cx="6.6965777"
|
||||
inkscape:cy="16.367089"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="27"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="icon" /><switch
|
||||
id="switch4"
|
||||
style="fill:#000000"><foreignObject
|
||||
requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
|
||||
x="0"
|
||||
y="0"
|
||||
width="1"
|
||||
height="1"><i:pgfRef
|
||||
xlink:href="#adobe_illustrator_pgf" /></foreignObject><g
|
||||
i:extraneous="self"
|
||||
id="g6"
|
||||
style="fill:#000000"><g
|
||||
id="frame_30x30"
|
||||
display="none"
|
||||
style="fill:#000000"><rect
|
||||
display="inline"
|
||||
width="30"
|
||||
height="30"
|
||||
id="rect9"
|
||||
style="fill:#000000" /></g><g
|
||||
id="frame_24x24"
|
||||
display="none"
|
||||
style="fill:#000000"><rect
|
||||
x="3"
|
||||
y="3"
|
||||
display="inline"
|
||||
fill="#C6C7C8"
|
||||
width="24"
|
||||
height="24"
|
||||
id="rect12"
|
||||
style="fill:#000000" /></g><g
|
||||
id="icon"
|
||||
style="fill:#000000"><path
|
||||
d="m 20.337088,11 3,-8 -16.6741755,0 3,8 -6,16 22.6741755,0 z M 10.599912,10.648 8.1059125,4 21.893087,4 l -2.493,6.648 -0.131,0.352 0.132001,0.352 5.496311,14.653562 -19.7976496,0.0067 L 10.600913,11.352 10.730912,11 Z"
|
||||
id="path15"
|
||||
style="fill:#ffffff"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccccccccccccccccc" /><path
|
||||
style="fill:#ffffff"
|
||||
d="m 25.399588,3 -3,8 6,16 1.0625,0 -6,-16 3,-8 z"
|
||||
id="path3418"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="ccccccc" /><path
|
||||
style="fill:#ffffff"
|
||||
d="m 3.5379125,3 3,8 -6,16 1.0625,0 6,-16 -3,-8 -1.0625,0 z"
|
||||
id="path3414"
|
||||
inkscape:connector-curvature="0" /></g></g></switch><i:pgf
|
||||
id="adobe_illustrator_pgf" /></svg>
|
||||
|
After Width: | Height: | Size: 3.3 KiB |
Loading…
x
Reference in New Issue
Block a user