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

resources/i18n/fdmprinter.json.pot

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-01-18 11:54+0000\n"
+"POT-Creation-Date: 2016-03-23 16:40+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
@@ -97,7 +97,7 @@ msgstr ""
 
 #: fdmprinter.json
 msgctxt "wall_line_width_x label"
-msgid "Other Walls Line Width"
+msgid "Inner Wall(s) Line Width"
 msgstr ""
 
 #: fdmprinter.json
@@ -203,19 +203,6 @@ msgid ""
 "and impact the strength and structural integrity of your print."
 msgstr ""
 
-#: fdmprinter.json
-msgctxt "alternate_extra_perimeter label"
-msgid "Alternate Extra Wall"
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "alternate_extra_perimeter description"
-msgid ""
-"Make an extra wall at every second layer, so that infill will be caught "
-"between an extra wall above and one below. This results in a better cohesion "
-"between infill and walls, but might have an impact on the surface quality."
-msgstr ""
-
 #: fdmprinter.json
 msgctxt "top_bottom_thickness label"
 msgid "Bottom/Top Thickness"
@@ -278,6 +265,19 @@ msgctxt "bottom_layers description"
 msgid "This controls the amount of bottom layers."
 msgstr ""
 
+#: fdmprinter.json
+msgctxt "alternate_extra_perimeter label"
+msgid "Alternate Extra Wall"
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "alternate_extra_perimeter description"
+msgid ""
+"Make an extra wall at every second layer, so that infill will be caught "
+"between an extra wall above and one below. This results in a better cohesion "
+"between infill and walls, but might have an impact on the surface quality."
+msgstr ""
+
 #: fdmprinter.json
 msgctxt "remove_overlapping_walls_enabled label"
 msgid "Remove Overlapping Wall Parts"
@@ -306,7 +306,7 @@ msgstr ""
 
 #: fdmprinter.json
 msgctxt "remove_overlapping_walls_x_enabled label"
-msgid "Remove Overlapping Other Wall Parts"
+msgid "Remove Overlapping Inner Wall Parts"
 msgstr ""
 
 #: fdmprinter.json
@@ -629,18 +629,6 @@ msgid ""
 "Celsius)."
 msgstr ""
 
-#: fdmprinter.json
-msgctxt "material_standby_temperature label"
-msgid "Standby Temperature"
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "material_standby_temperature description"
-msgid ""
-"The temperature of the nozzle when another nozzle is currently used for "
-"printing."
-msgstr ""
-
 #: fdmprinter.json
 msgctxt "material_extrusion_cool_down_speed label"
 msgid "Extrusion Cool Down Speed Modifier"
@@ -848,7 +836,7 @@ msgstr ""
 
 #: fdmprinter.json
 msgctxt "speed_wall label"
-msgid "Shell Speed"
+msgid "Wall Speed"
 msgstr ""
 
 #: fdmprinter.json
@@ -860,7 +848,7 @@ msgstr ""
 
 #: fdmprinter.json
 msgctxt "speed_wall_0 label"
-msgid "Outer Shell Speed"
+msgid "Outer Wall Speed"
 msgstr ""
 
 #: fdmprinter.json
@@ -874,7 +862,7 @@ msgstr ""
 
 #: fdmprinter.json
 msgctxt "speed_wall_x label"
-msgid "Inner Shell Speed"
+msgid "Inner Wall Speed"
 msgstr ""
 
 #: fdmprinter.json
@@ -1210,6 +1198,61 @@ msgid ""
 "minimum layer time is used up."
 msgstr ""
 
