GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 13:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ChrisTerBeke 2018-01-19 11:33:01 +01:00
commit c7071c18dd
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/CuraEngineBackend/CuraEngineBackend.py
View File

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

2
plugins/MachineSettingsAction/MachineSettingsAction.qml
View File

@ -390,7 +390,7 @@ Cura.MachineAction
visible: Cura.MachineManager.hasMaterials visible: Cura.MachineManager.hasMaterials
sourceComponent: numericTextFieldWithUnit sourceComponent: numericTextFieldWithUnit
property string settingKey: "material_diameter" 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 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.") 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() function afterOnEditingFinished()