Merge branch 'master' of github.com:Ultimaker/cura

This commit is contained in:
Aleksei S 2018-03-21 17:22:24 +01:00
commit feb59f2531
2 changed files with 10 additions and 5 deletions

View File

@ -498,8 +498,13 @@ class CuraApplication(QtApplication):
def getStaticVersion(cls):
return CuraVersion
## Handle removing the unneeded plugins
# \sa PluginRegistry
def _removePlugins(self):
self._plugin_registry.removePlugins()
## Handle loading of all plugin types (and the backend explicitly)
# \sa PluginRegistery
# \sa PluginRegistry
def _loadPlugins(self):
self._plugin_registry.addType("profile_reader", self._addProfileReader)
self._plugin_registry.addType("profile_writer", self._addProfileWriter)

View File

@ -27,18 +27,18 @@ class FilamentChange(Script):
"initial_retract":
{
"label": "Initial Retraction",
"description": "Initial filament retraction distance",
"description": "Initial filament retraction distance. The filament will be retracted with this amount before moving the nozzle away from the ongoing print.",
"unit": "mm",
"type": "float",
"default_value": 300.0
"default_value": 30.0
},
"later_retract":
{
"label": "Later Retraction Distance",
"description": "Later filament retraction distance for removal",
"description": "Later filament retraction distance for removal. The filament will be retracted all the way out of the printer so that you can change the filament.",
"unit": "mm",
"type": "float",
"default_value": 30.0
"default_value": 300.0
}
}
}"""