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

2025-05-13 00:38:04 +08:00 · 2016-03-09 16:22:45 +01:00 · 2016-03-09 16:22:45 +01:00 · 7be8fa1fe3
commit 7be8fa1fe3
parent ffbc3e8da3 37418be317
31 changed files with 34 additions and 4 deletions
--- a/resources/i18n/de/cura.po
+++ b/resources/i18n/de/cura.po
@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: Cura 2.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-18 11:54+0100\n"
-"PO-Revision-Date: 2016-02-07 16:01+0100\n"
+"PO-Revision-Date: 2016-03-09 15:28+0100\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Last-Translator: Thomas Karl Pietrowski <thopiekar@googlemail.com>\n"
 "Language-Team: \n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.7.1\n"

 #: /home/tamara/2.1/Cura/cura/CrashHandler.py:26
 msgctxt "@title:window"
@ -249,7 +249,7 @@ msgstr "Über USB drucken"
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:37
 msgctxt "@info:tooltip"
 msgid "Print with USB"
-msgstr "Über USB drucken"
+msgstr "Drucken über USB"

 #: /home/tamara/2.1/Cura/plugins/USBPrinting/__init__.py:13
 msgctxt "@label"
--- a/resources/profiles/general/High+Quality.cfg
+++ b/resources/profiles/general/High+Quality.cfg
@ -1,6 +1,7 @@
 [general]
 version = 1
 name = High Quality
+weight = -3

 [settings]
 layer_height = 0.06
--- a/resources/profiles/general/Low+Quality.cfg
+++ b/resources/profiles/general/Low+Quality.cfg
@ -1,6 +1,7 @@
 [general]
 version = 1
 name = Low Quality
+weight = -1

 [settings]
 infill_sparse_density = 10
--- a/resources/profiles/general/Normal+Quality.cfg
+++ b/resources/profiles/general/Normal+Quality.cfg
@ -1,6 +1,7 @@
 [general]
 version = 1
 name = Normal Quality
+weight = -2

 [settings]
 speed_wall_0 = 30
--- a/resources/profiles/general/Ulti+Quality.cfg
+++ b/resources/profiles/general/Ulti+Quality.cfg
@ -1,6 +1,7 @@
 [general]
 version = 1
 name = Ulti Quality
+weight = -4

 [settings]
 layer_height = 0.04
--- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = ABS
+weight = -2

 [settings]
 layer_height = 0.06
--- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
@ -4,6 +4,7 @@ name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = ABS
+weight = -1

 [settings]
 layer_height = 0.15
--- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = ABS
+weight = -3

 [settings]
 layer_height = 0.06
@ -18,7 +19,7 @@ adhesion_type = brim
 cool_min_speed = 20
 line_width = 0.35
 infill_sparse_density = 22
-machine_nozzle_size = 0.35  
+machine_nozzle_size = 0.35
 speed_wall_0 = 20
 cool_min_layer_time = 3
 cool_lift_head = True
--- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = ABS
+weight = -2

 [settings]
 layer_height_0 = 0.26
--- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.6 mm
 material = ABS
+weight = -2

 [settings]
 layer_height = 0.15
--- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = ABS
+weight = -2

 [settings]
 layer_height = 0.2
--- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = CPE
+weight = -2

 [settings]
 infill_overlap = 17
--- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
@ -4,6 +4,7 @@ name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = CPE
+weight = -1

 [settings]
 infill_overlap = 17
--- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = CPE
+weight = -3

 [settings]
 layer_height = 0.06
--- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = CPE
+weight = -2

 [settings]
 layer_height_0 = 0.26
--- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.6 mm
 material = CPE
+weight = -2

 [settings]
 infill_overlap = 17
--- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = CPE
+weight = -2

 [settings]
 infill_overlap = 17
--- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = PLA
+weight = -2

 [settings]
 machine_nozzle_size = 0.22
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@ -4,6 +4,7 @@ name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -1

 [settings]
 machine_nozzle_size = 0.35
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -3

 [settings]
 machine_nozzle_size = 0.35
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -2

 [settings]
 machine_nozzle_size = 0.35
--- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
@ -4,6 +4,7 @@ name = Ulti Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -4

 [settings]
 machine_nozzle_size = 0.35
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.6 mm
 material = PLA
+weight = -2

 [settings]
 machine_nozzle_size = 0.53
--- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = PLA
+weight = -2

 [settings]
 machine_nozzle_size = 0.7
--- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.25 mm
+weight = -2

 [settings]
 machine_nozzle_size = 0.22
--- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
@ -3,6 +3,7 @@ version = 1
 name = Fast Print
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -1

 [settings]
 machine_nozzle_size = 0.35
--- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
@ -3,6 +3,7 @@ version = 1
 name = High Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -3

 [settings]
 machine_nozzle_size = 0.35
--- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -2

 [settings]
 machine_nozzle_size = 0.35
--- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
@ -3,6 +3,7 @@ version = 1
 name = Ulti Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -4

 [settings]
 machine_nozzle_size = 0.35
--- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.6 mm
+weight = -2

 [settings]
 machine_nozzle_size = 0.53
--- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.8 mm
+weight = -2

 [settings]
 machine_nozzle_size = 0.7