+#: fdmprinter.json
+msgctxt "draft_shield_enabled label"
+msgid "Enable Draft Shield"
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "draft_shield_enabled description"
+msgid ""
+"Enable exterior draft shield. This will create a wall around the object "
+"which traps (hot) air and shields against gusts of wind. Especially useful "
+"for materials which warp easily."
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "draft_shield_dist label"
+msgid "Draft Shield X/Y Distance"
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "draft_shield_dist description"
+msgid "Distance of the draft shield from the print, in the X/Y directions."
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "draft_shield_height_limitation label"
+msgid "Draft Shield Limitation"
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "draft_shield_height_limitation description"
+msgid "Whether or not to limit the height of the draft shield."
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "draft_shield_height_limitation option full"
+msgid "Full"
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "draft_shield_height_limitation option limited"
+msgid "Limited"
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "draft_shield_height label"
+msgid "Draft Shield Height"
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "draft_shield_height description"
+msgid ""
+"Height limitation on the draft shield. Above this height no draft shield "
+"will be printed."
+msgstr ""
+
 #: fdmprinter.json
 msgctxt "support label"
 msgid "Support"
@@ -1492,6 +1535,16 @@ msgid ""
 "diameter decreases, forming a roof."
 msgstr ""
 
+#: fdmprinter.json
+msgctxt "support_tower_diameter label"
+msgid "Tower Diameter"
+msgstr ""
+
+#: fdmprinter.json
+msgctxt "support_tower_diameter description"
+msgid "The diameter of a special tower."
+msgstr ""
+
 #: fdmprinter.json
 msgctxt "support_minimal_diameter label"
 msgid "Minimum Diameter"
@@ -1504,16 +1557,6 @@ msgid ""
 "supported by a specialized support tower."
 msgstr ""
 
-#: fdmprinter.json
-msgctxt "support_tower_diameter label"
-msgid "Tower Diameter"
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "support_tower_diameter description"
-msgid "The diameter of a special tower."
-msgstr ""
-
 #: fdmprinter.json
 msgctxt "support_tower_roof_angle label"
 msgid "Tower Roof Angle"
@@ -1934,61 +1977,6 @@ msgctxt "raft_base_fan_speed description"
 msgid "The fan speed for the base raft layer."
 msgstr ""
 
-#: fdmprinter.json
-msgctxt "draft_shield_enabled label"
-msgid "Enable Draft Shield"
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "draft_shield_enabled description"
-msgid ""
-"Enable exterior draft shield. This will create a wall around the object "
-"which traps (hot) air and shields against gusts of wind. Especially useful "
-"for materials which warp easily."
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "draft_shield_dist label"
-msgid "Draft Shield X/Y Distance"
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "draft_shield_dist description"
-msgid "Distance of the draft shield from the print, in the X/Y directions."
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "draft_shield_height_limitation label"
-msgid "Draft Shield Limitation"
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "draft_shield_height_limitation description"
-msgid "Whether or not to limit the height of the draft shield."
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "draft_shield_height_limitation option full"
-msgid "Full"
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "draft_shield_height_limitation option limited"
-msgid "Limited"
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "draft_shield_height label"
-msgid "Draft Shield Height"
-msgstr ""
-
-#: fdmprinter.json
-msgctxt "draft_shield_height description"
-msgid ""
-"Height limitation on the draft shield. Above this height no draft shield "
-"will be printed."
-msgstr ""
-
 #: fdmprinter.json
 msgctxt "meshfix label"
 msgid "Mesh Fixes"

resources/machines/fdmprinter.json

@@ -927,7 +927,6 @@
                                     "min_value": "0.1",
                                     "max_value_warning": "150",
                                     "visible": false,
-                                    "inherit": false,
                                     "enabled": "support_roof_enable",
                                     "inherit_function": "parent_value / 60 * 40",
                                     "global_only": true

resources/machines/ultimaker2plus.json

@@ -36,6 +36,7 @@
                     -34
                 ]
             ]
-        }
+        },
+        "retraction_amount": { "default": 6.0 }
     }
 }

resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile

@@ -8,18 +8,19 @@ weight = -2
 
 [settings]
 layer_height = 0.06
-top_bottom_thickness = 0.72
-layer_height_0 = 0.15
-speed_wall_x = 25
 wall_thickness = 0.88
