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

Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7418-update-profile-window

Browse source
This commit is contained in:
Jaime van Kessel 2020-06-15 14:10:20 +02:00
commit f6e9bc7c3c
No known key found for this signature in database
GPG key ID: 3710727397403C91
51 changed files with 697 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/UltimakerCloud/UltimakerCloudAuthentication.py → cura/UltimakerCloud/UltimakerCloudConstants.py
View file

@ -9,6 +9,10 @@ DEFAULT_CLOUD_API_VERSION = "1" # type: str
DEFAULT_CLOUD_ACCOUNT_API_ROOT = "https://account.ultimaker.com" # type: str
DEFAULT_DIGITAL_FACTORY_URL = "https://digitalfactory.ultimaker.com" # type: str
# Container Metadata keys
META_UM_LINKED_TO_ACCOUNT = "um_linked_to_account"
"""(bool) Whether a cloud printer is linked to an Ultimaker account"""
try:
from cura.CuraVersion import CuraCloudAPIRoot # type: ignore
if CuraCloudAPIRoot == "":