Merge branch 'master' into layer_view3_cleanup

plugins/3MFReader/WorkspaceDialog.qml

@@ -85,10 +85,41 @@ UM.Dialog
                 width: height
             }
 
-            Label
+            Row
             {
-                text: catalog.i18nc("@action:label", "Printer settings")
+                height: childrenRect.height
-                font.bold: true
+                width: parent.width
+                Label
+                {
+                    text: catalog.i18nc("@action:label", "Printer settings")
+                    font.bold: true
+                    width: parent.width /3
+                }
+                Item
+                {
+                    // spacer
+                    height: spacerHeight
+                    width: parent.width / 3
+                }
+                UM.TooltipArea
+                {
+                    id: machineResolveTooltip
+                    width: parent.width / 3
+                    height: visible ? comboboxHeight : 0
+                    visible: manager.machineConflict
+                    text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
+                    ComboBox
+                    {
+                        model: resolveStrategiesModel
+                        textRole: "label"
+                        id: machineResolveComboBox
+                        width: parent.width
+                        onActivated:
+                        {
+                            manager.setResolveStrategy("machine", resolveStrategiesModel.get(index).key)
+                        }
+                    }
+                }
             }
             Row
             {
@@ -120,26 +151,6 @@ UM.Dialog
                     text: manager.machineName
                     width: parent.width / 3
                 }
-
-                UM.TooltipArea
-                {
-                    id: machineResolveTooltip
-                    width: parent.width / 3
-                    height: visible ? comboboxHeight : 0
-                    visible: manager.machineConflict
-                    text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
-                    ComboBox
-                    {
-                        model: resolveStrategiesModel
-                        textRole: "label"
-                        id: machineResolveComboBox
-                        width: parent.width
-                        onActivated:
-                        {
-                            manager.setResolveStrategy("machine", resolveStrategiesModel.get(index).key)
-                        }
-                    }
-                }
             }
 
             Item // Spacer
@@ -147,28 +158,22 @@ UM.Dialog
                 height: spacerHeight
                 width: height
             }
-
-            Label
-            {
-                text: catalog.i18nc("@action:label", "Profile settings")
-                font.bold: true
-            }
-
             Row
             {
-                width: parent.width
                 height: childrenRect.height
+                width: parent.width
                 Label
                 {
-                    text: catalog.i18nc("@action:label", "Name")
+                    text: catalog.i18nc("@action:label", "Profile settings")
+                    font.bold: true
                     width: parent.width / 3
                 }
-                Label
+                Item
                 {
-                    text: manager.qualityName
+                    // spacer
+                    height: spacerHeight
                     width: parent.width / 3
                 }
-
                 UM.TooltipArea
                 {
                     id: qualityChangesResolveTooltip
@@ -190,6 +195,21 @@ UM.Dialog
                 }
             }
             Row
+            {
+                width: parent.width
+                height: childrenRect.height
+                Label
+                {
+                    text: catalog.i18nc("@action:label", "Name")
+                    width: parent.width / 3
+                }
+                Label
+                {
+                    text: manager.qualityName
+                    width: parent.width / 3
+                }
+            }
+            Row
             {
                 width: parent.width
                 height: manager.numUserSettings != 0 ? childrenRect.height : 0
@@ -226,11 +246,41 @@ UM.Dialog
                 height: spacerHeight
                 width: height
             }
-
+            Row
-            Label
             {
-                text: catalog.i18nc("@action:label", "Material settings")
+                height: childrenRect.height
-                font.bold: true
+                width: parent.width
+                Label
+                {
+                    text: catalog.i18nc("@action:label", "Material settings")
+                    font.bold: true
+                    width: parent.width / 3
+                }
+                Item
+                {
+                    // spacer
+                    height: spacerHeight
+                    width: parent.width / 3
+                }
+                UM.TooltipArea
+                {
+                    id: materialResolveTooltip
+                    width: parent.width / 3
+                    height: visible ? comboboxHeight : 0
+                    visible: manager.materialConflict
+                    text: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
+                    ComboBox
+                    {
+                        model: resolveStrategiesModel
+                        textRole: "label"
+                        id: materialResolveComboBox
+                        width: parent.width
+                        onActivated:
+                        {
+                            manager.setResolveStrategy("material", resolveStrategiesModel.get(index).key)
+                        }
+                    }
+                }
             }
 
             Repeater
@@ -253,37 +303,6 @@ UM.Dialog
                 }
             }
 