+line_width = 0.22
+top_bottom_thickness = 0.72
+infill_sparse_density = 22
+speed_print = 20
+layer_height_0 = 0.15
+speed_layer_0 = 20
 speed_infill = 30
 speed_topbottom = 20
-speed_print = 20
-cool_min_speed = 25
-line_width = 0.22
-infill_sparse_density = 22
 speed_wall_0 = 20
+speed_wall_x = 25
 cool_min_layer_time = 2
+cool_min_speed = 10
 cool_lift_head = True
-cool_fan_speed_min = 50
+cool_fan_speed_min = 20
 

resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile

@@ -8,18 +8,20 @@ weight = -1
 
 [settings]
 layer_height = 0.15
-top_bottom_thickness = 0.75
-layer_height_0 = 0.26
-speed_print = 40
 wall_thickness = 0.7
+line_width = 0.35
+top_bottom_thickness = 0.75
+infill_sparse_density = 18
+speed_print = 40
+layer_height_0 = 0.26
+speed_layer_0 = 30
+speed_travel = 150
 speed_infill = 55
 speed_topbottom = 30
+speed_wall_0 = 30
+speed_wall_x = 40
 cool_min_layer_time = 3
 cool_min_speed = 20
-line_width = 0.35
-infill_sparse_density = 18
-speed_travel = 150
-speed_wall_0 = 30
 cool_lift_head = True
 cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/abs_0.4_high.curaprofile

@@ -8,17 +8,19 @@ weight = -3
 
 [settings]
 layer_height = 0.06
-top_bottom_thickness = 0.72
-layer_height_0 = 0.26
-speed_print = 30
 wall_thickness = 1.05
+line_width = 0.35
+top_bottom_thickness = 0.72
+infill_sparse_density = 22
+speed_print = 30
+layer_height_0 = 0.26
+speed_layer_0 = 20
 speed_infill = 45
 speed_topbottom = 20
-cool_min_speed = 20
-line_width = 0.35
-infill_sparse_density = 22
 speed_wall_0 = 20
+speed_wall_x = 30
 cool_min_layer_time = 3
+cool_min_speed = 10
+cool_fan_speed_min = 20
 cool_lift_head = True
-cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile

@@ -7,15 +7,20 @@ material = ABS
 weight = -2
 
 [settings]
-layer_height_0 = 0.26
+layer_height = 0.1
-speed_print = 30
 wall_thickness = 1.05
+line_width = 0.35
+top_bottom_thickness = 0.8
+infill_sparse_density = 20
+speed_print = 30
+layer_height_0 = 0.26
+speed_layer_0 = 20
 speed_infill = 45
 speed_topbottom = 20
-cool_min_layer_time = 3
-cool_min_speed = 20
-line_width = 0.35
 speed_wall_0 = 20
-cool_lift_head = True
+speed_wall_x = 30
+cool_min_layer_time = 3
 cool_fan_speed_min = 50
+cool_min_speed = 10
+cool_lift_head = True
 

resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile

@@ -8,17 +8,19 @@ weight = -2
 
 [settings]
 layer_height = 0.15
-top_bottom_thickness = 1.2
-layer_height_0 = 0.39
-speed_print = 25
-speed_wall_x = 30
 wall_thickness = 1.59
-speed_infill = 55
-speed_topbottom = 20
-cool_min_speed = 20
 line_width = 0.53
+top_bottom_thickness = 1.2
+infill_sparse_density = 20
+speed_print = 25
+layer_height_0 = 0.39
+speed_layer_0 = 20
+speed_infill = 40
+speed_topbottom = 20
 speed_wall_0 = 20
+speed_wall_x = 30
 cool_min_layer_time = 3
-cool_lift_head = True
 cool_fan_speed_min = 50
+cool_min_speed = 20
+cool_lift_head = True
 

resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile

@@ -8,17 +8,19 @@ weight = -2
 
 [settings]
 layer_height = 0.2
-top_bottom_thickness = 1.2
-layer_height_0 = 0.5
-speed_print = 20
-speed_wall_x = 30
 wall_thickness = 2.1
