Merge branch 'master' of https://github.com/RFBomb/Cura

plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml

@@ -330,6 +330,25 @@ Item
                 }
             }
 
+            /* 
+               - Fix for this issue: https://github.com/Ultimaker/Cura/issues/9167 
+               - Allows user to toggle if GCODE coordinates are affected by the extruder offset. 
+               - Machine wide setting. CuraEngine/src/gcodeExport.cpp is not set up to evaluate per extruder currently.
+               - If it is moved to per-extruder (unlikely), then this should be moved to the extruder tab.
+            */
+            Cura.SimpleCheckBox  // "GCode Affected By Extruder Offsets"
+            {
+                id: applyExtruderOffsetsCheckbox
+                containerStackId: machineStackId
+                settingKey: "machine_use_extruder_offset_to_offset_coords"
+                settingStoreIndex: propertyStoreIndex
+                labelText: catalog.i18nc("@label", "Apply Extruder offsets to GCode")
+                labelFont: base.labelFont
+                labelWidth: base.labelWidth
+                forceUpdateOnChangeFunction: forceUpdateFunction
+            }
+			
+			
             /* The "Shared Heater" feature is temporarily disabled because its
             implementation is incomplete. Printers with multiple filaments going
             into one nozzle will keep the inactive filaments retracted at the

resources/definitions/fdmprinter.def.json

@@ -485,7 +485,7 @@
                 "machine_use_extruder_offset_to_offset_coords":
                 {
                     "label": "Offset with Extruder",
-                    "description": "Apply the extruder offset to the coordinate system.",
+                    "description": "Apply the extruder offset to the coordinate system. Affects all extruders.",
                     "type": "bool",
                     "default_value": true,
                     "settable_per_mesh": false,