3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 15:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' into CURA-8510_version_upgrade

Browse source
This commit is contained in:
Konstantinos Karmas 2021-09-23 17:01:00 +02:00
commit ad6a8d828e
44 changed files with 670 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py
View file

@ -109,9 +109,9 @@ class DigitalFactoryOutputDevice(ProjectOutputDevice):
def _onWriteStarted(self, new_name: Optional[str] = None) -> None:
self._writing = True
if new_name and Version(ApplicationMetadata.CuraSDKVersion) >= Version("7.7.0"):
# setLastOutputName is only supported sdk version 7.7.0 and up
self.setLastOutputName(new_name)
if new_name and Version(ApplicationMetadata.CuraSDKVersion) >= Version("7.8.0"):
# setLastOutputName is only supported in sdk version 7.8.0 and up
self.setLastOutputName(new_name) # On saving, the user can change the name, this should propagate.
self.writeStarted.emit(self)
def _onWriteFinished(self) -> None:

2
plugins/UFPReader/plugin.json
View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Provides support for reading Ultimaker Format Packages.",
"supported_sdk_versions": ["7.7.0"],
"supported_sdk_versions": ["7.8.0"],
"i18n-catalog": "cura"
}

3
plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py
View file

@ -133,6 +133,9 @@ class SendMaterialJob(Job):
except FileNotFoundError:
Logger.error("Unable to send material {material_id}, since it has been deleted in the meanwhile.".format(material_id = material_id))
return
except EnvironmentError as e:
Logger.error(f"Unable to send material {material_id}. We can't open that file for reading: {str(e)}")
return
# Add the material signature file if needed.
signature_file_path = "{}.sig".format(file_path)