+line_width = 0.7
+speed_print = 20
+top_bottom_thickness = 1.2
+infill_sparse_density = 20
+layer_height_0 = 0.5
+speed_layer_0 = 20
 speed_infill = 40
 speed_topbottom = 20
-cool_min_speed = 15
-line_width = 0.7
 speed_wall_0 = 20
+speed_wall_x = 30
 cool_min_layer_time = 3
-cool_lift_head = True
 cool_fan_speed_min = 50
+cool_min_speed = 15
+cool_lift_head = True
 

resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile

@@ -7,19 +7,21 @@ material = CPE
 weight = -2
 
 [settings]
-infill_overlap = 17
 layer_height = 0.06
 wall_thickness = 0.88
-layer_height_0 = 0.15
+line_width = 0.22
-speed_wall_x = 25
 top_bottom_thickness = 0.72
+infill_sparse_density = 22
+speed_print = 20
+layer_height_0 = 0.15
+speed_layer_0 = 20
 speed_infill = 30
 speed_topbottom = 20
-cool_min_layer_time = 2
-speed_print = 20
-line_width = 0.22
-infill_sparse_density = 22
 speed_wall_0 = 20
-cool_lift_head = True
+speed_wall_x = 25
+cool_min_layer_time = 2
+cool_min_speed = 10
 cool_fan_speed_min = 50
+cool_lift_head = True
+infill_overlap = 17
 

resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile

@@ -7,20 +7,22 @@ material = CPE
 weight = -1
 
 [settings]
-infill_overlap = 17
-cool_min_layer_time = 3
 layer_height = 0.15
 wall_thickness = 0.7
-layer_height_0 = 0.26
+line_width = 0.35
-speed_print = 30
-speed_wall_x = 40
 top_bottom_thickness = 0.75
+infill_sparse_density = 18
+speed_print = 40
+layer_height_0 = 0.26
+speed_travel = 150
+speed_layer_0 = 30
 speed_infill = 45
 speed_topbottom = 20
-speed_travel = 150
-line_width = 0.35
-infill_sparse_density = 18
 speed_wall_0 = 30
-cool_lift_head = True
+speed_wall_x = 40
+cool_min_layer_time = 3
 cool_fan_speed_min = 50
+cool_min_speed = 10
+cool_lift_head = True
+infill_overlap = 17
 

resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile

@@ -8,17 +8,21 @@ weight = -3
 
 [settings]
 layer_height = 0.06
-top_bottom_thickness = 0.72
-layer_height_0 = 0.26
-speed_print = 20
-speed_wall_x = 30
 wall_thickness = 1.05
+line_width = 0.35
+top_bottom_thickness = 0.72
+infill_sparse_density = 22
+speed_print = 20
+layer_height_0 = 0.26
+speed_layer_0 = 20
 speed_infill = 45
 speed_topbottom = 20
-line_width = 0.35
-infill_sparse_density = 22
 speed_wall_0 = 20
+speed_wall_x = 30
 cool_min_layer_time = 3
-cool_lift_head = True
 cool_fan_speed_min = 50
+cool_min_speed = 10
+cool_lift_head = True
+infill_overlap = 15
+
 

resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile

@@ -7,15 +7,21 @@ material = CPE
 weight = -2
 
 [settings]
-layer_height_0 = 0.26
+layer_height = 0.1
-speed_print = 20
-speed_wall_x = 30
 wall_thickness = 1.05
+line_width = 0.35
+top_bottom_thickness = 0.8
+infill_sparse_density = 20
+speed_print = 30
+layer_height_0 = 0.26
+speed_layer_0 = 20
 speed_infill = 45
 speed_topbottom = 20
-cool_min_layer_time = 3
-line_width = 0.35
 speed_wall_0 = 20
-cool_lift_head = True
+speed_wall_x = 30
+cool_min_layer_time = 3
 cool_fan_speed_min = 50
