diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py index 5c4b26632a..2a683966db 100644 --- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py +++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py @@ -422,7 +422,8 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): _PRINTER_TYPE_NAME = { "fire_e": "ultimaker_method", "lava_f": "ultimaker_methodx", - "magma_10": "ultimaker_methodxl" + "magma_10": "ultimaker_methodxl", + "sketch": "ultimaker_sketch" } if printer_type in _PRINTER_TYPE_NAME: return _PRINTER_TYPE_NAME[printer_type] diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index 6fe28ef2f2..44c27fda50 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -117,6 +117,7 @@ class FilamentChange(Script): "UltiGCode": "Ultimaker 2", "Griffin": "Griffin", "Makerbot": "Makerbot", + "Sketch": "Sketch", "BFB": "Bits from Bytes", "MACH3": "Mach3", "Repetier": "Repetier" diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index f502678317..d292021f79 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -206,6 +206,7 @@ class PauseAtHeight(Script): "UltiGCode": "Ultimaker 2", "Griffin": "Griffin", "Makerbot": "Makerbot", + "Sketch": "Sketch", "BFB": "Bits from Bytes", "MACH3": "Mach3", "Repetier": "Repetier" diff --git a/plugins/UM3NetworkPrinting/resources/png/MakerBot Sketch.png b/plugins/UM3NetworkPrinting/resources/png/MakerBot Sketch.png new file mode 100644 index 0000000000..2cc52a13ba Binary files /dev/null and b/plugins/UM3NetworkPrinting/resources/png/MakerBot Sketch.png differ diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index b2541f6f82..4ca83772f2 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -331,7 +331,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): return False [printer, *_] = self._printers - return printer.type in ("MakerBot Method X", "MakerBot Method XL") + return printer.type in ("MakerBot Method X", "MakerBot Method XL", "MakerBot Sketch") @pyqtProperty(bool, notify=_cloudClusterPrintersChanged) def supportsPrintJobActions(self) -> bool: diff --git a/plugins/UM3NetworkPrinting/src/Cloud/machine_id_to_name.json b/plugins/UM3NetworkPrinting/src/Cloud/machine_id_to_name.json index 282f05b536..9d0db2a30d 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/machine_id_to_name.json +++ b/plugins/UM3NetworkPrinting/src/Cloud/machine_id_to_name.json @@ -2,5 +2,6 @@ "ultimaker_method": "MakerBot Method", "ultimaker_methodx": "MakerBot Method X", "ultimaker_methodxl": "MakerBot Method XL", - "ultimaker_factor4": "Ultimaker Factor 4" + "ultimaker_factor4": "Ultimaker Factor 4", + "ultimaker_sketch": "MakerBot Sketch" } diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index 073ecf2443..67abb8c85f 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Makerbot Sketch", + "name": "UltiMaker Sketch", "inherits": "ultimaker", "metadata": { diff --git a/resources/images/MakerbotSketch.png b/resources/images/MakerbotSketch.png new file mode 100644 index 0000000000..e615dc6ed1 Binary files /dev/null and b/resources/images/MakerbotSketch.png differ