Merge remote-tracking branch 'origin/4.4'

This commit is contained in:
Lipu Fei 2019-11-01 10:42:35 +01:00
commit 71fe01d7f2
14 changed files with 10 additions and 112 deletions

View file

@ -41,11 +41,11 @@ class IntentCategoryModel(ListModel):
}
_translations["engineering"] = {
"name": catalog.i18nc("@label", "Engineering"),
"description": catalog.i18nc("@text", "Suitable for engineering work")
"description": catalog.i18nc("@text", "Optimized for higher accuracy")
}
_translations["smooth"] = {
"name": catalog.i18nc("@label", "Smooth"),
"description": catalog.i18nc("@text", "Optimized for a smooth surfaces")
_translations["quick"] = {
"name": catalog.i18nc("@label", "Draft"),
"description": catalog.i18nc("@text", "Optimized for fast results")
}

View file

@ -67,8 +67,6 @@
"extruder_prime_pos_abs": { "default_value": true },
"machine_start_gcode": { "default_value": "" },
"machine_end_gcode": { "default_value": "" },
"prime_tower_position_x": { "value": "345" },
"prime_tower_position_y": { "value": "222.5" },
"prime_blob_enable": { "enabled": true, "default_value": false },
"speed_travel":

View file

@ -6,7 +6,7 @@ definition = ultimaker_s3
[metadata]
setting_version = 10
type = intent
intent_category = smooth
intent_category = quick
quality_type = draft
material = generic_abs
variant = AA 0.4

View file

@ -1,17 +0,0 @@
[general]
version = 4
name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
type = intent
intent_category = visual
quality_type = draft
material = generic_abs
variant = AA 0.4
[values]
speed_infill = 50
wall_thickness = =wall_line_width * 3
top_bottom_thickness = =wall_thickness

View file

@ -6,7 +6,7 @@ definition = ultimaker_s3
[metadata]
setting_version = 10
type = intent
intent_category = smooth
intent_category = quick
quality_type = draft
material = generic_pla
variant = AA 0.4

View file

@ -1,17 +0,0 @@
[general]
version = 4
name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
type = intent
quality_type = draft
intent_category = visual
material = generic_pla
variant = AA 0.4
[values]
speed_infill = 50
wall_thickness = =wall_line_width * 3
top_bottom_thickness = =wall_thickness

View file

@ -6,7 +6,7 @@ definition = ultimaker_s3
[metadata]
setting_version = 10
type = intent
intent_category = smooth
intent_category = quick
quality_type = draft
material = generic_tough_pla
variant = AA 0.4

View file

@ -1,17 +0,0 @@
[general]
version = 4
name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
type = intent
quality_type = draft
intent_category = visual
material = generic_tough_pla
variant = AA 0.4
[values]
speed_infill = 50
wall_thickness = =wall_line_width * 3
top_bottom_thickness = =wall_thickness

View file

@ -6,7 +6,7 @@ definition = ultimaker_s5
[metadata]
setting_version = 10
type = intent
intent_category = smooth
intent_category = quick
quality_type = draft
material = generic_abs
variant = AA 0.4

View file

@ -1,16 +0,0 @@
[general]
version = 4
name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
type = intent
intent_category = visualquality_type = draft
material = generic_abs
variant = AA 0.4
[values]
speed_infill = 50
wall_thickness = =wall_line_width * 3
top_bottom_thickness = =wall_thickness

View file

@ -6,7 +6,7 @@ definition = ultimaker_s5
[metadata]
setting_version = 10
type = intent
intent_category = smooth
intent_category = quick
quality_type = draft
material = generic_pla
variant = AA 0.4

View file

@ -1,17 +0,0 @@
[general]
version = 4
name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
type = intent
quality_type = draft
intent_category = visual
material = generic_pla
variant = AA 0.4
[values]
speed_infill = 50
wall_thickness = =wall_line_width * 3
top_bottom_thickness = =wall_thickness

View file

@ -6,7 +6,7 @@ definition = ultimaker_s5
[metadata]
setting_version = 10
type = intent
intent_category = smooth
intent_category = quick
quality_type = draft
material = generic_tough_pla
variant = AA 0.4

View file

@ -1,16 +0,0 @@
[general]
version = 4
name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
type = intent
intent_category = visual
material = generic_tough_pla
variant = AA 0.4
[values]
speed_infill = 50
wall_thickness = =wall_line_width * 3
top_bottom_thickness = =wall_thickness