3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 15:25:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/5.3'

Browse source 
# Conflicts:
#	conanfile.py
This commit is contained in:
jspijker 2023-03-06 23:13:21 +01:00
commit 4bc11c5138
64 changed files with 14074 additions and 15038 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/CuraApplication.py
View file

@ -2076,3 +2076,7 @@ class CuraApplication(QtApplication):
@classmethod
def getInstance(cls, *args, **kwargs) -> "CuraApplication":
return cast(CuraApplication, super().getInstance(**kwargs))
@pyqtProperty(bool, constant=True)
def isEnterprise(self) -> bool:
return ApplicationMetadata.IsEnterpriseVersion