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

Merge branch 'master' into bugfix-toolbox-update

Browse source
This commit is contained in:
Jack Ha 2018-05-15 09:45:14 +02:00
commit c54957540b
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/PrintInformation.py
View file

@ -345,8 +345,8 @@ class PrintInformation(QObject):
except: except:
Logger.log("w", "Unsupported Mime Type Database file extension") Logger.log("w", "Unsupported Mime Type Database file extension")
if data is not None: if data is not None and check_name is not None:
self._base_name = data self._base_name = check_name
else: else:
self._base_name = '' self._base_name = ''

2
plugins/Toolbox/src/Toolbox.py
View file

@ -34,7 +34,7 @@ class Toolbox(QObject, Extension):
self._plugin_registry = Application.getInstance().getPluginRegistry() self._plugin_registry = Application.getInstance().getPluginRegistry()
self._packages_version = self._getPackagesVersion() self._packages_version = self._getPackagesVersion()
self._api_version = 1 self._api_version = 1
self._api_url = "https://api-staging.ultimaker.com/cura-packages/v{api_version}/cura/v{package_version}".format( api_version = self._api_version, package_version = self._packages_version) self._api_url = "https://api.ultimaker.com/cura-packages/v{api_version}/cura/v{package_version}".format( api_version = self._api_version, package_version = self._packages_version)
# Network: # Network:
self._get_packages_request = None self._get_packages_request = None