Merge branch 'master' into feature_curaversion_appname

# Conflicts:
#	cura/CuraApplication.py
This commit is contained in:
fieldOfView 2019-01-18 12:12:36 +01:00
commit 056655e584
1147 changed files with 62054 additions and 12466 deletions

View file

@ -9,3 +9,4 @@ CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False
CuraSDKVersion = "@CURA_SDK_VERSION@"
CuraCloudAPIRoot = "@CURA_CLOUD_API_ROOT@"
CuraCloudAPIVersion = "@CURA_CLOUD_API_VERSION@"
CuraCloudAccountAPIRoot = "@CURA_CLOUD_ACCOUNT_API_ROOT@"