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

Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7

Browse Source
This commit is contained in:
Jaime van Kessel 2020-08-18 13:54:58 +02:00
commit 2fe9ee2cf2
No known key found for this signature in database
GPG Key ID: 3710727397403C91
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4332,7 +4332,7 @@
"type": "bool",
"default_value": false,
"value": "support_pattern == 'cross' or support_pattern == 'gyroid'",
"enabled": "(support_enable or support_meshes_present) and (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')",
"enabled": "(support_enable or support_meshes_present) and (support_pattern == 'lines' or support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')",
"limit_to_extruder": "support_infill_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true

2
resources/qml/PrintMonitor.qml
View File

@ -77,7 +77,7 @@ Item
Repeater
{
id: extrudersRepeater
model: activePrinter != null ? activePrinter.extruderList : null
model: activePrinter != null ? activePrinter.extruders : null
ExtruderBox
{