Merge branch 'master' of https://github.com/Ultimaker/Cura into master-using-platform

This commit is contained in:
Thomas Karl Pietrowski 2016-06-15 14:59:34 +02:00
commit 536e0f489a
33 changed files with 531 additions and 255 deletions

View file

@ -113,9 +113,6 @@ class CuraEngineBackend(Backend):
json_path = Resources.getPath(Resources.DefinitionContainers, "fdmprinter.def.json")
return [Preferences.getInstance().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), "-j", json_path, "-vv"]
def close(self):
self._terminate() # Forcefully shutdown the backend.
## Emitted when we get a message containing print duration and material amount. This also implies the slicing has finished.
# \param time The amount of time the print will take.
# \param material_amount The amount of material the print will use.