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

Merge branch '5.5' into CURA-10994_translations_v5p5

Browse Source
This commit is contained in:
Erwan MATHIEU 2023-09-29 14:41:34 +02:00 committed by GitHub
commit 0966baaff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cura/Settings/cura_empty_instance_containers.py
View File

@ -28,6 +28,7 @@ empty_material_container.setMetaDataEntry("type", "material")
empty_material_container.setMetaDataEntry("base_file", "empty_material") empty_material_container.setMetaDataEntry("base_file", "empty_material")
empty_material_container.setMetaDataEntry("GUID", "FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF") empty_material_container.setMetaDataEntry("GUID", "FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF")
empty_material_container.setMetaDataEntry("material", "empty") empty_material_container.setMetaDataEntry("material", "empty")
empty_material_container.setMetaDataEntry("brand", "empty_brand")
# Empty quality # Empty quality
EMPTY_QUALITY_CONTAINER_ID = "empty_quality" EMPTY_QUALITY_CONTAINER_ID = "empty_quality"

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

@ -2453,7 +2453,7 @@
"material_print_temperature_layer_0": "material_print_temperature_layer_0":
{ {
"label": "Printing Temperature Initial Layer", "label": "Printing Temperature Initial Layer",
"description": "The temperature used for printing the first layer. Set at 0 to disable special handling of the initial layer.", "description": "The temperature used for printing the first layer.",
"unit": "\u00b0C", "unit": "\u00b0C",
"type": "float", "type": "float",
"default_value": 215, "default_value": 215,
@ -8125,6 +8125,14 @@
"resolve": "max(extruderValues('raft_base_wall_count'))", "resolve": "max(extruderValues('raft_base_wall_count'))",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false
},
"group_outer_walls":
{
"label": "Group Outer Walls",
"description": "Outer walls of different islands in the same layer are printed in sequence. When enabled the amount of flow changes is limited because walls are printed one type at a time, when disabled the number of travels between islands is reduced because walls in the same islands are grouped.",
"type": "bool",
"default_value": true,
"settable_per_mesh": true
} }
} }
}, },

2
resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml
View File

@ -39,7 +39,7 @@ Flickable
padding: UM.Theme.getSize("default_margin").width padding: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
width: recommendedPrintSetup.width - 2 * padding - (scroll.visible ? scroll.width : 0) width: recommendedPrintSetup.width - 2 * padding - UM.Theme.getSize("thin_margin").width
// TODO // TODO
property real firstColumnWidth: Math.round(width / 3) property real firstColumnWidth: Math.round(width / 3)

1
resources/setting_visibility/expert.cfg
View File

@ -32,6 +32,7 @@ wall_0_wipe_dist
wall_0_inset wall_0_inset
wall_transition_filter_distance wall_transition_filter_distance
optimize_wall_printing_order optimize_wall_printing_order
group_outer_walls
inset_direction inset_direction
alternate_extra_perimeter alternate_extra_perimeter
fill_outline_gaps fill_outline_gaps