3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' into libArachne_rebased

Browse source 
Conflicts:
	resources/texts/change_log.txt -> 4.9 got added while we added the Arachne change log as well. I put 4.9 below the Arachne info.
This commit is contained in:
Ghostkeeper 2021-04-08 13:49:52 +02:00
commit b3c03b8771
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
159 changed files with 97951 additions and 93358 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/ApplicationMetadata.py
View file

@ -13,7 +13,7 @@ DEFAULT_CURA_DEBUG_MODE = False
# Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for
# example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the
# CuraVersion.py.in template.
CuraSDKVersion = "7.4.0"
CuraSDKVersion = "7.5.0"
try:
from cura.CuraVersion import CuraAppName # type: ignore