Merge branch 'master' into qt6_beyond_the_splash

# Conflicts:
#	cura/PrinterOutput/PrinterOutputDevice.py
This commit is contained in:
j.delarago 2022-04-06 15:24:30 +02:00
commit b2b1961b57
4332 changed files with 4436 additions and 4446 deletions

View file

@ -6,7 +6,7 @@
"type": "extruder",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 19,
"setting_version": 20,
"visible": false,
"position": "0"
},

View file

@ -6,7 +6,7 @@
"type": "machine",
"author": "Unknown",
"manufacturer": "Unknown",
"setting_version": 19,
"setting_version": 20,
"file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,
@ -764,7 +764,7 @@
"label": "Scale Fan Speed To 0-1",
"description": "Scale the fan speed to be between 0 and 1 instead of between 0 and 256.",
"type": "bool",
"default_value": true,
"default_value": false,
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
@ -1088,20 +1088,6 @@
}
}
},
"beading_strategy_type":
{
"label": "Variable Line Strategy",
"description": "Strategy to use to print the width of a part with a number of walls. This determines how many walls it will use for a certain total width, and how wide each of these lines are. \"Center Deviation\" will print all walls at the nominal line width except the central one(s), causing big variations in the center but very consistent outsides. \"Distributed\" distributes the width equally over all walls. \"Inward Distributed\" is a balance between the other two, distributing the changes in width over all walls but keeping the walls on the outside slightly more consistent.",
"type": "enum",
"options":
{
"center_deviation": "Center Deviation",
"distributed": "Distributed",
"inward_distributed": "Inward Distributed"
},
"default_value": "inward_distributed",
"limit_to_extruder": "wall_0_extruder_nr"
},
"wall_transition_length":
{
"label": "Wall Transition Length",
@ -1122,8 +1108,7 @@
"type": "int",
"maximum_value": "999999",
"default_value": 1,
"minimum_value": "1",
"enabled": "beading_strategy_type == 'inward_distributed'"
"minimum_value": "1"
},
"wall_transition_angle":
{
@ -1190,10 +1175,9 @@
"type": "enum",
"options": {
"inside_out": "Inside To Outside",
"outside_in": "Outside To Inside",
"center_last": "Center Last"
"outside_in": "Outside To Inside"
},
"default_value": "center_last",
"default_value": "outside_in",
"settable_per_mesh": true
},
"alternate_extra_perimeter":
@ -1205,15 +1189,6 @@
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"filter_out_tiny_gaps":
{
"label": "Filter Out Tiny Gaps",
"description": "Filter out tiny gaps to reduce blobs on outside of model.",
"type": "bool",
"default_value": true,
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"min_wall_line_width":
{
"label": "Minimum Wall Line Width",

View file

@ -53,9 +53,21 @@
"infill_before_walls": {
"value": "False"
},
"infill_material_flow": {
"value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow"
},
"retraction_combing": {
"value": "'no_outer_surfaces'"
},
"roofing_layer_count": {
"value": "0"
},
"roofing_material_flow": {
"value": "material_flow"
},
"skin_material_flow": {
"value": "0.97 * material_flow"
},
"skin_monotonic" : {
"value": true
},

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D010
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D015
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D030
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D010
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D015
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D030
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D010
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D015
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D030
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D010
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D015
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D015
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D030
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D010
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D015
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D030
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D010
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D015
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = engineering

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D020
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = D030
intent_category = quick

View file

@ -4,7 +4,7 @@ name = Quick
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Quick
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Quick
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = quick
quality_type = verydraft

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s3
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = quick
quality_type = verydraft

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 19
setting_version = 20
type = intent
intent_category = engineering
quality_type = fast

Some files were not shown because too many files have changed in this diff Show more