+cool_min_speed = 10
+cool_lift_head = True
+infill_overlap = 15
 

resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile

@@ -7,18 +7,21 @@ material = CPE
 weight = -2
 
 [settings]
-infill_overlap = 17
 layer_height = 0.15
-top_bottom_thickness = 1.2
-layer_height_0 = 0.39
-speed_wall_x = 30
 wall_thickness = 1.59
+line_width = 0.53
+top_bottom_thickness = 1.2
+infill_sparse_density = 20
+speed_print = 25
+layer_height_0 = 0.4
+speed_layer_0 = 20
 speed_infill = 40
 speed_topbottom = 20
-cool_min_layer_time = 3
-speed_print = 20
-line_width = 0.53
 speed_wall_0 = 20
-cool_lift_head = True
+speed_wall_x = 30
+cool_min_layer_time = 3
+cool_min_speed = 10
 cool_fan_speed_min = 50
+cool_lift_head = True
+infill_overlap = 17
 

resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile

@@ -7,18 +7,21 @@ material = CPE
 weight = -2
 
 [settings]
-infill_overlap = 17
 layer_height = 0.2
-top_bottom_thickness = 1.2
-layer_height_0 = 0.5
-speed_wall_x = 30
 wall_thickness = 2.1
+line_width = 0.7
+top_bottom_thickness = 1.2
+infill_sparse_density = 20
+speed_print = 20
+layer_height_0 = 0.5
+speed_layer_0 = 20
 speed_infill = 40
 speed_topbottom = 20
-cool_min_layer_time = 3
-speed_print = 20
-line_width = 0.7
 speed_wall_0 = 20
-cool_lift_head = True
+speed_wall_x = 30
+cool_min_layer_time = 3
+cool_min_speed = 10
 cool_fan_speed_min = 50
+cool_lift_head = True
+infill_overlap = 17
 

resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile

@@ -14,6 +14,7 @@ shell_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 retraction_amount = 6
+speed_print = 20
 speed_infill = 30
 speed_wall_0 = 20
 speed_wall_x = 25

resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile

@@ -14,8 +14,11 @@ shell_thickness = 0.7
 top_bottom_thickness = 0.6
 infill_sparse_density = 18
 retraction_amount = 5.5
+speed_print = 40
+speed_infill = 60
 speed_wall_0 = 40
 speed_wall_x = 50
 speed_travel = 150
+speed_topbottom = 30
 speed_layer_0 = 25
 cool_min_layer_time_fan_speed_max = 15

resources/profiles/ultimaker2+/pla_0.4_high.curaprofile

@@ -14,7 +14,9 @@ shell_thickness = 1.05
 top_bottom_thickness = 0.84
 infill_sparse_density = 22
 retraction_amount = 5.5
+speed_print = 30
 speed_infill = 50
+speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25

resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile

@@ -12,8 +12,11 @@ layer_height = 0.1
 layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.8
+infill_sparse_density = 20
 retraction_amount = 5.5
+speed_print = 30
 speed_infill = 50
+speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25

resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile

@@ -15,7 +15,9 @@ top_bottom_thickness = 1.12
 infill_sparse_density = 25
 retraction_amount = 5.5
 retraction_extrusion_window = 6
+speed_print = 30
 speed_infill = 50
+speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25

resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile

@@ -12,7 +12,9 @@ layer_height = 0.15
 layer_height_0 = 0.4
 shell_thickness = 1.59
 top_bottom_thickness = 1.2
+infill_sparse_density = 20
 retraction_amount = 6
+speed_print = 25
 speed_infill = 55
 speed_wall_0 = 25
 speed_wall_x = 40

resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile

@@ -12,7 +12,9 @@ layer_height = 0.2
 layer_height_0 = 0.5
 shell_thickness = 2.1
 top_bottom_thickness = 1.6
+infill_sparse_density = 20
 retraction_amount = 6
+speed_print = 20
 speed_infill = 40
 speed_wall_0 = 20
 speed_wall_x = 30