Fix merge conflicts, add can_send_raw_gcode ability, rename to sendRawCommand, small fixes

plugins/UM3NetworkPrinting/ClusterUM3PrinterOutputController.py

@@ -13,7 +13,9 @@ class ClusterUM3PrinterOutputController(PrinterOutputController):
     def __init__(self, output_device):
         super().__init__(output_device)
         self.can_pre_heat_bed = False
+        self.can_pre_heat_hotends = False
         self.can_control_manually = False
+        self.can_send_raw_gcode = False
 
     def setJobState(self, job: "PrintJobOutputModel", state: str):
         data = "{\"action\": \"%s\"}" % state