3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 13:47:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Merge remote-tracking branch 'origin/4.4'

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
cura/Machines/Models/IntentCategoryModel.py
View file

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

2
resources/definitions/ultimaker_s3.def.json
View file

@ -67,8 +67,6 @@
"extruder_prime_pos_abs": { "default_value": true }, "extruder_prime_pos_abs": { "default_value": true },
"machine_start_gcode": { "default_value": "" }, "machine_start_gcode": { "default_value": "" },
"machine_end_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 }, "prime_blob_enable": { "enabled": true, "default_value": false },
"speed_travel": "speed_travel":

2
resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
View file

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

17
resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg
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

2
resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg
View file

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

17
resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg
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

2
resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
View file

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

17
resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg
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

2
resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
View file

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

16
resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg
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

2
resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
View file

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

17
resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg
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

2
resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
View file

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

16
resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg
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