3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Resolve merge conflicts with master

Browse source
This commit is contained in:
Lipu Fei 2019-11-06 12:01:49 +01:00
commit 7c36b6a8ba
67 changed files with 1716 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/CuraApplication.py
View file

@ -720,7 +720,7 @@ class CuraApplication(QtApplication):
## Handle loading of all plugin types (and the backend explicitly)
# \sa PluginRegistry
def _loadPlugins(self) -> None:
self._plugin_registry.setCheckIfTrusted(ApplicationMetadata.CuraIsSecuredVersion)
self._plugin_registry.setCheckIfTrusted(ApplicationMetadata.IsEnterpriseVersion)
self._plugin_registry.addType("profile_reader", self._addProfileReader)
self._plugin_registry.addType("profile_writer", self._addProfileWriter)