3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2

Browse source
This commit is contained in:
Diego Prado Gesto 2018-01-24 16:05:28 +01:00
commit d72e08a3ba
6 changed files with 1867 additions and 2491 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/PluginBrowser/PluginBrowser.py
View file

@ -25,7 +25,7 @@ class PluginBrowser(QObject, Extension):
def __init__(self, parent=None):
super().__init__(parent)
self._api_version = 2
self._api_version = 3
self._api_url = "http://software.ultimaker.com/cura/v%s/" % self._api_version
self._plugin_list_request = None

2
plugins/SliceInfoPlugin/SliceInfo.py
View file

@ -107,7 +107,7 @@ class SliceInfo(Extension):
"brand": extruder.material.getMetaData().get("brand", "")
}
extruder_position = int(extruder.getMetaDataEntry("position", "0"))
if extruder_position in print_information.materialLengths:
if len(print_information.materialLengths) > extruder_position:
extruder_dict["material_used"] = print_information.materialLengths[extruder_position]
extruder_dict["variant"] = extruder.variant.getName()
extruder_dict["nozzle_size"] = extruder.getProperty("machine_nozzle_size", "value")