Browse Source

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

ChrisTerBeke 7 years ago
parent
commit
c7071c18dd

+ 0 - 1
plugins/CuraEngineBackend/CuraEngineBackend.py

@@ -697,7 +697,6 @@ class CuraEngineBackend(QObject, Backend):
         self._process_layers_job.setBuildPlate(build_plate_number)
         self._process_layers_job.finished.connect(self._onProcessLayersFinished)
         self._process_layers_job.start()
-        del self._stored_optimized_layer_data[build_plate_number]
 
     ##  Called when the user changes the active view mode.
     def _onActiveViewChanged(self):

+ 1 - 1
plugins/MachineSettingsAction/MachineSettingsAction.qml

@@ -390,7 +390,7 @@ Cura.MachineAction
                             visible: Cura.MachineManager.hasMaterials
                             sourceComponent: numericTextFieldWithUnit
                             property string settingKey: "material_diameter"
-                            property string label: catalog.i18nc("@label", "Material diameter")
+                            property string label: catalog.i18nc("@label", "Compatible material diameter")
                             property string unit: catalog.i18nc("@label", "mm")
                             property string tooltip: catalog.i18nc("@tooltip", "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile.")
                             function afterOnEditingFinished()