Merge branch 'master' into CURA-4248_BAM

This commit is contained in:
ChrisTerBeke 2017-10-18 15:08:51 +02:00
commit 795eda64e3
2 changed files with 3 additions and 5 deletions

View File

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

View File

@ -7,7 +7,8 @@
"visible": true, "visible": true,
"author": "Michael Wildermuth", "author": "Michael Wildermuth",
"manufacturer": "Creality3D", "manufacturer": "Creality3D",
"file_formats": "text/x-gcode" "file_formats": "text/x-gcode",
"preferred_quality": "*Draft*"
}, },
"overrides": { "overrides": {
"machine_width": { "machine_width": {
@ -25,9 +26,6 @@
"machine_nozzle_size": { "machine_nozzle_size": {
"default_value": 0.4 "default_value": 0.4
}, },
"layer_height": {
"default_value": 0.2
},
"layer_height_0": { "layer_height_0": {
"default_value": 0.2 "default_value": 0.2
}, },