-            Row
-            {
-                width: parent.width
-                height: childrenRect.height
-                visible: manager.materialConflict
-                Item
-                {
-                    width: parent.width / 3 * 2
-                    height: comboboxHeight
-                }
-
-                UM.TooltipArea
-                {
-                    id: materialResolveTooltip
-                    width: parent.width / 3
-                    height: visible ? comboboxHeight : 0
-
-                    text: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
-                    ComboBox
-                    {
-                        model: resolveStrategiesModel
-                        textRole: "label"
-                        id: materialResolveComboBox
-                        width: parent.width
-                        onActivated:
-                        {
-                            manager.setResolveStrategy("material", resolveStrategiesModel.get(index).key)
-                        }
-                    }
-                }
-            }
             Item // Spacer
             {
                 height: spacerHeight

plugins/ChangeLogPlugin/ChangeLog.txt

@@ -1,3 +1,128 @@
+[2.4.0]
+*Project saving & opening
+You can now save your build plate configuration - with all your active machine’s meshes and settings. When you reopen the project file, you’ll find that the build plate configuration and all settings will be exactly as you last left them when you saved the project.
+
+*Setting search
+You can now search the custom settings directly from the side panel, which means you can easily locate the setting you need to tweak. Thanks to community member Aldo Hoeben & LulzBot for this feature.
+
+*Editing start g-code and end g-code
+Aldo Hoeben also added this feature, enabling you to alter both start and end code g-code settings for single extrusion machines.
+
+*Multiply object function
+By right-clicking on an object, you can multiply it by a variable amount, rather than duplicating multiple times. Thanks again to Aldo Hoeben for this feature.
+
+*Ultimaker 3 single extrusion prints
+Dual extrusion printers now allow for single extrusion prints in a larger printable area.
+
+*Streaming printer monitor view
+Ultimaker 3’s camera views no longer only show snapshots. They now show a live stream.
+
+*Explain why slicing is disabled
+When slicing is blocked by settings with error values, a message now appears, clearly indicating which settings need to be changed.
+
+*Ultimaker 3 print profiles
+The initial and final printing temperatures reduce the amount of oozing during PLA-PLA, PLA-PVA and Nylon-PVA prints. This means printing a prime tower is now optional (except for CPE and ABS at the moment). The new Ultimaker 3 printing profiles ensure increased reliability and shorter print time.
+
+*Initial Layer Printing Temperature
+Initial and final printing temperature settings have been tuned for higher quality results.
+
+*Printing temperature of the materials
+The printing temperature of the materials in the material profiles is now the same as the printing temperature for the Normal Quality profile.
+
+*Improved PLA-PVA layer adhesion
+The PVA jerk and acceleration have been optimized to improve the layer adhesion between PVA and PLA.
+
+*Default build plate adhesion type for Nylon
+The default build plate adhesion type for Nylon prints has been changed from raft to brim.
+
+*Support Interface Thickness
+The Support Roof Thickness is now 0.8 mm and PVA support infill has been slightly decreased to lower the printing time.
+
+*Ultimaker 2+ PC prints
+In the polycarbonate profiles, the raft settings for the 0.25 mm and 0.4 mm nozzles are tweaked for less warping.
+
+*Hollow prime tower
+Print the prime tower hollow to minimize material use while maintaining stability. Wiping the oozed material on the prime tower is now done from the inside, which means the excess material is contained within the prime tower.
+
+*Precooling and prewarming
+Printing now starts at a lower temperature, before increasing swiftly to the normal printing temperature. Cooling also starts earlier than the last extrusion (with that print core). This minimizes the material’s heat absorption, which decreases the amount of degradation of the PVA material. This reduces the risk of clogging your nozzles.
+
+*Remove Mesh Intersection
+You are now able to turn off resolving of overlapping meshes. Models can now overlap, so you can perform build plate color mixing, by placing meshes over one another and lowering their flow.
+
+*Alternate Mesh Removal
+For areas where two models overlap, let each layer of the overlapping volume alternate (depending on which object the overlapping area of that layer belongs to). This improves the bonding between dual color models and allows for more controlled build plate color mixing.
+
+*Hollow Object
+Remove the infill from a mesh and treat internal cavities as overhangs, so as to create support in the model’s interior. This experimental setting greatly reduces the amount of material needed on the inside of the print.
+
+*Fill Gaps Between Walls
+Fill up small gaps between consecutive walls, making thin pieces in your model dense, rather than hollow. This feature makes the thin pieces stronger.
+
+*Cubic subdivision infill
+This experimental new infill pattern is similar to cubic infill, but generates bigger cubes farther inside the mesh. This greatly reduces print times and material use, while maintaining structural integrity. Thanks to community members Martin Boerwinckle and Nicholas Seward for this feature.
+
+*Concentric 3D infill
+This new infill pattern is similar to concentric infill, but touches the shell every X layers, creating better support for the top layers.
+
+* Printing Temperature Initial Layer
+Nozzle temperature to be used during the first layer.
+
+*Build Plate Temperature Initial Layer
+Bed temperature to be used during the first layer.
+
+*Initial Fan Speed
+Fan speed to be used during the first layer.
+
+*Retract at Layer Change
+Retract each time the printer progresses to the next layer.
+
+*Outer Wall Wipe Distance
+Wipe the nozzle after printing the outer wall.
+
+*Set X-Y coordinate of z-seam
+Select where to place the Z seam.
+
+*Start Layers with the Same Part
+Start each layer with the part closest to a given location.
+
+*Turn off nozzle after last use
+Turn off the nozzle after its last use, while other nozzles are still in use.
+
+*Option for no build plate adhesion
+Select not to print any build plate adhesion helper parts.
+
+*Anti-overhang and support meshes
+Use a mesh to specify a volume within which to classify nothing as overhang for support or specify a volume within which to print support.
+
+*Delta printer support
+This release adds support for printers with elliptic buildplates. This feature has not been extensively tested so please let us know if it works or get involved in improving it.
+
+*bugfixes
+The user is now notified when a new version of Cura is available.
+When searching in the setting visibility preferences, the category for each setting is always displayed.
+3MF files are now saved and loaded correctly.
+Dragging a profile onto Cura now loads it automatically.
+You can now view which print cores and materials are currently in your Ultimaker 3, via the machine manager.
+You can now add the heated bed upgrade etc. from the machine manager.
+Print core and material is now arranged under extruder tabs.
+Cura now remembers all printers and profiles when you open just after closing it.
+You can now duplicate the standard profiles.
+Layer view now doesn’t use as much RAM.
+It’s now quicker to change the value of the Support Enable setting.
+Changing a setting updates all dependent settings more quickly.
+Having errors in your setting values now always blocks slicing.
+Selecting a model with any active tool no longer causes a reslice.
+The prime poop now introduces a separate area where you cannot print.
+Support Extruder setting is now near the support settings.
+Build Plate Adhesion Extruder setting is now near the build plate adhesion settings.
+Z hop settings have been moved to the Travel category.
+Inactive nozzle wiping on the prime tower is re-enabled.
+There are no more unnecessary retractions in support.
+Each layer now has less extruder switches than the machine has extruders.
+Concentric infill doesn’t generate the first infill perimeter next to the walls.
+Extruder priming now always happens on the first layer.
+
 [2.3.1]
 *Layer Height in Profile Selection
 Added the layer height to the profile selection menu.

plugins/CuraEngineBackend/StartSliceJob.py

@@ -254,7 +254,7 @@ class StartSliceJob(Job):
         for key, value in settings.items(): #Add all submessages for each individual setting.
             setting_message = self._slice_message.getMessage("global_settings").addRepeatedMessage("settings")
             setting_message.name = key
-            if key == "machine_start_gcode" or key == "machine_end_gcode": #If it's a g-code message, use special formatting.
+            if key == "machine_start_gcode" or key == "machine_end_gcode" or key == "machine_extruder_start_code" or key == "machine_extruder_end_code": #If it's a g-code message, use special formatting.
                 setting_message.value = self._expandGcodeTokens(key, value, settings)
             else:
                 setting_message.value = str(value).encode("utf-8")

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -322,7 +322,7 @@ Item {
         id: settingPickDialog
 
         title: catalog.i18nc("@title:window", "Select Settings to Customize for this model")
-        width: screenScaleFactor * 360;
+        width: Screen.devicePixelRatio * 360;
 
         property string labelFilter: ""
 

resources/definitions/fdmprinter.def.json

@@ -3755,7 +3755,7 @@
                             "unit": "mm",
                             "type": "float",
                             "default_value": 2,
-                            "value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(resolveOrValue('prime_tower_size') ** 2 - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height')) if (resolveOrValue('prime_tower_size') ** 2 > max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height')) else 0))",
+                            "value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(max(0, resolveOrValue('prime_tower_size') ** 2 - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height')))))",
                             "resolve": "max(extruderValues('prime_tower_wall_thickness'))",
                             "minimum_value": "0.001",
                             "minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width'))",
@@ -3776,8 +3776,8 @@
                     "default_value": 200,
                     "minimum_value_warning": "-1000",
                     "maximum_value_warning": "1000",
-                    "maximum_value": "machine_width - 0.5 * resolveOrValue('prime_tower_size')",
+                    "maximum_value": "machine_width",
-                    "minimum_value": "0.5 * resolveOrValue('prime_tower_size')",
+                    "minimum_value": "resolveOrValue('prime_tower_size')",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
@@ -3791,8 +3791,8 @@
                     "default_value": 200,
                     "minimum_value_warning": "-1000",
                     "maximum_value_warning": "1000",
-                    "maximum_value": "machine_depth - 0.5 * resolveOrValue('prime_tower_size')",
+                    "maximum_value": "machine_depth - resolveOrValue('prime_tower_size')",
-                    "minimum_value": "0.5 * resolveOrValue('prime_tower_size')",
+                    "minimum_value": "0",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },

resources/i18n/de/fdmextruder.def.json.po

@@ -3,10 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-09-20 17:35+0000\n"
+"POT-Creation-Date: 2016-12-28 10:51+0000\n"
 "PO-Revision-Date: 2016-09-29 13:02+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,9 +69,7 @@ msgstr "Absolute Startposition des Extruders"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs description"
-msgid ""
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
-"Make the extruder starting position absolute rather than relative to the "
-"last-known location of the head."
 msgstr "Bevorzugen Sie eine absolute Startposition des Extruders anstelle einer relativen Position zur zuletzt bekannten Kopfposition."
 
 #: fdmextruder.def.json
@@ -110,9 +109,7 @@ msgstr "Absolute Extruder-Endposition"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs description"
-msgid ""
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-"Make the extruder ending position absolute rather than relative to the last-"
-"known location of the head."
 msgstr "Bevorzugen Sie eine absolute Endposition des Extruders anstelle einer relativen Position zur zuletzt bekannten Kopfposition."
 
 #: fdmextruder.def.json
@@ -142,9 +139,7 @@ msgstr "Z-Position Extruder-Einzug"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z description"
-msgid ""
+msgid "The Z coordinate of the position where the nozzle primes at the start of printing."
-"The Z coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Die Z-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
 
 #: fdmextruder.def.json
@@ -164,9 +159,7 @@ msgstr "X-Position Extruder-Einzug"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x description"
-msgid ""
+msgid "The X coordinate of the position where the nozzle primes at the start of printing."
-"The X coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Die X-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
 
 #: fdmextruder.def.json
@@ -176,7 +169,5 @@ msgstr "Y-Position Extruder-Einzug"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y description"
-msgid ""
+msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
-"The Y coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Die Y-Koordinate der Position, an der die Düse am Druckbeginn einzieht."

resources/i18n/es/fdmextruder.def.json.po

@@ -3,10 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-09-20 17:35+0000\n"
+"POT-Creation-Date: 2016-12-28 10:51+0000\n"
 "PO-Revision-Date: 2016-09-29 13:02+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,9 +69,7 @@ msgstr "Posición de inicio absoluta del extrusor"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs description"
-msgid ""
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
-"Make the extruder starting position absolute rather than relative to the "
-"last-known location of the head."
 msgstr "El extrusor se coloca en la posición de inicio absoluta según la última ubicación conocida del cabezal."
 
 #: fdmextruder.def.json
@@ -110,9 +109,7 @@ msgstr "Posición final absoluta del extrusor"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs description"
-msgid ""
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-"Make the extruder ending position absolute rather than relative to the last-"
-"known location of the head."
 msgstr "La posición final del extrusor se considera absoluta, en lugar de relativa a la última ubicación conocida del cabezal."
 
 #: fdmextruder.def.json
@@ -142,9 +139,7 @@ msgstr "Posición de preparación del extrusor sobre el eje Z"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z description"
-msgid ""
+msgid "The Z coordinate of the position where the nozzle primes at the start of printing."
-"The Z coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Coordenada Z de la posición en la que la tobera queda preparada al inicio de la impresión."
 
 #: fdmextruder.def.json
@@ -164,9 +159,7 @@ msgstr "Posición de preparación del extrusor sobre el eje X"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x description"
-msgid ""
+msgid "The X coordinate of the position where the nozzle primes at the start of printing."
-"The X coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Coordenada X de la posición en la que la tobera se coloca al inicio de la impresión."
 
 #: fdmextruder.def.json
@@ -176,7 +169,5 @@ msgstr "Posición de preparación del extrusor sobre el eje Y"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y description"
-msgid ""
+msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
-"The Y coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Coordenada X de la posición en la que la tobera se coloca al inicio de la impresión."

resources/i18n/fdmextruder.def.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-10-27 11:28+0000\n"
+"POT-Creation-Date: 2016-12-28 10:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"

resources/i18n/fdmprinter.def.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-10-27 11:28+0000\n"
+"POT-Creation-Date: 2016-12-28 10:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
@@ -145,6 +145,27 @@ msgctxt "machine_depth description"
 msgid "The depth (Y-direction) of the printable area."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "machine_shape label"
+msgid "Build plate shape"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_shape description"
+msgid ""
+"The shape of the build plate without taking unprintable areas into account."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_shape option rectangular"
+msgid "Rectangular"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_shape option elliptic"
+msgid "Elliptic"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_height label"
 msgid "Machine height"
@@ -179,7 +200,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_extruder_count label"
-msgid "Number extruders"
+msgid "Number of Extruders"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -232,7 +253,19 @@ msgstr ""
 msgctxt "machine_heat_zone_length description"
 msgid ""
 "The distance from the tip of the nozzle in which heat from the nozzle is "
-"transfered to the filament."
+"transferred to the filament."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_filament_park_distance label"
+msgid "Filament Park Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_filament_park_distance description"
+msgid ""
+"The distance from the tip of the nozzle where to park the filament when an "
+"extruder is no longer used."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -332,6 +365,16 @@ msgctxt "machine_disallowed_areas description"
 msgid "A list of polygons with areas the print head is not allowed to enter."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "nozzle_disallowed_areas label"
+msgid "Nozzle Disallowed Areas"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "nozzle_disallowed_areas description"
+msgid "A list of polygons with areas the nozzle is not allowed to enter."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_head_polygon label"
 msgid "Machine head polygon"
@@ -716,6 +759,18 @@ msgid ""
 "rounded to a whole number."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "wall_0_wipe_dist label"
+msgid "Outer Wall Wipe Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_wipe_dist description"
+msgid ""
+"Distance of a travel move inserted after the outer wall, to hide the Z seam "
+"better."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "top_bottom_thickness label"
 msgid "Top/Bottom Thickness"
@@ -877,6 +932,26 @@ msgid ""
 "already a wall in place."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "fill_perimeter_gaps label"
+msgid "Fill Gaps Between Walls"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "fill_perimeter_gaps description"
+msgid "Fills the gaps between walls where no walls fit."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "fill_perimeter_gaps option nowhere"
+msgid "Nowhere"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "fill_perimeter_gaps option everywhere"
+msgid "Everywhere"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "xy_offset label"
 msgid "Horizontal Expansion"
@@ -900,14 +975,14 @@ msgctxt "z_seam_type description"
 msgid ""
 "Starting point of each path in a layer. When paths in consecutive layers "
 "start at the same point a vertical seam may show on the print. When aligning "
-"these at the back, the seam is easiest to remove. When placed randomly the "
+"these near a user specified location, the seam is easiest to remove. When "
-"inaccuracies at the paths' start will be less noticeable. When taking the "
+"placed randomly the inaccuracies at the paths' start will be less "
-"shortest path the print will be quicker."
+"noticeable. When taking the shortest path the print will be quicker."
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "z_seam_type option back"
-msgid "Back"
+msgid "User Specified"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -920,6 +995,30 @@ msgctxt "z_seam_type option random"
 msgid "Random"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "z_seam_x label"
+msgid "Z Seam X"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "z_seam_x description"
+msgid ""
+"The X coordinate of the position near where to start printing each part in a "
+"layer."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "z_seam_y label"
+msgid "Z Seam Y"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "z_seam_y description"
+msgid ""
+"The Y coordinate of the position near where to start printing each part in a "
+"layer."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_no_small_gaps_heuristic label"
 msgid "Ignore Small Z Gaps"
@@ -1000,6 +1099,11 @@ msgctxt "infill_pattern option cubic"
 msgid "Cubic"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "infill_pattern option cubicsubdiv"
+msgid "Cubic Subdivision"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "infill_pattern option tetrahedral"
 msgid "Tetrahedral"
@@ -1010,11 +1114,43 @@ msgctxt "infill_pattern option concentric"
 msgid "Concentric"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "infill_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "infill_pattern option zigzag"
 msgid "Zig Zag"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "sub_div_rad_mult label"
+msgid "Cubic Subdivision Radius"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "sub_div_rad_mult description"
+msgid ""
+"A multiplier on the radius from the center of each cube to check for the "
+"boundary of the model, as to decide whether this cube should be subdivided. "
+"Larger values lead to more subdivisions, i.e. more small cubes."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "sub_div_rad_add label"
+msgid "Cubic Subdivision Shell"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "sub_div_rad_add description"
+msgid ""
+"An addition to the radius from the center of each cube to check for the "
+"boundary of the model, as to decide whether this cube should be subdivided. "
+"Larger values lead to a thicker shell of small cubes near the boundary of "
+"the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "infill_overlap label"
 msgid "Infill Overlap Percentage"
@@ -1148,6 +1284,19 @@ msgid ""
 "speed of that layer."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "default_material_print_temperature label"
+msgid "Default Printing Temperature"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "default_material_print_temperature description"
+msgid ""
+"The default temperature used for printing. This should be the \"base\" "
+"temperature of a material. All other print temperatures should use offsets "
+"based on this value"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "material_print_temperature label"
 msgid "Printing Temperature"
@@ -1159,6 +1308,42 @@ msgid ""
 "The temperature used for printing. Set at 0 to pre-heat the printer manually."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "material_print_temperature_layer_0 label"
+msgid "Printing Temperature Initial Layer"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "material_print_temperature_layer_0 description"
+msgid ""
+"The temperature used for printing the first layer. Set at 0 to disable "
+"special handling of the initial layer."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "material_initial_print_temperature label"
+msgid "Initial Printing Temperature"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "material_initial_print_temperature description"
+msgid ""
+"The minimal temperature while heating up to the Printing Temperature at "
+"which printing can already start."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "material_final_print_temperature label"
+msgid "Final Printing Temperature"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "material_final_print_temperature description"
+msgid ""
+"The temperature to which to already start cooling down just before the end "
+"of printing."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "material_flow_temp_graph label"
 msgid "Flow Temperature Graph"
@@ -1195,6 +1380,16 @@ msgid ""
 "printer manually."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "material_bed_temperature_layer_0 label"
+msgid "Build Plate Temperature Initial Layer"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "material_bed_temperature_layer_0 description"
+msgid "The temperature used for the heated build plate at the first layer."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "material_diameter label"
 msgid "Diameter"
@@ -1230,6 +1425,16 @@ msgid ""
 "Retract the filament when the nozzle is moving over a non-printed area. "
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "retract_at_layer_change label"
+msgid "Retract at Layer Change"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "retract_at_layer_change description"
+msgid "Retract the filament when the nozzle is moving to the next layer."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "retraction_amount label"
 msgid "Retraction Distance"
@@ -1553,7 +1758,9 @@ msgstr ""
 msgctxt "speed_travel_layer_0 description"
 msgid ""
 "The speed of travel moves in the initial layer. A lower value is advised to "
-"prevent pulling previously printed parts away from the build plate."
+"prevent pulling previously printed parts away from the build plate. The "
+"value of this setting can automatically be calculated from the ratio between "
+"the Travel Speed and the Print Speed."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -1991,9 +2198,7 @@ msgid ""
 "results in slightly longer travel moves but reduces the need for "
 "retractions. If combing is off, the material will retract and the nozzle "
 "moves in a straight line to the next point. It is also possible to avoid "
-"combing over top/bottom skin areas by combing within the infill only. It is "
+"combing over top/bottom skin areas by combing within the infill only."
-"also possible to avoid combing over top/bottom skin areas by combing within "
-"the infill only."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2013,7 +2218,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "travel_avoid_other_parts label"
-msgid "Avoid Printed Parts when Traveling"
+msgid "Avoid Printed Parts When Traveling"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2035,9 +2240,47 @@ msgid ""
 "during travel moves."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "start_layers_at_same_position label"
+msgid "Start Layers with the Same Part"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "start_layers_at_same_position description"
+msgid ""
+"In each layer start with printing the object near the same point, so that we "
+"don't start a new layer with printing the piece which the previous layer "
+"ended with. This makes for better overhangs and small parts, but increases "
+"printing time."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "layer_start_x label"
+msgid "Layer Start X"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "layer_start_x description"
+msgid ""
+"The X coordinate of the position near where to find the part to start "
+"printing each layer."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "layer_start_y label"
+msgid "Layer Start Y"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "layer_start_y description"
+msgid ""
+"The Y coordinate of the position near where to find the part to start "
+"printing each layer."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "retraction_hop_enabled label"
-msgid "Z Hop when Retracted"
+msgid "Z Hop When Retracted"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2156,6 +2399,19 @@ msgid ""
 "maximum fan speed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "cool_fan_speed_0 label"
+msgid "Initial Fan Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "cool_fan_speed_0 description"
+msgid ""
+"The speed at which the fans spin at the start of the print. In subsequent "
+"layers the fan speed is gradually increased up to the layer corresponding to "
+"Regular Fan Speed at Height."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "cool_fan_full_at_height label"
 msgid "Regular Fan Speed at Height"
@@ -2165,7 +2421,8 @@ msgstr ""
 msgctxt "cool_fan_full_at_height description"
 msgid ""
 "The height at which the fans spin on regular fan speed. At the layers below "
-"the fan speed gradually increases from zero to regular fan speed."
+"the fan speed gradually increases from Initial Fan Speed to Regular Fan "
+"Speed."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2358,6 +2615,11 @@ msgctxt "support_pattern option concentric"
 msgid "Concentric"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_pattern option zigzag"
 msgid "Zig Zag"
@@ -2635,6 +2897,11 @@ msgctxt "support_interface_pattern option concentric"
 msgid "Concentric"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_interface_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_pattern option zigzag"
 msgid "Zig Zag"
@@ -2751,6 +3018,11 @@ msgctxt "adhesion_type option raft"
 msgid "Raft"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "adhesion_type option none"
+msgid "None"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "adhesion_extruder_nr label"
 msgid "Build Plate Adhesion Extruder"
@@ -3198,6 +3470,30 @@ msgctxt "prime_tower_size description"
 msgid "The width of the prime tower."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "prime_tower_min_volume label"
+msgid "Prime Tower Minimum Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_tower_min_volume description"
+msgid ""
+"The minimum volume for each layer of the prime tower in order to purge "
+"enough material."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_tower_wall_thickness label"
+msgid "Prime Tower Thickness"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_tower_wall_thickness description"
+msgid ""
+"The thickness of the hollow prime tower. A thickness larger than half the "
+"Prime Tower Minimum Volume will result in a dense prime tower."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "prime_tower_position_x label"
 msgid "Prime Tower X Position"
@@ -3232,7 +3528,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "prime_tower_wipe_enabled label"
-msgid "Wipe Nozzle on Prime Tower"
+msgid "Wipe Inactive Nozzle on Prime Tower"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -3243,15 +3539,16 @@ msgid ""
 msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "multiple_mesh_overlap label"
+msgctxt "dual_pre_wipe label"
-msgid "Dual Extrusion Overlap"
+msgid "Wipe Nozzle After Switch"
 msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "multiple_mesh_overlap description"
+msgctxt "dual_pre_wipe description"
 msgid ""
-"Make the models printed with different extruder trains overlap a bit. This "
+"After switching extruder, wipe the oozed material off of the nozzle on the "
-"makes the different materials bond together better."
+"first thing printed. This performs a safe slow wipe move at a place where "
+"the oozed material causes least harm to the surface quality of your print."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -3308,8 +3605,9 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "meshfix_union_all description"
 msgid ""
-"Ignore the internal geometry arising from overlapping volumes and print the "
+"Ignore the internal geometry arising from overlapping volumes within a mesh "
-"volumes as one. This may cause internal cavities to disappear."
+"and print the volumes as one. This may cause unintended internal cavities to "
+"disappear."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -3352,6 +3650,18 @@ msgid ""
 "everything else fails to produce proper GCode."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "multiple_mesh_overlap label"
+msgid "Merged Meshes Overlap"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "multiple_mesh_overlap description"
+msgid ""
+"Make meshes which are touching each other overlap a bit. This makes them "
+"bond together better."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "carve_multiple_volumes label"
 msgid "Remove Mesh Intersection"
@@ -3360,8 +3670,22 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "carve_multiple_volumes description"
 msgid ""
-"Remove areas where multiple objecs are overlapping with each other. This is "
+"Remove areas where multiple meshes are overlapping with each other. This may "
-"may be used if merged dual material objects overlap with each other."
+"be used if merged dual material objects overlap with each other."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "alternate_carve_order label"
+msgid "Alternate Mesh Removal"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "alternate_carve_order description"
+msgid ""
+"Switch to which mesh intersecting volumes will belong with every layer, so "
+"that the overlapping meshes become interwoven. Turning this setting off will "
+"cause one of the meshes to obtain all of the volume in the overlap, while it "
+"is removed from the other meshes."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -3425,6 +3749,30 @@ msgid ""
 "lower order and normal meshes."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_mesh label"
+msgid "Support Mesh"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_mesh description"
+msgid ""
+"Use this mesh to specify support areas. This can be used to generate support "
+"structure."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "anti_overhang_mesh label"
+msgid "Anti Overhang Mesh"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "anti_overhang_mesh description"
+msgid ""
+"Use this mesh to specify where no part of the model should be detected as "
+"overhang. This can be used to remove unwanted support structure."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "magic_mesh_surface_mode label"
 msgid "Surface Mode"
@@ -3677,6 +4025,17 @@ msgid ""
 "Small widths can lead to unstable support structures."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "infill_hollow label"
+msgid "Hollow Out Objects"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "infill_hollow description"
+msgid ""
+"Remove all infill and make the inside of the object eligible for support."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "magic_fuzzy_skin_enabled label"
 msgid "Fuzzy Skin"
@@ -4040,3 +4399,70 @@ msgid ""
 "which in turn results in less upward connections with the next layer. Only "
 "applies to Wire Printing."
 msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "command_line_settings label"
+msgid "Command Line Settings"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "command_line_settings description"
+msgid ""
+"Settings which are only used if CuraEngine isn't called from the Cura "
+"frontend."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "center_object label"
+msgid "Center object"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "center_object description"
+msgid ""
+"Whether to center the object on the middle of the build platform (0,0), "
+"instead of using the coordinate system in which the object was saved."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mesh_position_x label"
+msgid "Mesh position x"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mesh_position_x description"
+msgid "Offset applied to the object in the x direction."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mesh_position_y label"
+msgid "Mesh position y"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mesh_position_y description"
+msgid "Offset applied to the object in the y direction."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mesh_position_z label"
+msgid "Mesh position z"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mesh_position_z description"
+msgid ""
+"Offset applied to the object in the z direction. With this you can perform "
+"what was used to be called 'Object Sink'."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mesh_rotation_matrix label"
+msgid "Mesh Rotation Matrix"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mesh_rotation_matrix description"
+msgid ""
+"Transformation matrix to be applied to the model when loading it from file."
+msgstr ""

resources/i18n/fi/fdmextruder.def.json.po

@@ -3,10 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-09-20 17:35+0000\n"
+"POT-Creation-Date: 2016-12-28 10:51+0000\n"
 "PO-Revision-Date: 2016-09-29 13:02+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,9 +69,7 @@ msgstr "Suulakkeen aloitussijainti absoluuttinen"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs description"
-msgid ""
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
-"Make the extruder starting position absolute rather than relative to the "
-"last-known location of the head."
 msgstr "Tekee suulakkeen aloitussijainnista absoluuttisen eikä suhteellisen viimeksi tunnettuun pään sijaintiin nähden."
 
 #: fdmextruder.def.json
@@ -110,9 +109,7 @@ msgstr "Suulakkeen lopetussijainti absoluuttinen"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs description"
-msgid ""
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-"Make the extruder ending position absolute rather than relative to the last-"
-"known location of the head."
 msgstr "Tekee suulakkeen lopetussijainnista absoluuttisen eikä suhteellisen viimeksi tunnettuun pään sijaintiin nähden."
 
 #: fdmextruder.def.json
@@ -142,9 +139,7 @@ msgstr "Suulakkeen esitäytön Z-sijainti"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z description"
-msgid ""
+msgid "The Z coordinate of the position where the nozzle primes at the start of printing."
-"The Z coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Z-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."
 
 #: fdmextruder.def.json
@@ -164,9 +159,7 @@ msgstr "Suulakkeen esitäytön X-sijainti"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x description"
-msgid ""
+msgid "The X coordinate of the position where the nozzle primes at the start of printing."
-"The X coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "X-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."
 
 #: fdmextruder.def.json
@@ -176,7 +169,5 @@ msgstr "Suulakkeen esitäytön Y-sijainti"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y description"
-msgid ""
+msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
-"The Y coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Y-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."

resources/i18n/fr/fdmextruder.def.json.po

@@ -3,10 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-09-20 17:35+0000\n"
+"POT-Creation-Date: 2016-12-28 10:51+0000\n"
 "PO-Revision-Date: 2016-09-29 13:02+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,9 +69,7 @@ msgstr "Extrudeuse Position de départ absolue"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs description"
-msgid ""
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
-"Make the extruder starting position absolute rather than relative to the "
-"last-known location of the head."
 msgstr "Rendre la position de départ de l'extrudeuse absolue plutôt que relative à la dernière position connue de la tête."
 
 #: fdmextruder.def.json
@@ -110,9 +109,7 @@ msgstr "Extrudeuse Position de fin absolue"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs description"
-msgid ""
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-"Make the extruder ending position absolute rather than relative to the last-"
-"known location of the head."
 msgstr "Rendre la position de fin de l'extrudeuse absolue plutôt que relative à la dernière position connue de la tête."
 
 #: fdmextruder.def.json
@@ -142,9 +139,7 @@ msgstr "Extrudeuse Position d'amorçage Z"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z description"
-msgid ""
+msgid "The Z coordinate of the position where the nozzle primes at the start of printing."
-"The Z coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Les coordonnées Z de la position à laquelle la buse s'amorce au début de l'impression."
 
 #: fdmextruder.def.json
@@ -164,9 +159,7 @@ msgstr "Extrudeuse Position d'amorçage X"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x description"
-msgid ""
+msgid "The X coordinate of the position where the nozzle primes at the start of printing."
-"The X coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Les coordonnées X de la position à laquelle la buse s'amorce au début de l'impression."
 
 #: fdmextruder.def.json
@@ -176,7 +169,5 @@ msgstr "Extrudeuse Position d'amorçage Y"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y description"
-msgid ""
+msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
-"The Y coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Les coordonnées Y de la position à laquelle la buse s'amorce au début de l'impression."

resources/i18n/it/fdmextruder.def.json.po

@@ -3,10 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-09-20 17:35+0000\n"
+"POT-Creation-Date: 2016-12-28 10:51+0000\n"
 "PO-Revision-Date: 2016-09-29 13:02+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,9 +69,7 @@ msgstr "Assoluto posizione avvio estrusore"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs description"
-msgid ""
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
-"Make the extruder starting position absolute rather than relative to the "
-"last-known location of the head."
 msgstr "Rende la posizione di partenza estrusore assoluta anziché relativa rispetto all’ultima posizione nota della testina."
 
 #: fdmextruder.def.json
@@ -110,9 +109,7 @@ msgstr "Assoluto posizione fine estrusore"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs description"
-msgid ""
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-"Make the extruder ending position absolute rather than relative to the last-"
-"known location of the head."
 msgstr "Rende la posizione di fine estrusore assoluta anziché relativa rispetto all’ultima posizione nota della testina."
 
 #: fdmextruder.def.json
@@ -142,9 +139,7 @@ msgstr "Posizione Z innesco estrusore"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z description"
-msgid ""
+msgid "The Z coordinate of the position where the nozzle primes at the start of printing."
-"The Z coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Indica la coordinata Z della posizione in cui l’ugello si innesca all’avvio della stampa."
 
 #: fdmextruder.def.json
@@ -164,9 +159,7 @@ msgstr "Posizione X innesco estrusore"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x description"
-msgid ""
+msgid "The X coordinate of the position where the nozzle primes at the start of printing."
-"The X coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "La coordinata X della posizione in cui l’ugello si innesca all’avvio della stampa."
 
 #: fdmextruder.def.json
@@ -176,7 +169,5 @@ msgstr "Posizione Y innesco estrusore"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y description"
-msgid ""
+msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
-"The Y coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "La coordinata Y della posizione in cui l’ugello si innesca all’avvio della stampa."

resources/i18n/nl/fdmextruder.def.json.po

@@ -2,11 +2,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: http://github.com/Ultimaker/Cura\n"
+"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-09-20 17:35+0000\n"
+"POT-Creation-Date: 2016-12-28 10:51+0000\n"
 "PO-Revision-Date: 2016-10-11 16:05+0200\n"
 "Last-Translator: Ruben Dulek <r.dulek@ultimaker.com>\n"
 "Language-Team: Ultimaker\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,9 +69,7 @@ msgstr "Absolute Startpositie Extruder"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs description"
-msgid ""
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
-"Make the extruder starting position absolute rather than relative to the "
-"last-known location of the head."
 msgstr "Maak van de startpositie van de extruder de absolute startpositie, in plaats van de relatieve startpositie ten opzichte van de laatst bekende locatie van de printkop."
 
 #: fdmextruder.def.json
@@ -110,9 +109,7 @@ msgstr "Absolute Eindpositie Extruder"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs description"
-msgid ""
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-"Make the extruder ending position absolute rather than relative to the last-"
-"known location of the head."
 msgstr "Maak van de eindpositie van de extruder de absolute eindpositie, in plaats van de relatieve eindpositie ten opzichte van de laatst bekende locatie van de printkop."
 
 #: fdmextruder.def.json
@@ -142,9 +139,7 @@ msgstr "Z-positie voor Primen Extruder"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z description"
-msgid ""
+msgid "The Z coordinate of the position where the nozzle primes at the start of printing."
-"The Z coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "De Z-coördinaat van de positie waar filament in de nozzle wordt geprimet aan het begin van het printen."
 
 #: fdmextruder.def.json
@@ -164,9 +159,7 @@ msgstr "X-positie voor Primen Extruder"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x description"
-msgid ""
+msgid "The X coordinate of the position where the nozzle primes at the start of printing."
-"The X coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "De X-coördinaat van de positie waar filament in de nozzle wordt geprimet aan het begin van het printen."
 
 #: fdmextruder.def.json
@@ -176,7 +169,5 @@ msgstr "Y-positie voor Primen Extruder"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y description"
-msgid ""
+msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
-"The Y coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "De Y-coördinaat van de positie waar filament in de nozzle wordt geprimet aan het begin van het printen."

resources/i18n/tr/fdmextruder.def.json.po

@@ -3,10 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-09-20 17:35+0000\n"
+"POT-Creation-Date: 2016-12-28 10:51+0000\n"
 "PO-Revision-Date: 2016-09-29 13:02+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,9 +69,7 @@ msgstr "Ekstruderin Mutlak Başlangıç Konumu"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs description"
-msgid ""
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
-"Make the extruder starting position absolute rather than relative to the "
-"last-known location of the head."
 msgstr "Ekstruder başlama konumunu, yazıcı başlığının son konumuna göre ayarlamak yerine mutlak olarak ayarlayın."
 
 #: fdmextruder.def.json
@@ -110,9 +109,7 @@ msgstr "Ekstruderin Mutlak Bitiş Konumu"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs description"
-msgid ""
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-"Make the extruder ending position absolute rather than relative to the last-"
-"known location of the head."
 msgstr "Ekstruder bitiş konumunu, yazıcı başlığının son konumuna göre ayarlamak yerine mutlak olarak ayarlayın."
 
 #: fdmextruder.def.json
@@ -142,9 +139,7 @@ msgstr "Ekstruder İlk Z konumu"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z description"
-msgid ""
+msgid "The Z coordinate of the position where the nozzle primes at the start of printing."
-"The Z coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun Z koordinatı."
 
 #: fdmextruder.def.json
@@ -164,9 +159,7 @@ msgstr "Extruder İlk X konumu"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x description"
-msgid ""
+msgid "The X coordinate of the position where the nozzle primes at the start of printing."
-"The X coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun X koordinatı."
 
 #: fdmextruder.def.json
@@ -176,7 +169,5 @@ msgstr "Extruder İlk Y konumu"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y description"
-msgid ""
+msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
-"The Y coordinate of the position where the nozzle primes at the start of "
-"printing."
 msgstr "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun Y koordinatı."

resources/qml/AddMachineDialog.qml

@@ -20,6 +20,11 @@ UM.Dialog
     property string preferredCategory: "Ultimaker"
     property string activeCategory: preferredCategory
 
+    minimumWidth: UM.Theme.getSize("modal_window_minimum").width
+    minimumHeight: UM.Theme.getSize("modal_window_minimum").height
+    width: minimumWidth
+    height: minimumHeight
+
     onVisibilityChanged:
     {
         // Reset selection and machine name

resources/qml/Settings/SettingTextField.qml

@@ -100,7 +100,7 @@ SettingItem
 
             maximumLength: 10;
 
-            validator: RegExpValidator { regExp: (definition.type == "int") ? /^-?[0-9]{0,10}$/ : /^-?[0-9]?[.,]?[0-9]{0,10}$/ } // definition.type property from parent loader used to disallow fractional number entry
+            validator: RegExpValidator { regExp: (definition.type == "int") ? /^-?[0-9]{0,10}$/ : /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } // definition.type property from parent loader used to disallow fractional number entry
 
             Binding
             {

resources/qml/Sidebar.qml

@@ -114,10 +114,28 @@ Rectangle
                 anchors.verticalCenter: parent.verticalCenter
                 style: ButtonStyle {
                     background: Rectangle {
-                        color: control.hovered ? UM.Theme.getColor("button_hover") :
+                        color: {
-                               control.pressed ? UM.Theme.getColor("button_hover") : UM.Theme.getColor("sidebar_header_bar")
+                            if(control.pressed) {
+                                return UM.Theme.getColor("sidebar_header_active");
+                            } else if(control.hovered) {
+                                return UM.Theme.getColor("sidebar_header_hover");
+                            } else {
+                                return UM.Theme.getColor("sidebar_header_bar");
+                            }
+                        }
                         Behavior on color { ColorAnimation { duration: 50; } }
 
+                        Rectangle {
+                            id: underline;
+
+                            anchors.left: parent.left
+                            anchors.right: parent.right
+                            anchors.bottom: parent.bottom
+                            height: UM.Theme.getSize("sidebar_header_highlight").height
+                            color: UM.Theme.getColor("sidebar_header_highlight_hover")
+                            visible: control.hovered || control.pressed
+                        }
+
                         UM.RecolorImage {
                             id: downArrow
                             anchors.verticalCenter: parent.verticalCenter

resources/qml/WorkspaceSummaryDialog.qml

@@ -29,7 +29,6 @@ UM.Dialog
 
     onClosing:
     {
-        UM.Preferences.setValue("cura/asked_dialog_on_project_save", true)
         UM.Preferences.setValue("cura/dialog_on_project_save", !dontShowAgainCheckbox.checked)
     }
 
@@ -37,10 +36,7 @@ UM.Dialog
     {
         if(visible)
         {
-            if (UM.Preferences.getValue("cura/asked_dialog_on_project_save"))
+            dontShowAgain = !UM.Preferences.getValue("cura/dialog_on_project_save")
-            {
-                dontShowAgain = true
-            } else { dontShowAgain = UM.Preferences.setValue("cura/dialog_on_project_save")}
         }
     }
 

resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg

@@ -17,7 +17,7 @@ infill_sparse_density = 22
 speed_print = 30
 speed_layer_0 = =round(speed_print * 30 / 30)
 cool_min_layer_time = 3
-cool_fan_speed_min = 20
+cool_fan_speed_min = =cool_fan_speed * 0.2
 cool_min_speed = 10
 cool_min_layer_time_fan_speed_max = 15
 

resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg

@@ -20,7 +20,7 @@ speed_wall = 40
 speed_topbottom = 30
 speed_travel = 150
 cool_min_layer_time = 3
-cool_fan_speed_min = 20
+cool_fan_speed_min = =cool_fan_speed * 0.2
 cool_min_speed = 10
 cool_min_layer_time_fan_speed_max = 15
 

resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg

@@ -18,7 +18,7 @@ speed_print = 45
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 3
-cool_fan_speed_min = 20
+cool_fan_speed_min = =cool_fan_speed * 0.2
 cool_min_speed = 10
 cool_min_layer_time_fan_speed_max = 15
 

resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg

@@ -18,6 +18,6 @@ speed_print = 45
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 3
-cool_fan_speed_min = 20
+cool_fan_speed_min = =cool_fan_speed * 0.2
 cool_min_speed = 10
 cool_min_layer_time_fan_speed_max = 15

resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg

@@ -18,7 +18,7 @@ speed_print = 40
 speed_layer_0 = =round(speed_print * 30 / 40)
 speed_infill = 55
 cool_min_layer_time = 3
-cool_fan_speed_min = 50
+cool_fan_speed_min = =cool_fan_speed * 0.5
 cool_min_speed = 20
 cool_min_layer_time_fan_speed_max = 20
 

resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg

@@ -17,7 +17,7 @@ infill_sparse_density = 20
 speed_print = 40
 speed_layer_0 = =round(speed_print * 30 / 40)
 cool_min_layer_time = 3
-cool_fan_speed_min = 50
+cool_fan_speed_min = =cool_fan_speed * 0.5
 cool_min_speed = 15
 cool_min_layer_time_fan_speed_max = 25
 

resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg

@@ -17,7 +17,7 @@ infill_sparse_density = 22
 speed_print = 30
 speed_layer_0 = =round(speed_print * 30 / 30)
 cool_min_layer_time = 2
-cool_fan_speed_min = 20
+cool_fan_speed_min = =cool_fan_speed * 0.2
 cool_min_speed = 15
 cool_min_layer_time_fan_speed_max = 15
 

resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg

@@ -19,7 +19,7 @@ speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 40
 speed_travel = 150
 cool_min_layer_time = 3
-cool_fan_speed_min = 80
+cool_fan_speed_min = =cool_fan_speed * 0.8
 cool_min_speed = 10
 cool_min_layer_time_fan_speed_max = 15
 

resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg

@@ -18,6 +18,6 @@ speed_print = 45
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 2
-cool_fan_speed_min = 80
+cool_fan_speed_min = =cool_fan_speed * 0.8
 cool_min_speed = 15
 cool_min_layer_time_fan_speed_max = 15

resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg

@@ -18,7 +18,7 @@ speed_print = 45
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 3
-cool_fan_speed_min = 80
+cool_fan_speed_min = =cool_fan_speed * 0.8
 cool_min_speed = 10
 cool_min_layer_time_fan_speed_max = 15
 

resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg

@@ -17,6 +17,6 @@ infill_sparse_density = 20
 speed_print = 40
 speed_layer_0 = =round(speed_print * 30 / 40)
 cool_min_layer_time = 5
-cool_fan_speed_min = 80
+cool_fan_speed_min = =cool_fan_speed * 0.8
 cool_min_speed = 8
 cool_min_layer_time_fan_speed_max = 20

resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg

@@ -17,6 +17,6 @@ infill_sparse_density = 20
 speed_print = 40
 speed_layer_0 = =round(speed_print * 30 / 40)
 cool_min_layer_time = 3
-cool_fan_speed_min = 80
+cool_fan_speed_min = =cool_fan_speed * 0.8
 cool_min_speed = 8
 cool_min_layer_time_fan_speed_max = 25

resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg

@@ -23,7 +23,7 @@ infill_overlap = 5
 layer_height = 0.2
 raft_interface_line_width = 0.8
 top_bottom_thickness = 1.5
-cool_fan_speed_min = 25
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
 raft_surface_line_width = 0.38
 support_pattern = lines
 support_infill_rate = 20

resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg

@@ -23,7 +23,7 @@ infill_overlap = 5
 layer_height = 0.15
 raft_interface_line_width = 0.8
 top_bottom_thickness = 1.5
-cool_fan_speed_min = 25
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
 raft_surface_line_width = 0.38
 support_pattern = lines
 support_infill_rate = 20

resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg

@@ -26,7 +26,7 @@ layer_height = 0.3
 raft_base_line_spacing = 2.4
 raft_interface_line_width = 1.2
 speed_wall_0 = 20
-cool_fan_speed_min = 25
+cool_fan_speed_min = =cool_fan_speed * 25 / 45
 wall_thickness = 1.14
 support_pattern = lines
 support_infill_rate = 20

resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg

@@ -27,7 +27,7 @@ layer_height = 0.22
 raft_base_line_spacing = 2.4
 raft_interface_line_width = 1.2
 speed_wall_0 = 30
-cool_fan_speed_min = 25
+cool_fan_speed_min = =cool_fan_speed * 25 / 45
 wall_thickness = 1.14
 support_pattern = lines
 support_infill_rate = 20

resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg

@@ -21,7 +21,7 @@ infill_overlap = 5
 layer_height = 0.3
 raft_interface_line_width = 1.6
 top_bottom_thickness = 1.2
-cool_fan_speed_min = 25
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
 brim_line_count = 10
 support_pattern = lines
 support_infill_rate = 20

resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg

@@ -21,7 +21,7 @@ infill_overlap = 5
 layer_height = 0.2
 raft_interface_line_width = 1.6
 top_bottom_thickness = 1.2
-cool_fan_speed_min = 25
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
 brim_line_count = 10
 support_pattern = lines
 support_infill_rate = 20

resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg

@@ -27,7 +27,7 @@ layer_height = 0.06
 raft_interface_line_spacing = 0.7
 speed_support = 40
 top_bottom_thickness = 1.2
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 35 / 60
 wall_thickness = 1
 support_pattern = lines
 support_infill_rate = 20

resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg

@@ -27,7 +27,7 @@ layer_height = 0.1
 raft_interface_line_spacing = 0.7
 speed_support = 40
 top_bottom_thickness = 1.2
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 35 / 60
 wall_thickness = 1
 support_pattern = lines
 support_infill_rate = 20

resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg

@@ -23,7 +23,7 @@ infill_overlap = 5
 layer_height = 0.2
 raft_interface_line_width = 0.8
 top_bottom_thickness = 0.75
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 0.35
 wall_thickness = 1.06
 support_pattern = lines
 support_infill_rate = 25

resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg

@@ -23,7 +23,7 @@ infill_overlap = 5
 layer_height = 0.15
 raft_interface_line_width = 0.8
 top_bottom_thickness = 0.75
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 0.35
 wall_thickness = 1.06
 support_pattern = lines
 support_infill_rate = 25

resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg

@@ -25,7 +25,7 @@ layer_height = 0.3
 raft_interface_line_width = 1.2
 speed_support = 40
 speed_wall_0 = 15
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 0.35
 wall_thickness = 1.2
 support_pattern = lines
 support_infill_rate = 25

resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg

@@ -25,7 +25,7 @@ layer_height = 0.15
 raft_interface_line_width = 1.2
 speed_support = 40
 speed_wall_0 = 15
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 0.35
 wall_thickness = 1.2
 support_pattern = lines
 support_infill_rate = 25

resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg

@@ -27,7 +27,7 @@ layer_height = 0.3
 raft_interface_line_width = 1.6
 speed_support = 40
 speed_wall_0 = 15
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 0.35
 raft_surface_line_width = 0.7
 support_pattern = lines
 support_infill_rate = 25

resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg

@@ -26,7 +26,7 @@ layer_height = 0.2
 raft_interface_line_width = 1.6
 speed_support = 40
 speed_wall_0 = 15
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 0.35
 raft_surface_line_width = 0.7
 support_pattern = lines
 support_infill_rate = 25

resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg

@@ -21,7 +21,7 @@ infill_overlap = 5
 layer_height = 0.5
 raft_interface_line_width = 1.6
 top_bottom_thickness = 2.0
-cool_fan_speed_min = 25
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
 wall_thickness = 2.1
 support_pattern = lines
 support_infill_rate = 20

resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg

@@ -21,7 +21,7 @@ infill_overlap = 5
 layer_height = 0.2
 raft_interface_line_width = 1.6
 top_bottom_thickness = 1.2
-cool_fan_speed_min = 25
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
 wall_thickness = 2.1
 support_pattern = lines
 support_infill_rate = 20

resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg

@@ -31,7 +31,7 @@ cool_fan_speed = 60
 speed_travel = 150
 speed_support = 40
 support_z_distance = 0.45
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 35 / 60
 brim_line_count = 8
 retraction_hop_enabled = 0.2
 speed_wall_x = 38

resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg

@@ -23,7 +23,7 @@ raft_interface_line_spacing = 1
 raft_base_line_spacing = 2
 speed_support = 40
 raft_margin = 12
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 35 / 60
 wall_thickness = 1.05
 support_infill_rate = 25
 speed_topbottom = 35

resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg

@@ -33,7 +33,7 @@ infill_sparse_density = 10
 cool_fan_speed = 60
 speed_support = 40
 support_z_distance = 0.45
-cool_fan_speed_min = 35
+cool_fan_speed_min = =cool_fan_speed * 35 / 60
 brim_line_count = 8
 retraction_hop_enabled = 0.2
 speed_wall_x = 40