diff --git a/CNC Controls Dragknife/DragknifeViewModel.cs b/CNC Controls Dragknife/DragknifeViewModel.cs
index fffe548..a8f9cb6 100644
--- a/CNC Controls Dragknife/DragknifeViewModel.cs	
+++ b/CNC Controls Dragknife/DragknifeViewModel.cs	
@@ -1,13 +1,13 @@
 /*
  * DragKnifeViewModel.cs - part of CNC Controls DragKnife library for Grbl
  *
- * v0.40 / 2022-07-12 / Io Engineering (Terje Io)
+ * v0.45 / 2024-10-11 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -159,8 +159,8 @@ private void Transform (List<segment> polyLine, List<GCodeToken> newToolPath)
                 if (i == 0)
                 {
                     end = prev.P1 + n1 * _knifeTipOffset;
-                    newToolPath.Add(new GCLinearMotion(Commands.G0, lnr++, ToPos(end), AxisFlags.XY));
-                    newToolPath.Add(new GCLinearMotion(Commands.G1, lnr++, ToPos(end + new Vector3(0d, 0d, _cutDepth)), AxisFlags.Z));
+                    newToolPath.Add(new GCLinearMotion(Commands.G0, lnr++, ToPos(end), AxisFlags.XY, false));
+                    newToolPath.Add(new GCLinearMotion(Commands.G1, lnr++, ToPos(end + new Vector3(0d, 0d, _cutDepth)), AxisFlags.Z, false));
                 }
 
                 if (Math.Abs(angle) > (i == 0 ? 1d : _swivelAngle) && cp2.Magnitude >= _dentLength)
@@ -171,19 +171,19 @@ private void Transform (List<segment> polyLine, List<GCodeToken> newToolPath)
                     StartDirection = dir;
                     end = end1;
                     var arcdir = n1.X * n2.Y - n1.Y * n2.X;
-                    newToolPath.Add(new GCArc(arcdir < 0d ? Commands.G2 : Commands.G3, lnr++, ToPos(end), AxisFlags.XY, ToPos(dir), IJKFlags.I | IJKFlags.J, 0d, 0, IJKMode.Incremental));
+                    newToolPath.Add(new GCArc(arcdir < 0d ? Commands.G2 : Commands.G3, lnr++, ToPos(end), AxisFlags.XY, ToPos(dir), IJKFlags.I | IJKFlags.J, 0d, 0, IJKMode.Incremental, false));
                 }
                 if (cp2.Magnitude > _knifeTipOffset)
                     end = polyLine[i].P2 + n2 * _knifeTipOffset;
                 else
                     end += cp2;
 
-                newToolPath.Add(new GCLinearMotion((i & 1) == 1 ? Commands.G1 : Commands.G1, lnr++, ToPos(end), AxisFlags.XY));
+                newToolPath.Add(new GCLinearMotion((i & 1) == 1 ? Commands.G1 : Commands.G1, lnr++, ToPos(end), AxisFlags.XY, false));
                 prev = polyLine[i];
 
                 if (i == polyLine.Count - 1)
                 {
-                    newToolPath.Add(new GCLinearMotion(Commands.G0, lnr++, ToPos(end + new Vector3(0d, 0d, -_cutDepth)), AxisFlags.Z));
+                    newToolPath.Add(new GCLinearMotion(Commands.G0, lnr++, ToPos(end + new Vector3(0d, 0d, -_cutDepth)), AxisFlags.Z, false));
                 }
             }
         }
@@ -219,26 +219,26 @@ private void Transformx(List<segment> polyLine, List<GCodeToken> newToolPath)
                     if (i == 0)
                     {
                         //                        start = StartDirection * _knifeTipOffset;
-                        newToolPath.Add(new GCLinearMotion(Commands.G0, lnr++, ToPos(start), AxisFlags.XY));
-                        newToolPath.Add(new GCLinearMotion(Commands.G1, lnr++, ToPos(start + new Vector3(0d, 0d, _cutDepth)), AxisFlags.Z));
+                        newToolPath.Add(new GCLinearMotion(Commands.G0, lnr++, ToPos(start), AxisFlags.XY, false));
+                        newToolPath.Add(new GCLinearMotion(Commands.G1, lnr++, ToPos(start + new Vector3(0d, 0d, _cutDepth)), AxisFlags.Z, false));
                     }
                //     else
 
-                        newToolPath.Add(new GCLinearMotion(Commands.G1, lnr++, ToPos(end), AxisFlags.XY));
+                        newToolPath.Add(new GCLinearMotion(Commands.G1, lnr++, ToPos(end), AxisFlags.XY, false));
 
                     if (Math.Abs(ad) > _swivelAngle && cp2.Magnitude >= _dentLength)
                     {
                         var arcdir = n1.X * n2.Y - n1.Y * n2.X;
                         //                        newToolPath.Add(new GCArc(arcdir < 0d ? Commands.G2 : Commands.G3, lnr++, ToPos(polyLine[i + 1].P1 + offset2), AxisFlags.XY, ToPos(dir), IJKFlags.I | IJKFlags.J, 0d, IJKMode.Incremental));
                         //newToolPath.Add(new GCArc(arcdir < 0d ? Commands.G2 : Commands.G3, lnr++, ToPos(polyLine[i].P1 + offset2), AxisFlags.XY, ToPos(dir), IJKFlags.I | IJKFlags.J, 0d, IJKMode.Incremental));
-                        newToolPath.Add(new GCArc(arcdir < 0d ? Commands.G2 : Commands.G3, lnr++, ToPos(polyLine[i + 1].P1 + offset2), AxisFlags.XY, ToPos(dir), IJKFlags.I | IJKFlags.J, 0d, 0, IJKMode.Incremental));
+                        newToolPath.Add(new GCArc(arcdir < 0d ? Commands.G2 : Commands.G3, lnr++, ToPos(polyLine[i + 1].P1 + offset2), AxisFlags.XY, ToPos(dir), IJKFlags.I | IJKFlags.J, 0d, 0, IJKMode.Incremental, false));
                     }
 
                 }
                 if (i == polyLine.Count - 1)
                 {
-                    newToolPath.Add(new GCLinearMotion(Commands.G1, lnr++, ToPos(polyLine[i].P2 + offset2), AxisFlags.XY));
-                    newToolPath.Add(new GCLinearMotion(Commands.G0, lnr++, ToPos(polyLine[i].P2 + offset2 + new Vector3(0d, 0d, -_cutDepth)), AxisFlags.Z));
+                    newToolPath.Add(new GCLinearMotion(Commands.G1, lnr++, ToPos(polyLine[i].P2 + offset2), AxisFlags.XY, false));
+                    newToolPath.Add(new GCLinearMotion(Commands.G0, lnr++, ToPos(polyLine[i].P2 + offset2 + new Vector3(0d, 0d, -_cutDepth)), AxisFlags.Z, false));
              //       StartDirection = dir;
                 }
                 //                newToolPath.Add(new GCLinearMotion(Commands.G1, (uint)i, new double[] { polyLine[i].P2.X, polyLine[i].P2.Y, polyLine[i].P2.Z }, AxisFlags.XY));
diff --git a/CNC Controls Dragknife/Properties/AssemblyInfo.cs b/CNC Controls Dragknife/Properties/AssemblyInfo.cs
index 6d75f2a..aec7030 100644
--- a/CNC Controls Dragknife/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Dragknife/Properties/AssemblyInfo.cs	
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
 [assembly: AssemblyProduct("ioSender")]
-[assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
+[assembly: AssemblyCopyright("Copyright ©  2024 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.35.0")]
-[assembly: AssemblyFileVersion("2.0.35.0")]
+[assembly: AssemblyVersion("2.0.45.0")]
+[assembly: AssemblyFileVersion("2.0.45.0")]
diff --git a/CNC Controls Lathe/CNC Controls Lathe/TaperControl.xaml.cs b/CNC Controls Lathe/CNC Controls Lathe/TaperControl.xaml.cs
index 13e2364..3d0facf 100644
--- a/CNC Controls Lathe/CNC Controls Lathe/TaperControl.xaml.cs	
+++ b/CNC Controls Lathe/CNC Controls Lathe/TaperControl.xaml.cs	
@@ -1,17 +1,45 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+/*
+ * TaperControl.xaml.cs - part of CNC Controls library
+ *
+ * v0.45 / 2024-04-21 / Io Engineering (Terje Io)
+ *
+ */
+
+/*
+
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+· Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+· Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+· Neither the name of the copyright holder nor the names of its contributors may
+be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace CNC.Controls.Lathe
 {
@@ -20,10 +48,31 @@ namespace CNC.Controls.Lathe
     /// </summary>
     public partial class TaperControl : UserControl
     {
+        public Action<double> OnValueChanged;
+        public Action<bool> OnTaperEnabledChanged;
+
         public TaperControl()
         {
             InitializeComponent();
+
+            data.TextChanged += Data_TextChanged;
+            chkTaper.Checked += ChkTaper_Checked;
+            chkTaper.Unchecked += ChkTaper_Checked;
+        }
+
+        private void ChkTaper_Checked(object sender, RoutedEventArgs e)
+        {
+            OnTaperEnabledChanged?.Invoke(chkTaper.IsChecked == true);
+        }
+
+        private void Data_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            OnValueChanged?.Invoke(double.IsNaN(Value) ? 0d : Value);
         }
+
+      //  public string Format { get { return data.Format;  } }
+
+
         public static readonly DependencyProperty IsTaperEnabledProperty = DependencyProperty.Register(nameof(IsTaperEnabled), typeof(bool), typeof(TaperControl), new PropertyMetadata(/*"Label:"  , new PropertyChangedCallback(OnLabelChanged)*/));
         public bool IsTaperEnabled
         {
@@ -31,6 +80,18 @@ public bool IsTaperEnabled
             set { SetValue(IsTaperEnabledProperty, value); }
         }
 
+        public static readonly DependencyProperty FormatProperty = DependencyProperty.Register(nameof(Format), typeof(string), typeof(TaperControl), new PropertyMetadata("##0", new PropertyChangedCallback(OnFormatChanged)));
+        public string Format
+        {
+            get { return (string)GetValue(FormatProperty); }
+            set { SetValue(FormatProperty, value); }
+        }
+
+        private static void OnFormatChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((TaperControl)d).data.Format = (string)e.NewValue;
+        }
+
         public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(nameof(Value), typeof(double), typeof(TaperControl), new PropertyMetadata(/*"Label:"  , new PropertyChangedCallback(OnLabelChanged)*/));
         public double Value
         {
diff --git a/CNC Controls Lathe/CNC Controls Lathe/TurningLogic.cs b/CNC Controls Lathe/CNC Controls Lathe/TurningLogic.cs
index 68eaea1..5870d78 100644
--- a/CNC Controls Lathe/CNC Controls Lathe/TurningLogic.cs	
+++ b/CNC Controls Lathe/CNC Controls Lathe/TurningLogic.cs	
@@ -1,13 +1,13 @@
 /*
  * TurningLogic.cs - part of CNC Controls Lathe library
  *
- * v0.43 / 2023-06-03 / Io Engineering (Terje Io)
+ * v0.45 / 2024-04-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2023, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -133,8 +133,15 @@ public void Calculate()
             PassCalc cut = new PassCalc(xdistance, passdepth, passdepth_last, model.Precision);
 
             if (model.IsTaperEnabled)
+            {
+                if (model.Taper >= 90d)
+                {
+                    model.SetError(nameof(model.Taper), "Error: taper cannot be >= 90 deg.");
+                    return;
+                }
                 angle = Math.Tan(Math.PI * model.Taper / 180.0d);
-
+                model.ZLength = (xtarget - diameter) / angle * model.config.ZDirection;
+            }
             //  error.Clear();
 
             if (cut.Passes < 1)
@@ -170,15 +177,19 @@ public void Calculate()
                 // TODO: G0 to prev target to keep spindle speed constant?
                 //     if (css)
                 //         code[i++] = string.Format("G0 X{0}", model.FormatValue(doc_prev));
-                model.gCode.Add(string.Format("G1 X{0} F{1}", model.FormatValue(xtarget), model.FormatValue(feedrate)));
                 if (angle != 0.0d)
                 {
                     ztarget = cut.Distance / angle * model.config.ZDirection;
+                    model.gCode.Add(string.Format("G1 X{0} F{1}", model.FormatValue(xtarget -= model.config.ZClearance / model.UnitFactor * angle), model.FormatValue(feedrate)));
                     model.gCode.Add(string.Format("G1 X{0} Z{1}", model.FormatValue(diameter), model.FormatValue(zstart + ztarget)));
+                    model.gCode.Add(string.Format("G0 X{0}", model.FormatValue(diameter + xclearance)));
                 }
                 else
+                {
+                    model.gCode.Add(string.Format("G1 X{0} F{1}", model.FormatValue(xtarget), model.FormatValue(feedrate)));
                     model.gCode.Add(string.Format("G1 Z{0} F{1}", model.FormatValue(ztarget), model.FormatValue(feedrate)));
-                model.gCode.Add(string.Format("G0 X{0}", model.FormatValue(xtarget + xclearance)));
+                    model.gCode.Add(string.Format("G0 X{0}", model.FormatValue(xtarget + xclearance)));
+                }
                 model.gCode.Add(string.Format("G0 Z{0}", model.FormatValue(zstart + model.config.ZClearance / model.UnitFactor)));
 
             } while (++pass <= cut.Passes);
@@ -190,6 +201,8 @@ public void Calculate()
             GCode.File.AddBlock(string.Format("(Passdepth: {0}, Feedrate: {1}, {2}: {3})",
                                         model.FormatValue(passdepth), model.FormatValue(model.FeedRate),
                                          (model.IsCssEnabled ? "CSS" : "RPM"), model.FormatValue((double)model.CssSpeed)), Core.Action.Add);
+            if (angle != 0.0d)
+                GCode.File.AddBlock(string.Format("(Taper length: {0})", model.FormatValue(model.ZLength)));
 
             foreach (string s in model.gCode)
                 GCode.File.AddBlock(s, Core.Action.Add);
diff --git a/CNC Controls Lathe/CNC Controls Lathe/TurningWizard.xaml b/CNC Controls Lathe/CNC Controls Lathe/TurningWizard.xaml
index 707bcb6..98e2cdc 100644
--- a/CNC Controls Lathe/CNC Controls Lathe/TurningWizard.xaml	
+++ b/CNC Controls Lathe/CNC Controls Lathe/TurningWizard.xaml	
@@ -6,8 +6,9 @@
              xmlns:local="clr-namespace:CNC.Controls.Lathe"
              xmlns:Controls="clr-namespace:CNC.Controls;assembly=CNC.Controls.WPF" x:Class="CNC.Controls.Lathe.TurningWizard"
              xmlns:Converters="clr-namespace:CNC.Controls.Lathe"
-             mc:Ignorable="d" 
-             d:DesignHeight="515" d:DesignWidth="875">
+             mc:Ignorable="d"
+             d:DesignHeight="515" d:DesignWidth="875"
+             Loaded="TurningWizard_Load">
     <UserControl.Resources>
         <Controls:StringCollectionToTextConverter x:Key="GCodeConverter"/>
         <Controls:MultiLineConverter x:Key="ErrorMessageConverter" />
@@ -55,7 +56,7 @@
                     <Controls:NumericField x:Name="cvTargetX" Label="Target" Value="{Binding Path=XTarget, Mode=TwoWay}" Style="{StaticResource CNCValue}"/>
                     <Controls:NumericField x:Name="cvClearanceX" Label="Clearance" Value="{Binding Path=XClearance, Mode=TwoWay}" Style="{StaticResource CNCValue}"/>
                 </StackPanel>
-                <local:TaperControl x:Name="taper" Value="{Binding Taper, Mode=TwoWay}" IsTaperEnabled="{Binding IsTaperEnabled, Mode=TwoWay}" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" ToolTip="Degrees from centerline."/>
+                <local:TaperControl x:Name="taper" Value="{Binding Taper, Mode=TwoWay}" Format="#0.##" IsTaperEnabled="{Binding IsTaperEnabled, Mode=TwoWay}" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" ToolTip="Degrees from centerline."/>
             </StackPanel>
         </GroupBox>
         <GroupBox x:Name="groupBox2" Header="Cut depths and feed rates" HorizontalAlignment="Left" Margin="10,185,0,0" VerticalAlignment="Top" Height="95" Width="585">
diff --git a/CNC Controls Lathe/CNC Controls Lathe/TurningWizard.xaml.cs b/CNC Controls Lathe/CNC Controls Lathe/TurningWizard.xaml.cs
index dfe61ff..a6e0c93 100644
--- a/CNC Controls Lathe/CNC Controls Lathe/TurningWizard.xaml.cs	
+++ b/CNC Controls Lathe/CNC Controls Lathe/TurningWizard.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * TurningWizard.xaml.cs - part of CNC Controls library
  *
- * v0.31 / 2021-04-27 / Io Engineering (Terje Io)
+ * v0.45 / 2024-04-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -41,6 +41,7 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 using System.Collections.ObjectModel;
 using System.Windows.Controls;
 using CNC.Core;
+using CNC.GCode;
 
 namespace CNC.Controls.Lathe
 {
@@ -50,7 +51,7 @@ namespace CNC.Controls.Lathe
     public partial class TurningWizard : UserControl, ICNCView
     {
         private bool initOk = false, resetProfileBindings = true;
-        private double last_rpm = 0d, last_css = 0d;
+        private double last_rpm = 0d, last_css = 0d, length = 0d;
         private BaseViewModel model;
         private TurningLogic logic = new TurningLogic();
 
@@ -74,6 +75,8 @@ void TurningWizard_Load(object sender, EventArgs e)
 
             //UIUtils.GroupBoxCaptionBold(groupBox1);
             //UIUtils.GroupBoxCaptionBold(groupBox2);
+            taper.OnValueChanged += taperChanged;
+            taper.OnTaperEnabledChanged += taperEnabled;
         }
 
         public ObservableCollection<string> gCode { get; private set; }
@@ -120,10 +123,39 @@ public void Setup(UIViewModel model, AppConfig profile)
         #endregion
         public void InitUI()
         {
+
         }
 
         public WizardConfig config { get; private set; }
 
+        private void taperEnabled (bool enabled)
+        {
+            if (enabled)
+                length = cvLength.Value;
+            else
+                cvLength.Value = length;
+
+            cvLength.IsEnabled = !enabled;
+        }
+
+        private void taperChanged (double angle)
+        {
+           if(taper.IsTaperEnabled && angle != 0d && Math.Abs(model.XStart - model.XTarget) != 0.0d)
+            {
+                double xtarget = model.XTarget;
+                double diameter = model.XStart;
+
+                if (model.config.xmode == LatheMode.Radius)
+                {
+                    xtarget /= 2.0d;
+                    diameter /= 2.0d;
+                }
+
+                //bool boring = (xtarget - diameter) > 0.0d; ??
+                cvLength.Value = (xtarget - diameter) / Math.Tan(Math.PI * angle / 180.0d) * model.config.ZDirection;
+            }
+        }
+
         private void btnCalculate_Click(object sender, System.Windows.RoutedEventArgs e)
         {
             logic.Calculate();
diff --git a/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj b/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj
index 244f037..2ae0c34 100644
--- a/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj	
+++ b/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj	
@@ -48,6 +48,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -81,10 +83,14 @@
     </Compile>
     <Compile Include="HeightMapViewModel.cs" />
     <Compile Include="IProbeTab.cs" />
+    <Compile Include="MacroDialog.xaml.cs">
+      <DependentUpon>MacroDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ProbeVerify.xaml.cs">
       <DependentUpon>ProbeVerify.xaml</DependentUpon>
     </Compile>
     <Compile Include="ProbingConfig.cs" />
+    <Compile Include="ProbingMacros.cs" />
     <Compile Include="ProbingView.xaml.cs">
       <DependentUpon>ProbingView.xaml</DependentUpon>
     </Compile>
@@ -137,6 +143,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MacroDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ProbeVerify.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -198,6 +208,12 @@
   <ItemGroup>
     <Resource Include="Resources\App.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="App.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\menu_22x22.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs
index 09b0e5c..07dccb9 100644
--- a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * CenterFinderControl.xaml.cs - part of CNC Probing library
  *
- * v0.42 / 2023-03-22 / Io Engineering (Terje Io)
+ * v0.45 / 2024-07-16 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2023, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -410,6 +410,8 @@ private bool OnCompleted()
                     probing.Program.End(ok ? string.Format((string)FindResource("ProbingCompleted"), X_distance.ToInvariantString(), Y_distance.ToInvariantString()) : (string)FindResource("ProbingFailed"));
             }
 
+            probing.Program.OnCompleted?.Invoke(ok);
+
             return ok;
         }
 
diff --git a/CNC Controls Probing/CNC Controls Probing/Converters.cs b/CNC Controls Probing/CNC Controls Probing/Converters.cs
index 0f6352a..661b05b 100644
--- a/CNC Controls Probing/CNC Controls Probing/Converters.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/Converters.cs	
@@ -1,13 +1,13 @@
 /*
  * Converters.cs - part of CNC Probing library
  *
- * v0.43 / 2023-07-29 / Io Engineering (Terje Io)
+ * v0.45 / 2024-07-19 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2023, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -41,6 +41,7 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
+using System.Windows.Media;
 
 namespace CNC.Controls.Probing
 {
@@ -49,6 +50,7 @@ public static class Converters
         public static EnumValueToVisibleConverter EnumValueToVisibleConverter = new EnumValueToVisibleConverter();
         public static OriginToBooleanConverter OriginToBooleanConverter = new OriginToBooleanConverter();
         public static OriginToCurrentPositionConverter OriginToCurrentPositionConverter = new OriginToCurrentPositionConverter();
+        public static ProbingMacroActiveToColorConverter ProbingMacroActiveToColorConverter = new ProbingMacroActiveToColorConverter();
     }
 
     public class EnumValueToVisibleConverter : IMultiValueConverter
@@ -93,4 +95,16 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
             return (bool)value ? OriginControl.Origin.CurrentPos : OriginControl.Origin.None;
         }
     }
+
+    public class ProbingMacroActiveToColorConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is bool && (bool)value ? Brushes.Salmon : System.Windows.SystemColors.ControlBrush;
+        }
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
 }
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml
index 7a9e3e8..b5d8991 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml	
@@ -15,6 +15,7 @@
         <system:String x:Uid="str_edgeFinderFailed" x:Key="ProbingFailed">Probing failed</system:String>
         <system:String x:Uid="str_edgeFinderCompleted" x:Key="ProbingCompleted">Probing completed.</system:String>
         <Controls:LogicalNotConverter x:Key="IsNotRunningConverter" />
+        <Controls:LogicalAndConverter x:Key="LogicalAndConverter"/>
         <Controls:EnumValueToBooleanConverter x:Key="EnumToEdgeConverter" />
         <Controls:BoolToVisibleConverter x:Key="ToVisibleConverter" />
         <local:EnumValueToVisibleConverter x:Key="ZProbeIsVisibleConverter"/>
@@ -72,7 +73,17 @@
             <StackPanel Orientation="Horizontal">
                 <local:CsSelectControl/>
                 <GroupBox x:Uid="grp_workpiece" Header="Workpiece">
-                    <Controls:NumericField x:Uid="lbl_height" Label="Height" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=ProbeZ}" Margin="0,5,85,0" VerticalAlignment="Top"/>
+                    <StackPanel Orientation="Vertical" Margin="0,5,0,5">
+                        <Controls:NumericField x:Uid="lbl_height" Label="Height:" ColonAt="75" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=ProbeZ}" Margin="0,2,0,0" />
+                        <Controls:NumericField x:Uid="lbl_edgeoffsetxy" ColonAt="75" Label="Edge offset:" ToolTip="Set to 0 to use 0.5 x probe/tool diameter" Value="{Binding Path=WorkpieceXYEdgeOffset, Mode=TwoWay}" Margin="0,2,0,0">
+                            <Controls:NumericField.IsEnabled>
+                                <MultiBinding Converter="{StaticResource LogicalAndConverter}">
+                                    <Binding Path="ProbeZ"/>
+                                    <Binding Path="ProbeVerticalEdge"/>
+                                </MultiBinding>
+                            </Controls:NumericField.IsEnabled>
+                        </Controls:NumericField>
+                    </StackPanel>
                 </GroupBox>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs
index 8ed5ae4..d562fa7 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * EdgeFinderControl.xaml.cs - part of CNC Probing library
  *
- * v0.42 / 2023-03-22 / Io Engineering (Terje Io)
+ * v0.45 / 2024-07-19 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2023, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -257,9 +257,10 @@ private void OnCompleted ()
                 if (probing.ProbeZ && axisflags != AxisFlags.Z)
                 {
                     Position pz = new Position(pos);
+                    double xyOffset = probing.WorkpieceXYEdgeOffset == 0d ? probing.ProbeDiameter / 2d : probing.WorkpieceXYEdgeOffset;
 
-                    pz.X += probing.ProbeDiameter / 2d * af[GrblConstants.X_AXIS];
-                    pz.Y += probing.ProbeDiameter / 2d * af[GrblConstants.Y_AXIS];
+                    pz.X += xyOffset * af[GrblConstants.X_AXIS];
+                    pz.Y += xyOffset * af[GrblConstants.Y_AXIS];
                     if ((ok = !isCancelled && probing.GotoMachinePosition(pz, axisflags)))
                     {
                         ok = !isCancelled && probing.WaitForResponse(probing.FastProbe + "Z-" + probing.Depth.ToInvariantString());
@@ -318,6 +319,7 @@ private void OnCompleted ()
                 probing.Grbl.ExecuteCommand(GrblConstants.CMD_GETPARSERSTATE);
 
             probing.Grbl.IsJobRunning = false;
+            probing.Program.OnCompleted?.Invoke(ok);
         }
 
         private void PreviewOnCompleted()
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml
index 617d8f9..476e0bc 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml	
@@ -16,6 +16,7 @@
         <system:String x:Uid="str_edgeIntFinderFailed" x:Key="ProbingFailed">Probing failed</system:String>
         <system:String x:Uid="str_edgeIntFinderCompleted" x:Key="ProbingCompleted">Probing completed.</system:String>
         <Controls:LogicalNotConverter x:Key="IsNotRunningConverter" />
+        <Controls:LogicalAndConverter x:Key="LogicalAndConverter"/>
         <Controls:EnumValueToBooleanConverter x:Key="EnumToEdgeConverter" />
         <Controls:BoolToVisibleConverter x:Key="ToVisibleConverter" />
         <local:EnumValueToVisibleConverter x:Key="ZProbeIsVisibleConverter"/>
@@ -73,7 +74,17 @@
             <StackPanel Orientation="Horizontal">
                 <local:CsSelectControl/>
                 <GroupBox x:Uid="grp_workpiece" Header="Workpiece">
-                    <Controls:NumericField x:Uid="lbl_height" Label="Height" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=ProbeZ}" Margin="0,5,85,0" VerticalAlignment="Top"/>
+                    <StackPanel Orientation="Vertical" Margin="0,5,0,5">
+                        <Controls:NumericField x:Uid="lbl_height" Label="Height:" ColonAt="75" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=ProbeZ}" Margin="0,2,0,0" />
+                        <Controls:NumericField x:Uid="lbl_edgeoffsetxy" ColonAt="75" Label="Edge offset:" ToolTip="Set to 0 to use 0.5 x probe/tool diameter" Value="{Binding Path=WorkpieceXYEdgeOffset, Mode=TwoWay}" Margin="0,2,0,0">
+                            <Controls:NumericField.IsEnabled>
+                                <MultiBinding Converter="{StaticResource LogicalAndConverter}">
+                                    <Binding Path="ProbeZ"/>
+                                    <Binding Path="ProbeVerticalEdge"/>
+                                </MultiBinding>
+                            </Controls:NumericField.IsEnabled>
+                        </Controls:NumericField>
+                    </StackPanel>
                 </GroupBox>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs
index 81d3a5b..0626c13 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * EdgeFinderIntControl.xaml.cs - part of CNC Probing library
  *
- * v0.42 / 2023-03-22 / Io Engineering (Terje Io)
+ * v0.45 / 2024-07-19 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2023, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -246,9 +246,10 @@ private void OnCompleted()
                 if (probing.ProbeZ && axisflags != AxisFlags.Z)
                 {
                     Position pz = new Position(pos);
+                    double xyOffset = probing.WorkpieceXYEdgeOffset == 0d ? probing.ProbeDiameter / 2d : probing.WorkpieceXYEdgeOffset;
 
-                    pz.X += probing.ProbeDiameter / 2d * af[GrblConstants.X_AXIS];
-                    pz.Y += probing.ProbeDiameter / 2d * af[GrblConstants.Y_AXIS];
+                    pz.X += xyOffset * af[GrblConstants.X_AXIS];
+                    pz.Y += xyOffset * af[GrblConstants.Y_AXIS];
                     if ((ok = !isCancelled && probing.GotoMachinePosition(pz, axisflags)))
                     {
                         ok = !isCancelled && probing.WaitForResponse(probing.FastProbe + "Z-" + probing.Depth.ToInvariantString());
@@ -309,6 +310,7 @@ private void OnCompleted()
                 probing.Grbl.ExecuteCommand(GrblConstants.CMD_GETPARSERSTATE);
 
             probing.Grbl.IsJobRunning = false;
+            probing.Program.OnCompleted?.Invoke(ok);
         }
 
         private void PreviewOnCompleted()
diff --git a/CNC Controls Probing/CNC Controls Probing/GCodeTransform.cs b/CNC Controls Probing/CNC Controls Probing/GCodeTransform.cs
index 579d9e9..7f473ab 100644
--- a/CNC Controls Probing/CNC Controls Probing/GCodeTransform.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/GCodeTransform.cs	
@@ -38,7 +38,7 @@ public void ApplyHeightMap(ProbingViewModel model)
             double segmentLength = Math.Min(map.GridX, map.GridY);
             int precision = model.Grbl.Precision;
 
-            GCPlane plane = new GCPlane(GrblParserState.Plane == Plane.XY ? Commands.G17 : Commands.G18, 0);
+            GCPlane plane = new GCPlane(GrblParserState.Plane == Plane.XY ? Commands.G17 : Commands.G18, 0, false);
             DistanceMode distanceMode = GrblParserState.DistanceMode;
             Position position = new Position(model.Grbl.Position, model.Grbl.UnitFactor);
             Vector3 pos = new Vector3(position.X, position.Y, position.Z);
@@ -66,7 +66,7 @@ public void ApplyHeightMap(ProbingViewModel model)
                             {
                                 Vector3 target = new Vector3(Math.Round(subMotion.End.X, precision), Math.Round(subMotion.End.Y, precision), Math.Round(subMotion.End.Z + map.InterpolateZ(subMotion.End.X, subMotion.End.Y), precision));
 
-                                newToolPath.Add(/*last_segment = */new GCLinearMotion(motion.Command, lnr++, target.Array, motion.AxisFlags | AxisFlags.Z));
+                                newToolPath.Add(/*last_segment = */new GCLinearMotion(motion.Command, lnr++, target.Array, motion.AxisFlags | AxisFlags.Z, motion.BlockDelete));
                             }
 //                            if(last_segment != null)
 //                                pos = ToAbsolute(pos, last_segment.Values);
@@ -118,7 +118,7 @@ public void ApplyHeightMap(ProbingViewModel model)
                                         axisFlags &= ~AxisFlags.Z;
                                 }
 
-                                newToolPath.Add(last_segment = new GCArc(arc.Command, lnr++, target.Array, axisFlags, ijk, arc.IjkFlags, arc.R, arc.P, arc.IJKMode));
+                                newToolPath.Add(last_segment = new GCArc(arc.Command, lnr++, target.Array, axisFlags, ijk, arc.IjkFlags, arc.R, arc.P, arc.IJKMode, arc.BlockDelete));
                             }
 //                            if (last_segment != null)
 //                                pos = ToAbsolute(pos, last_segment.Values);
diff --git a/CNC Controls Probing/CNC Controls Probing/HeightMap.cs b/CNC Controls Probing/CNC Controls Probing/HeightMap.cs
index f9f4199..1835537 100644
--- a/CNC Controls Probing/CNC Controls Probing/HeightMap.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/HeightMap.cs	
@@ -189,8 +189,7 @@ public void AddPoint(int x, int y, double height)
             if (height < MinHeight)
                 MinHeight = height;
 
-            if (MapUpdated != null)
-                MapUpdated();
+            MapUpdated?.Invoke();
         }
 
         public static HeightMap Load(string path)
diff --git a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs
index 001865b..29898bf 100644
--- a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * HeightMapControl.xaml.cs - part of CNC Probing library
  *
- * v0.44 / 2023-10-01 / Io Engineering (Terje Io)
+ * v0.45 / 2024-07-16 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2023, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -110,7 +110,7 @@ public void Start(bool preview = false)
             probing.HeightMap.GridSizeX = probing.HeightMap.Map.GridX;
             probing.HeightMap.GridSizeY = probing.HeightMap.Map.GridY;
 
-            int point = 0, points = probing.HeightMap.Map.SizeX * probing.HeightMap.Map.SizeX;
+            int point = 0, points = probing.HeightMap.Map.SizeX * probing.HeightMap.Map.SizeY;
             string pointOf = ((string)FindResource("ProbingPointOf"));
 
             for (x = 0; x < probing.HeightMap.Map.SizeX; x++)
@@ -212,6 +212,8 @@ private void OnCompleted()
 
             if(!ok)
                 probing.Program.End((string)FindResource("ProbingFailed"));
+
+            probing.Program.OnCompleted?.Invoke(ok);
         }
 
         public void Load (string fileName)
diff --git a/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml b/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml
index cf8be12..bf4b967 100644
--- a/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml	
@@ -18,4 +18,5 @@
     <system:String x:Uid="str_probingNoVerifyContinue" x:Key="NoVerifyContinue">Probe connection was not verified, continue anyway?</system:String>
     <system:String x:Uid="str_probingVerifyStart" x:Key="VerifyStart">Press [Start] again to start probing.</system:String>
     <system:String x:Uid="str_probingProbingAtX0Y0" x:Key="ProbingAtX0Y0">Probing @X0Y0...</system:String>
+    <system:String x:Uid="str_macroChangedSave" x:Key="MacroChangedSave">Macro was changed, save?</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml
index c35951f..f30a222 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml	
@@ -24,6 +24,7 @@
                 <Controls:BoolToVisibleConverter />
             </Controls:LogicalNotConverter.FinalConverter>
         </Controls:LogicalNotConverter>
+        <local:ProbingMacroActiveToColorConverter x:Key="ProbingMacroActiveConverter" />
         <Style x:Key="ErrorStyle" TargetType="Controls:NumericField">
             <Style.Triggers>
                 <Trigger Property="Validation.HasError" Value="true">
@@ -122,11 +123,21 @@
                     <local:HeightMapControl HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 </TabItem>
             </TabControl>
-            <TextBlock TextWrapping="Wrap" Height="70" Margin="0,2,0,0" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Top">
-            <Run Text="{Binding Path=Instructions, Mode=OneWay}"/>
-            <LineBreak/>
-            <Run x:Uid="txt_warning" Text="Warning! Use with care - incorrect parameters may damage your probe!" Foreground="Red" FontWeight="Bold"/>
-            </TextBlock>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="125"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Grid.Column="0" TextWrapping="Wrap" Height="70" Margin="0,2,0,0" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Top">
+                <Run Text="{Binding Path=Instructions, Mode=OneWay}"/>
+                <LineBreak/>
+                <Run x:Uid="txt_warning" Text="Warning! Use with care - incorrect parameters may damage your probe!" Foreground="Red" FontWeight="Bold"/>
+                </TextBlock>
+                <Button Content="Pre/post macros" Grid.Column="1" Command="{Binding Macro.OpenDialog}" ToolTip="{Binding Macro.ActiveMacroName}"
+                        IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}"
+                        Background="{Binding Path=Macro.CanDelete, Converter={StaticResource ProbingMacroActiveConverter}}"
+                        HorizontalAlignment="Right" VerticalAlignment="Center" Height="25" Width="125" Margin="0,0,0,0"></Button>
+            </Grid>
         </StackPanel>
     </DockPanel>
 </UserControl>
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs
index 3f21248..5a7a19e 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * ProbingView.xaml.cs - part of CNC Probing library
  *
- * v0.44 / 2023-08-26 / Io Engineering (Terje Io)
+ * v0.45 / 2023-12-20 / Io Engineering (Terje Io)
  *
  */
 
@@ -278,6 +278,7 @@ public void Activate(bool activate, ViewType chgMode)
                 getView(tab.SelectedItem as TabItem)?.Activate(true);
 
                 model.Grbl.PropertyChanged += Grbl_PropertyChanged;
+                model.Grbl.IgnoreNextCycleStart = true;
 
                 probeTriggered = model.Grbl.Signals.Value.HasFlag(Signals.Probe);
                 probeDisconnected = model.Grbl.Signals.Value.HasFlag(Signals.ProbeDisconnected);
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs
index 1b47d7b..7cf56be 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs	
@@ -1,13 +1,13 @@
 /*
  * ProbingViewModel.cs - part of CNC Probing library
  *
- * v0.44 / 2023-10-01 / Io Engineering (Terje Io)
+ * v0.45 / 2024-07-19 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2023, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -81,7 +81,7 @@ public enum CoordMode
 
         private string _message = string.Empty, _tool = string.Empty, _instructions = string.Empty, _position = string.Empty, _probeProgram = string.Empty;
         private string _previewText = string.Empty;
-        private double _tpHeight, _fHeight, _ProbeDiameter, _workpieceSizeX = 0d, _workpieceSizeY = 0d, _workpieceHeight = 0d;
+        private double _tpHeight, _fHeight, _ProbeDiameter, _workpieceSizeX = 0d, _workpieceSizeY = 0d, _workpieceHeight = 0d, _edgeOffsetXY = 0d;
         private double _latchDistance, _latchFeedRate;
         private double _probeDistance, _probeFeedRate;
         private double _rapidsFeedRate;
@@ -397,6 +397,7 @@ public void ClearExeStatus ()
             _isComplete = _isSuccess = false;
         }
 
+        public ProbeMacroViewModel Macro { get; private set; } = new ProbeMacroViewModel();
         public GrblViewModel Grbl { get { return _grblmodel; } private set { _grblmodel = value; OnPropertyChanged(); } }
         public Position StartPosition { get; private set; } = new Position();
         public HeightMapViewModel HeightMap { get; private set; } = new HeightMapViewModel();
@@ -436,6 +437,7 @@ public ProbingType ProbingType
                 OnPropertyChanged(nameof(TouchPlateHeightEnable));
             }
         }
+
         public bool ProbeVerified { get; set; } = false;
         public string FastProbe { get { return string.Format(Probing.Command + "F{0}", ProbeFeedRate.ToInvariantString()); } }
         public string SlowProbe { get { return string.Format(Probing.Command + "F{0}", LatchFeedRate.ToInvariantString()); } }
@@ -466,6 +468,7 @@ public bool ProbeZ
                 OnPropertyChanged();
                 OnPropertyChanged(nameof(TouchPlateHeightEnable));
                 OnPropertyChanged(nameof(XYOffsetEnable));
+                OnPropertyChanged(nameof(ProbeVerticalEdge));
             }
         }
         public string Tool { get { return _tool; } set { _tool = value; OnPropertyChanged(); } }
@@ -563,6 +566,7 @@ public Edge ProbeEdge
                 _edge = value;
                 OnPropertyChanged();
                 OnPropertyChanged(nameof(ProbeDiameterEnable));
+                OnPropertyChanged(nameof(ProbeVerticalEdge));
                 ProbeCorner = _edge == Edge.A || _edge == Edge.B || _edge == Edge.C || _edge == Edge.D;
             }
         }
@@ -602,6 +606,10 @@ public bool ProbeCorner
                 OnPropertyChanged(nameof(XYOffsetEnable));
             }
         }
+        public bool ProbeVerticalEdge
+        {
+            get { return !(_edge == Edge.None || _edge == Edge.Z); }
+        }
         public Center ProbeCenter { get { return _center; } set { _center = value; OnPropertyChanged(); } }
         public bool WorkpiecLockXY
         {
@@ -644,6 +652,6 @@ public double WorkpieceSizeY
             }
         }
         public double WorkpieceHeight { get { return _workpieceHeight; } set { _workpieceHeight = value; OnPropertyChanged(); } }
-
+        public double WorkpieceXYEdgeOffset { get { return _edgeOffsetXY; } set { _edgeOffsetXY = value; OnPropertyChanged(); } }
     }
 }
diff --git a/CNC Controls Probing/CNC Controls Probing/Program.cs b/CNC Controls Probing/CNC Controls Probing/Program.cs
index ef25805..f58fb3e 100644
--- a/CNC Controls Probing/CNC Controls Probing/Program.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/Program.cs	
@@ -1,13 +1,13 @@
 /*
  * Program.cs - part of CNC Probing library
  *
- * v0.44 / 2023-10-01 / Io Engineering (Terje Io)
+ * v0.45 / 2024-12-11 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2023, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -41,6 +41,7 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 using System.Windows;
 using System.Collections.Generic;
 using System.Threading;
+using System.Collections.Concurrent;
 using CNC.Core;
 using CNC.GCode;
 
@@ -72,21 +73,33 @@ public class Program
         ProbingViewModel probing;
         private bool probeProtect = false;
         private volatile bool probeAsserted = false, probeConnected = false;
-        private volatile bool _isComplete = false, isRunning = false, isProbing = false, hasPause = false, probeOnCycleStart = false;
+        private volatile bool _isComplete = false, isRunning = false, cancelling = false, hasPause = false, probeOnCycleStart = false;
         private int step = 0;
-        private volatile string cmd_response;
+        private ConcurrentQueue<string> cmd_response = new ConcurrentQueue<string>();
         private CancellationToken cancellationToken = new CancellationToken();
 
         public bool Silent = false;
+        public Action<bool> OnCompleted;
 
         public Program(ProbingViewModel model)
         {
             Grbl = model.Grbl;
             probing = model;
+            OnCompleted = Completed;
         }
 
         public bool IsCancelled { get; set; }
 
+        private void Completed(bool success)
+        {
+            if (probing.Macro.SelectedMacro != null) {
+                if(success && probing.Macro.PostJobCommands.Length > 0)
+                    Grbl.ExecuteMacro(probing.Macro.PostJobCommands);
+                if (probing.Macro.RunOnce)
+                    probing.Macro.Clear();
+            }
+        }
+
         private void Grbl_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)
@@ -372,7 +385,7 @@ public void End(string message)
 
         public bool Execute(bool go)
         {
-            _isComplete = isProbing = false;
+            _isComplete = false;
 
             probing.ClearExeStatus();
 
@@ -387,34 +400,41 @@ public bool Execute(bool go)
 
                 Comms.com.PurgeQueue();
 
+
                 if (!isRunning)
                 {
                     isRunning = true;
                     probeProtect = GrblInfo.HasSimpleProbeProtect;
 
+                    while (!cmd_response.IsEmpty)
+                        cmd_response.TryDequeue(out response);
+
                     Grbl.OnCommandResponseReceived += ResponseReceived;
                     Grbl.PropertyChanged += Grbl_PropertyChanged;
                     if(hasPause)
                         probing.PropertyChanged += Probing_PropertyChanged;
                 }
 
+                if (probing.Macro.PreJobCommands.Length > 0)
+                    _program.InsertRange(0, probing.Macro.PreJobCommands);
+
+                cancelling = false;
                 Grbl.IsJobRunning = true;
 
+                if (probing.Macro.PreJobCommands.Length > 0)
+                    _program.InsertRange(0, probing.Macro.PreJobCommands);
+
                 if (probing.Message == string.Empty)
                     probing.Message = LibStrings.FindResource("Probing");
 
-                cmd_response = string.Empty;
                 Grbl.ExecuteCommand(_program[step]);
 
                 while (!_isComplete)
                 {
                     EventUtils.DoEvents();
 
-                    if(cmd_response != string.Empty)
+                    if (cmd_response.TryDequeue(out response))
                     {
-                        response = cmd_response;
-                        cmd_response = string.Empty;
-
                         if (Grbl.ResponseLogVerbose)
                             Grbl.ResponseLog.Add("PM:" + response);
 
@@ -422,7 +442,7 @@ public bool Execute(bool go)
                         {
                             if (++step < _program.Count)
                             {
-                                int i;
+                                //int i;
                                 //if ((i = _program[step].IndexOf('$')) > 0)
                                 //{
                                 //    string rp = _program[step].Substring(i, 2);
@@ -439,7 +459,6 @@ public bool Execute(bool go)
 
                                 if (_program[step].StartsWith("!"))
                                 {
-                                    isProbing = false;
                                     _program[step] = _program[step].Substring(1);
                                     probing.RemoveLastPosition();
                                 }
@@ -490,13 +509,16 @@ public bool ProbeZ(double x, double y)
             probing.Program.Add(string.Format("G91F{0}", probing.ProbeFeedRate.ToInvariantString()));
             probing.Program.AddProbingAction(AxisFlags.Z, true);
 
-            return probing.Program.Execute(true);
+            return probing.Program.Execute(true) && probing.Positions.Count == 1;
         }
 
-    private void ResponseReceived(string response)
+        private void ResponseReceived(string response)
         {
-            if(cmd_response != "cancel")
-                cmd_response = response;
+            if (!cancelling)
+                cmd_response.Enqueue(response);
+
+            if (response == "cancel")
+                cancelling = true;
         }
 
         public override string ToString()
diff --git a/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs b/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs
index 3914ed9..1efd9d3 100644
--- a/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs	
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
 [assembly: AssemblyProduct("ioSender")]
-[assembly: AssemblyCopyright("Copyright © 2023 Io Engineering")]
+[assembly: AssemblyCopyright("Copyright © 2024 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.43.0")]
-[assembly: AssemblyFileVersion("2.0.43.0")]
+[assembly: AssemblyVersion("2.0.45.0")]
+[assembly: AssemblyFileVersion("2.0.45.0")]
diff --git a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs
index 15778d0..695b22f 100644
--- a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * RotationControl.xaml.cs - part of CNC Probing library
  *
- * v0.43 / 2023-07-29 / Io Engineering (Terje Io)
+ * v0.45 / 2024-07-16 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2021-2023, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -326,6 +326,7 @@ private void OnCompleted()
                 probing.Grbl.ExecuteCommand(GrblConstants.CMD_GETPARSERSTATE);
 
             probing.Grbl.IsJobRunning = false;
+            probing.Program.OnCompleted?.Invoke(probing.CanApplyTransform);
         }
 
         private void PreviewOnCompleted()
diff --git a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml
index c50ab54..138f96d 100644
--- a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml	
@@ -38,7 +38,7 @@
                     <StackPanel Orientation="Horizontal">
                         <local:CsSelectControl IsEnabled="{Binding Path=AddAction}" Margin="5,0,0,0"/>
                         <GroupBox x:Uid="grp_workpiece" Header="Workpiece">
-                            <Controls:NumericField Label="Height" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=AddAction}" Margin="0,5,85,0" VerticalAlignment="Top"/>
+                            <Controls:NumericField x:Uid="lbl_height" Label="Height:" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=AddAction}" Margin="0,5,85,0" VerticalAlignment="Top"/>
                         </GroupBox>
                     </StackPanel>
                 </StackPanel>
diff --git a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs
index 5d004ac..ba11ace 100644
--- a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * ToolLengthControl.cs - part of CNC Probing library
  *
- * v0.41 / 2023-01-26 / Io Engineering (Terje Io)
+ * v0.45 / 2024-07-16 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2023, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -49,7 +49,8 @@ namespace CNC.Controls.Probing
     /// </summary>
     public partial class ToolLengthControl : UserControl, IProbeTab
     {
-        private Position safeZ = null, g59_3 = null;
+        private Position g59_3 = null;
+        private bool probeFixture = false;
 
         public ToolLengthControl()
         {
@@ -59,12 +60,17 @@ public ToolLengthControl()
 
         public void Activate(bool activate)
         {
+            var probing = DataContext as ProbingViewModel;
+
             if (activate)
             {
-                var probing = DataContext as ProbingViewModel;
                 probing.Instructions = string.Empty;
+                probing.ProbeFixture = probeFixture;
                 if (!probing.Grbl.IsParserStateLive)
                     probing.Grbl.ExecuteCommand(probing.Grbl.IsGrblHAL ? GrblConstants.CMD_GETPARSERSTATE : GrblConstants.CMD_GETNGCPARAMETERS);
+            } else {
+                probeFixture = probing.ProbeFixture;
+                probing.ProbeFixture = false;
             }
         }
 
@@ -182,6 +188,7 @@ private void OnCompleted()
             }
 
             probing.Program.End((string)FindResource(ok ? "ProbingCompleted" : "ProbingFailed"));
+            probing.Program.OnCompleted?.Invoke(ok);
         }
 
         private void clearToolOffset_Click(object sender, RoutedEventArgs e)
diff --git a/CNC Controls/CNC Controls/AppConfig.cs b/CNC Controls/CNC Controls/AppConfig.cs
index 063bd64..8ef1f93 100644
--- a/CNC Controls/CNC Controls/AppConfig.cs	
+++ b/CNC Controls/CNC Controls/AppConfig.cs	
@@ -1,13 +1,13 @@
 /*
  * AppConfig.cs - part of CNC Controls library
  *
- * v0.43 / 2023-07-21 / Io Engineering (Terje Io)
+ * v0.45 / 2024-02-18 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2023, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -593,7 +593,10 @@ public int SetupAndOpen(string appname, GrblViewModel model, System.Windows.Thre
                         {
                             MPGactive = false;
                             if (model.AutoReportInterval > 0)
+                            {
+                                model.AutoReportingEnabled = false;
                                 Comms.com.WriteByte(GrblConstants.CMD_AUTO_REPORTING_TOGGLE);
+                            }
                         }
                     }
                 }
@@ -786,7 +789,7 @@ public RestartResult Restart ()
                             }
                             else
                             {
-                                MessageBox.Show(LibStrings.FindResource("MsgDoorPersist"), "ioSender", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
+                                MessageBox.Show(LibStrings.FindResource("MsgDoorPersist"), "ioSender", MessageBoxButton.OK, MessageBoxImage.Exclamation);
                                 response = string.Empty;
                             }
                             break;
diff --git a/CNC Controls/CNC Controls/ArcsToLines.cs b/CNC Controls/CNC Controls/ArcsToLines.cs
index ba65a72..6c709a6 100644
--- a/CNC Controls/CNC Controls/ArcsToLines.cs	
+++ b/CNC Controls/CNC Controls/ArcsToLines.cs	
@@ -1,13 +1,13 @@
 /*
  * ArcsToLines.cs - part of CNC Controls library for Grbl
  *
- * v0.40 / 2022-07-12 / Io Engineering (Terje Io)
+ * v0.45 / 2024-11-10 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2022, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -70,16 +70,15 @@ public void Apply()
                                 var arc = cmd.Token as GCArc;
                                 lnroffset++;
                                 lnr = arc.LineNumber;
-                                toolPath.Add(new GCComment(Commands.Comment, arc.LineNumber + lnroffset, "Arc to lines start: " + arc.ToString()));
+                                toolPath.Add(new GCComment(Commands.Comment, arc.LineNumber + lnroffset, "Arc to lines start: " + arc.ToString(), arc.BlockDelete));
 
                                 List<Point3D> points = arc.GeneratePoints(emu.Plane, ToPos(cmd.Start, emu.IsImperial), arcTolerance, emu.DistanceMode == DistanceMode.Incremental); // Dynamic resolution
                                 foreach (Point3D point in points)
                                 {
                                     lnroffset++;
-                                    toolPath.Add(new GCLinearMotion(Commands.G1, arc.LineNumber + lnroffset, ToPos(point, emu.IsImperial), AxisFlags.XYZ));
+                                    toolPath.Add(new GCLinearMotion(Commands.G1, arc.LineNumber + lnroffset, ToPos(point, emu.IsImperial), AxisFlags.XYZ, arc.BlockDelete));
                                 }
                                 lnroffset++;
-                                toolPath.Add(new GCComment(Commands.Comment, arc.LineNumber + lnroffset, "Arc to lines end"));
                             }
                             break;
 
@@ -88,16 +87,16 @@ public void Apply()
                                 var spline = cmd.Token as GCCubicSpline;
                                 lnroffset++;
                                 lnr = spline.LineNumber;
-                                toolPath.Add(new GCComment(Commands.Comment, spline.LineNumber + lnroffset, "Spline to lines start: " + spline.ToString()));
+                                toolPath.Add(new GCComment(Commands.Comment, spline.LineNumber + lnroffset, "Spline to lines start: " + spline.ToString(), spline.BlockDelete));
 
                                 List<Point3D> points = spline.GeneratePoints(ToPos(cmd.Start, emu.IsImperial), arcTolerance, emu.DistanceMode == DistanceMode.Incremental); // Dynamic resolution
                                 foreach (Point3D point in points)
                                 {
                                     lnroffset++;
-                                    toolPath.Add(new GCLinearMotion(Commands.G1, spline.LineNumber + lnroffset, ToPos(point, emu.IsImperial), AxisFlags.XYZ));
+                                    toolPath.Add(new GCLinearMotion(Commands.G1, spline.LineNumber + lnroffset, ToPos(point, emu.IsImperial), AxisFlags.XYZ, spline.BlockDelete));
                                 }
                                 lnroffset++;
-                                toolPath.Add(new GCComment(Commands.Comment, lnr, "Spline to lines end"));
+                                toolPath.Add(new GCComment(Commands.Comment, lnr, "Spline to lines end", spline.BlockDelete));
                             }
                             break;
 
@@ -106,16 +105,16 @@ public void Apply()
                                 var spline = cmd.Token as GCQuadraticSpline;
                                 lnroffset++;
                                 lnr = spline.LineNumber;
-                                toolPath.Add(new GCComment(Commands.Comment, spline.LineNumber + lnroffset, "Spline to lines start: " + spline.ToString()));
+                                toolPath.Add(new GCComment(Commands.Comment, spline.LineNumber + lnroffset, "Spline to lines start: " + spline.ToString(), spline.BlockDelete));
 
                                 List<Point3D> points = spline.GeneratePoints(ToPos(cmd.Start, emu.IsImperial), arcTolerance, emu.DistanceMode == DistanceMode.Incremental); // Dynamic resolution
                                 foreach (Point3D point in points)
                                 {
                                     lnroffset++;
-                                    toolPath.Add(new GCLinearMotion(Commands.G1, spline.LineNumber + lnroffset, ToPos(point, emu.IsImperial), AxisFlags.XYZ));
+                                    toolPath.Add(new GCLinearMotion(Commands.G1, spline.LineNumber + lnroffset, ToPos(point, emu.IsImperial), AxisFlags.XYZ, spline.BlockDelete));
                                 }
                                 lnroffset++;
-                                toolPath.Add(new GCComment(Commands.Comment, lnr, "Spline to lines end"));
+                                toolPath.Add(new GCComment(Commands.Comment, lnr, "Spline to lines end", spline.BlockDelete));
                             }
                             break;
 
diff --git a/CNC Controls/CNC Controls/CNC Controls.csproj b/CNC Controls/CNC Controls/CNC Controls.csproj
index 3f2147d..8db00bc 100644
--- a/CNC Controls/CNC Controls/CNC Controls.csproj	
+++ b/CNC Controls/CNC Controls/CNC Controls.csproj	
@@ -221,7 +221,6 @@
     <Compile Include="THCMonitorControl.xaml.cs">
       <DependentUpon>THCMonitorControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Themes\ThemeColors.cs" />
     <Compile Include="ToolView.xaml.cs">
       <DependentUpon>ToolView.xaml</DependentUpon>
     </Compile>
@@ -455,30 +454,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Themes\BlackTheme.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\DarkTheme.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Dictionary.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\LightTheme.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\StandardTheme.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\WhiteTheme.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="ToolView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/CNC Controls/CNC Controls/DROControl.xaml.cs b/CNC Controls/CNC Controls/DROControl.xaml.cs
index 986f494..98b2fa1 100644
--- a/CNC Controls/CNC Controls/DROControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/DROControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * DROControl.xaml.cs - part of CNC Controls library
  *
- * v0.42 / 2023-02-14 / Io Engineering (Terje Io)
+ * v0.45 / 2024-07-16 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2023, Io Engineering (Terje Io)
+Copyright (c) 2018-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -83,6 +83,9 @@ public void EnableFocus()
 
         private void DRO_Loaded(object sender, RoutedEventArgs e)
         {
+            if (System.ComponentModel.DesignerProperties.GetIsInDesignMode(this))
+                return;
+
             if (!keyboardMappingsOk && DataContext is GrblViewModel)
             {
                 KeypressHandler keyboard = (DataContext as GrblViewModel).Keyboard;
@@ -218,15 +221,23 @@ private bool ZeroC(Key key)
 
         void AxisPositionChanged(string axis, double position)
         {
+            if (GrblParserState.IsMetric != (DataContext as GrblViewModel).IsMetric)
+            {
+                if(GrblParserState.IsMetric)
+                    position *= MeasureViewModel.MM_PER_INCH;
+                else
+                    position /= MeasureViewModel.MM_PER_INCH;
+            }
+
             if (axis == "ALL")
             {
                 string s = "G90G10L20P0";
                 foreach (int i in GrblInfo.AxisFlags.ToIndices())
                     s += GrblInfo.AxisIndexToLetter(i) + "{0}";
-                (DataContext as GrblViewModel).ExecuteCommand(string.Format(s, position.ToInvariantString("F3")));
+                (DataContext as GrblViewModel).ExecuteCommand(string.Format(s, position.ToInvariantString(GrblParserState.IsMetric ? "F3" : "F4")));
             }
             else
-                (DataContext as GrblViewModel).ExecuteCommand(string.Format("G10L20P0{0}{1}", axis, position.ToInvariantString("F3")));
+                (DataContext as GrblViewModel).ExecuteCommand(string.Format("G10L20P0{0}{1}", axis, position.ToInvariantString(GrblParserState.IsMetric ? "F3" : "F4")));
         }
     }
 }
diff --git a/CNC Controls/CNC Controls/GCodeRotate.cs b/CNC Controls/CNC Controls/GCodeRotate.cs
index b6c21d3..a23c76b 100644
--- a/CNC Controls/CNC Controls/GCodeRotate.cs	
+++ b/CNC Controls/CNC Controls/GCodeRotate.cs	
@@ -1,13 +1,13 @@
 /*
  * GCodeRotate.cs - part of CNC Controls library for Grbl
  *
- * v0.40 / 2022-07-12 / Io Engineering (Terje Io)
+ * v0.45 / 2024-10-11 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2021-2022, Io Engineering (Terje Io)
+Copyright (c) 2021-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -63,7 +63,7 @@ public void ApplyRotation(double angle, Vector3 offset, bool compress = false)
         {
             uint G53lnr = 0;
             int precision = GCode.File.Decimals;
-            GCPlane plane = new GCPlane(GrblParserState.Plane == Plane.XY ? Commands.G17 : Commands.G18, 0);
+            GCPlane plane = new GCPlane(GrblParserState.Plane == Plane.XY ? Commands.G17 : Commands.G18, 0, false);
             DistanceMode distanceMode = GrblParserState.DistanceMode;
             Vector3 pos = new Vector3(Grbl.GrblViewModel.Position.X, Grbl.GrblViewModel.Position.Y, Grbl.GrblViewModel.Position.Z);
             List<GCodeToken> toolPath = new List<GCodeToken>();
@@ -107,13 +107,13 @@ public void ApplyRotation(double angle, Vector3 offset, bool compress = false)
                                 else
                                     pos = target;
 
-                                toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, target.Array, motion.AxisFlags));
+                                toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, target.Array, motion.AxisFlags, motion.BlockDelete));
 
                             }
                             else
                             {
                                 G53lnr = 0;
-                                toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, motion.Values, motion.AxisFlags));
+                                toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, motion.Values, motion.AxisFlags, motion.BlockDelete));
                             }
                         }
                         break;
@@ -140,7 +140,7 @@ public void ApplyRotation(double angle, Vector3 offset, bool compress = false)
 
                             pos = target;
 
-                            toolPath.Add(new GCArc(arc.Command, arc.LineNumber, pos.Array, arc.AxisFlags, targetijk.Array, arc.IjkFlags, arc.R, arc.P, arc.IJKMode));
+                            toolPath.Add(new GCArc(arc.Command, arc.LineNumber, pos.Array, arc.AxisFlags, targetijk.Array, arc.IjkFlags, arc.R, arc.P, arc.IJKMode, arc.BlockDelete));
                         }
                         break;
 
@@ -151,7 +151,7 @@ public void ApplyRotation(double angle, Vector3 offset, bool compress = false)
                             var ij = new Vector3(spline.I, spline.J, 0d).RotateZ(offset.X, offset.Y, angle).Round(precision);
                             var pq = new Vector3(spline.P, spline.Q, 0d).RotateZ(offset.X, offset.Y, angle).Round(precision);
 
-                            toolPath.Add(new GCCubicSpline(spline.Command, spline.LineNumber, pos.Array, spline.AxisFlags, new double[] { ij.X, ij.Y, pq.X, pq.Y }));
+                            toolPath.Add(new GCCubicSpline(spline.Command, spline.LineNumber, pos.Array, spline.AxisFlags, new double[] { ij.X, ij.Y, pq.X, pq.Y }, spline.BlockDelete));
                         }
                         break;
 
@@ -161,7 +161,7 @@ public void ApplyRotation(double angle, Vector3 offset, bool compress = false)
                             pos = new Vector3(spline.X, spline.Y, 0d).RotateZ(offset.X, offset.Y, angle).Round(precision);
                             var ij = new Vector3(spline.I, spline.J, 0d).RotateZ(offset.X, offset.Y, angle).Round(precision);
 
-                            toolPath.Add(new GCQuadraticSpline(spline.Command, spline.LineNumber, pos.Array, spline.AxisFlags, new double[] { ij.X, ij.Y }));
+                            toolPath.Add(new GCQuadraticSpline(spline.Command, spline.LineNumber, pos.Array, spline.AxisFlags, new double[] { ij.X, ij.Y }, spline.BlockDelete));
                         }
                         break;
 
@@ -199,7 +199,7 @@ public void ApplyRotation(double angle, Vector3 offset, bool compress = false)
                             else
                                 pos = target;
 
-                            toolPath.Add(new GCCannedDrill(drill.Command, drill.LineNumber, target.Round(precision).Array, drill.AxisFlags, drill.R, drill.L, drill.P, drill.Q));
+                            toolPath.Add(new GCCannedDrill(drill.Command, drill.LineNumber, target.Round(precision).Array, drill.AxisFlags, drill.R, drill.L, drill.P, drill.Q, drill.BlockDelete));
                         }
                         break;
 
diff --git a/CNC Controls/CNC Controls/GCodeWrap.cs b/CNC Controls/CNC Controls/GCodeWrap.cs
index f451675..fbb9da6 100644
--- a/CNC Controls/CNC Controls/GCodeWrap.cs	
+++ b/CNC Controls/CNC Controls/GCodeWrap.cs	
@@ -1,13 +1,13 @@
 /*
  * GCodeWrap.cs - part of CNC Controls library for Grbl
  *
- * v0.37 / 2022-02-19 / Io Engineering (Terje Io)
+ * v0.45 / 2024-10-11 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2022, Io Engineering (Terje Io)
+Copyright (c) 2022-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -68,7 +68,7 @@ public void ApplyWrap(GCodeWrapViewModel model, bool compress = false)
             int precision = GCode.File.Decimals;
             double feedrate_pgm = 0d, feedrate = 0d, feedrate_cur = 0d;
             string hdr = string.Format("Wrap applied, diameter: {0}, {1}-axis to {2}-axis", model.Diameter.ToInvariantString(), GrblInfo.AxisIndexToLetter(model.SourceAxis), GrblInfo.AxisIndexToLetter(model.TargetAxis));
-            GCPlane plane = new GCPlane(GrblParserState.Plane == Plane.XY ? Commands.G17 : Commands.G18, 0);
+            GCPlane plane = new GCPlane(GrblParserState.Plane == Plane.XY ? Commands.G17 : Commands.G18, 0, false);
             DistanceMode distanceMode = GrblParserState.DistanceMode;
             FeedRateMode feedRateMode = GrblParserState.FeedRateMode;
             AxisFlags targetAxis = GrblInfo.AxisIndexToFlag(model.TargetAxis);
@@ -151,19 +151,19 @@ public void ApplyWrap(GCodeWrapViewModel model, bool compress = false)
                                         if (feedRateMode != FeedRateMode.UnitsPerMin)
                                         {
                                             feedrate_cur = 0d;
-                                            toolPath.Add(new GCFeedRateMode(motion.LineNumber, feedRateMode = FeedRateMode.UnitsPerMin));
+                                            toolPath.Add(new GCFeedRateMode(motion.LineNumber, feedRateMode = FeedRateMode.UnitsPerMin, motion.BlockDelete));
                                         }
                                         if (feedrate_cur != feedrate)
-                                            toolPath.Add(new GCFeedrate(motion.LineNumber, feedrate_cur = feedrate));
+                                            toolPath.Add(new GCFeedrate(motion.LineNumber, feedrate_cur = feedrate, motion.BlockDelete));
                                     }
                                     else
                                     {
                                         if (feedRateMode != FeedRateMode.InverseTime)
-                                            toolPath.Add(new GCFeedRateMode(motion.LineNumber, feedRateMode = FeedRateMode.InverseTime));
-                                        toolPath.Add(new GCFeedrate(motion.LineNumber, Math.Round(feedrate_pgm / dist, 1)));
+                                            toolPath.Add(new GCFeedRateMode(motion.LineNumber, feedRateMode = FeedRateMode.InverseTime, motion.BlockDelete));
+                                        toolPath.Add(new GCFeedrate(motion.LineNumber, Math.Round(feedrate_pgm / dist, 1), motion.BlockDelete));
                                     }
 
-                                    toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, newpos.Array, motion.AxisFlags));
+                                    toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, newpos.Array, motion.AxisFlags, motion.BlockDelete));
                                     pos.Set(newpos.Array, motion.AxisFlags, distanceMode == DistanceMode.Incremental);
                                 }
                                 else
@@ -174,21 +174,21 @@ public void ApplyWrap(GCodeWrapViewModel model, bool compress = false)
                                     if (feedRateMode != FeedRateMode.UnitsPerMin)
                                     {
                                         feedrate_cur = 0d;
-                                        toolPath.Add(new GCFeedRateMode(motion.LineNumber, feedRateMode = FeedRateMode.UnitsPerMin));
+                                        toolPath.Add(new GCFeedRateMode(motion.LineNumber, feedRateMode = FeedRateMode.UnitsPerMin, motion.BlockDelete));
                                     }
 
                                     if (feedrate_cur != feedrate_pgm)
-                                        toolPath.Add(new GCFeedrate(motion.LineNumber, feedrate_cur = feedrate_pgm));
+                                        toolPath.Add(new GCFeedrate(motion.LineNumber, feedrate_cur = feedrate_pgm, motion.BlockDelete));
 
                                     G53lnr = 0;
-                                    toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, newpos.Array, motion.AxisFlags));
+                                    toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, newpos.Array, motion.AxisFlags, motion.BlockDelete));
                                     pos.Set(newpos.Array, motion.AxisFlags, distanceMode == DistanceMode.Incremental);
                                 }
                             }
                             else // G0
                             {
                                 G53lnr = 0;
-                                toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, newpos.Array, motion.AxisFlags));
+                                toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, newpos.Array, motion.AxisFlags, motion.BlockDelete));
                                 pos.Set(newpos.Array, motion.AxisFlags, distanceMode == DistanceMode.Incremental);
                             }
                         }
diff --git a/CNC Controls/CNC Controls/GrblConfigView.xaml b/CNC Controls/CNC Controls/GrblConfigView.xaml
index 5f500d6..dd2416d 100644
--- a/CNC Controls/CNC Controls/GrblConfigView.xaml	
+++ b/CNC Controls/CNC Controls/GrblConfigView.xaml	
@@ -17,6 +17,7 @@
         <system:String x:Uid="str_settingsFail" x:Key="SettingsFail">Bummer...\nContinue loading?</system:String>
         <system:String x:Uid="str_settingsInvalid" x:Key="SettingsInvalid">The file does not contain any settings.</system:String>
         <system:String x:Uid="str_settingsRestore" x:Key="SettingsRestore">Restore settings from file</system:String>
+        <system:String x:Uid="str_settingsReloadMismatch" x:Key="SettingsReloadMismatch">{0} settings were ignored, not supported by the controller.</system:String>
         <local:LogicalNotConverter x:Key="IsNotConverter" />
         <local:GrblStateToBooleanConverter x:Key="StateToBooleanConverter" />
         <Style x:Key="NumericErrorStyle" TargetType="local:NumericTextBox">
diff --git a/CNC Controls/CNC Controls/GrblConfigView.xaml.cs b/CNC Controls/CNC Controls/GrblConfigView.xaml.cs
index 92620f9..91db2b8 100644
--- a/CNC Controls/CNC Controls/GrblConfigView.xaml.cs	
+++ b/CNC Controls/CNC Controls/GrblConfigView.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * GrblConfigView.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
+ * v0.45 / 2024-11-08 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2023, Io Engineering (Terje Io)
+Copyright (c) 2018-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -214,7 +214,7 @@ private bool SetSetting (KeyValuePair<int, string> setting)
 
         public bool LoadFile(string filename)
         {
-            int pos, id;
+            int pos, id, mismatch = 0;
             List<string> lines = new List<string>();
             List<int> dep = new List<int>();
             Dictionary<int, string> settings = new Dictionary<int, string>();
@@ -296,23 +296,35 @@ public bool LoadFile(string filename)
                 {
                     if (settings.ContainsKey(d))
                     {
-                        if (!SetSetting(new KeyValuePair<int, string>(d, settings[d])))
+                        var setting = new KeyValuePair<int, string>(d, settings[d]);
+                        if (GrblSettings.HasSetting((GrblSetting)setting.Key))
                         {
-                            settings.Clear();
-                            break;
+                            if (!SetSetting(setting))
+                            {
+                                settings.Clear();
+                                break;
+                            }
                         }
+                        else
+                            mismatch++;
                     }
                 }
 
                 foreach (var setting in settings)
                 {
-                    if (!dep.Contains(setting.Key)) {
-                        if(!SetSetting(setting))
-                            break;
+                    if (GrblSettings.HasSetting((GrblSetting)setting.Key))
+                    {
+                        if (!dep.Contains(setting.Key))
+                        {
+                            if (!SetSetting(setting))
+                                break;
+                        }
                     }
+                    else
+                        mismatch++;
                 }
 
-                if (lines[0] == "%")
+                if (lines.Count > 0 && lines[0] == "%")
                     Comms.com.WriteCommand("%");
 
                 using (new UIUtils.WaitCursor())
@@ -323,6 +335,9 @@ public bool LoadFile(string filename)
 
             model.Message = string.Empty;
 
+            if (mismatch > 0)
+                MessageBox.Show(string.Format((string)FindResource("SettingsReloadMismatch"), mismatch), "ioSender", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+
             return settings.Count > 0;
         }
 
diff --git a/CNC Controls/CNC Controls/JobControl.xaml.cs b/CNC Controls/CNC Controls/JobControl.xaml.cs
index 78ab565..d3ef327 100644
--- a/CNC Controls/CNC Controls/JobControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/JobControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * JobControl.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.44 / 2023-12-20 / Io Engineering (Terje Io)
+ * v0.45 / 2023-06-04 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2023, Io Engineering (Terje Io)
+Copyright (c) 2018-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -74,7 +74,7 @@ private struct StreamingHandlerFn
         private struct JobData
         {
             public int CurrBlock, PendingLine, PgmEndLine, ToolChangeLine, ACKPending, serialUsed;
-            public bool Started, Transferred, Complete, IsSDFile, IsChecking, HasError;
+            public bool Started, Transferred, Complete, IsSDFile, IsChecking, HasError, Stopped, ToolChanged;
             public DataRow CurrentRow, NextRow;
         }
 
@@ -204,9 +204,18 @@ private void JobControl_DataContextChanged(object sender, DependencyPropertyChan
                 model.OnRealtimeStatusProcessed += RealtimeStatusProcessed;
                 model.OnCommandResponseReceived += ResponseReceived;
                 model.OnCycleStart += OnCycleStart;
+                model.OnStop += OnStop;
                 GCode.File.Model = model;
             }
         }
+
+        private void OnStop(object sender, EventArgs e)
+        {
+            JobTimer.Stop();
+            job.Stopped = true;
+            streamingHandler.Call(StreamingState.Stop, true);
+        }
+
         private void OnCycleStart(object sender, EventArgs e)
         {
             if (isActive && JobPending)
@@ -260,6 +269,7 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                         else
                         {
                             job.ToolChangeLine = -1;
+                            job.ToolChanged = false;
                             job.CurrBlock = job.PendingLine = job.ACKPending = model.BlockExecuting = 0;
                             job.PgmEndLine = GCode.File.Blocks - 1;
                             if ((sender as GrblViewModel).IsPhysicalFileLoaded)
@@ -439,7 +449,9 @@ public void CycleStart(int fromBlock)
             }
             else if (grblState.State == GrblStates.Tool)
             {
-                model.Message = "";
+                model.Message = string.Empty;
+                job.ToolChanged = false;
+                job.ToolChangeLine = -1;
                 Comms.com.WriteByte(GrblLegacy.ConvertRTCommand(GrblConstants.CMD_CYCLE_START));
             }
             else if(JobTimer.IsRunning)
@@ -450,7 +462,16 @@ public void CycleStart(int fromBlock)
             else if (GCode.File.IsLoaded)
             {
                 model.Message = model.RunTime = string.Empty;
-                if (model.IsSDCardJob)
+                if(job.ToolChanged)
+                {
+                    job.ToolChanged = false;
+                    if (job.ToolChangeLine != -1)
+                    {
+                        job.ToolChangeLine = -1;
+                        SendNextLine();
+                    }
+                }
+                else if (model.IsSDCardJob)
                 {
                     Comms.com.WriteCommand(GrblConstants.CMD_SDCARD_RUN + model.FileName.Substring(7));
                 }
@@ -460,7 +481,7 @@ public void CycleStart(int fromBlock)
                     model.BlockExecuting = fromBlock;
                     job.CurrBlock = job.ACKPending = job.PendingLine = fromBlock;
                     job.serialUsed = missed = 0;
-                    job.Started = job.Transferred = job.HasError = false;
+                    job.Started = job.Transferred = job.HasError = job.ToolChanged = false;
                     job.NextRow = GCode.File.Data.Rows[job.CurrBlock];
                     Comms.com.PurgeQueue();
                     JobTimer.Start();
@@ -598,6 +619,8 @@ public bool StreamingToolChange(StreamingState newState, bool always)
                     btnStart.IsEnabled = true;
                     btnHold.IsEnabled = false;
                     btnStop.IsEnabled = true;
+                    if (JobTimer.IsRunning)
+                        JobTimer.Pause = true;
                     break;
 
                 case StreamingState.Idle:
@@ -605,15 +628,14 @@ public bool StreamingToolChange(StreamingState newState, bool always)
                     if (JobTimer.IsRunning)
                     {
                         model.IsJobRunning = true;
-                        if (job.ToolChangeLine >= 0) {
+                        JobTimer.Pause = false;
+                        if (job.ToolChangeLine >= 0)
                             GCode.File.Data.Rows[job.ToolChangeLine]["Sent"] = "ok";
-                            job.ToolChangeLine = -1;
-                        }
                         SetStreamingHandler(StreamingHandler.SendFile);
-                       // SendNextLine();
                     }
                     else
                         SetStreamingHandler(StreamingHandler.Previous);
+                    job.ToolChanged = true;
                     break;
 
                 case StreamingState.Error:
@@ -662,6 +684,10 @@ public bool StreamingFeedHold(StreamingState newState, bool always)
                     case StreamingState.Stop:
                         SetStreamingHandler(StreamingHandler.Idle);
                         break;
+
+                    case StreamingState.JobFinished:
+                        SetStreamingHandler(StreamingHandler.SendFile);
+                        break;
                 }
             }
 
@@ -926,7 +952,7 @@ public bool StreamingIdle(StreamingState newState, bool always)
                         job.CurrentRow = job.NextRow = null;
                         if (model.IsSDCardJob && !GCode.File.IsLoaded)
                             model.FileName = string.Empty;
-                        if (!grblState.MPG)
+                        if (!grblState.MPG && !job.Stopped)
                         {
                             if (GrblInfo.IsGrblHAL && !(grblState.State == GrblStates.Home || grblState.State == GrblStates.Alarm))
                             {
@@ -940,6 +966,7 @@ public bool StreamingIdle(StreamingState newState, bool always)
                             else if (grblState.State == GrblStates.Hold && !model.GrblReset)
                                 Comms.com.WriteByte(GrblConstants.CMD_RESET);
                         }
+                        job.Stopped = false;
                         if (JobTimer.IsRunning)
                         {
                             always = false;
diff --git a/CNC Controls/CNC Controls/JogFlyoutControl.xaml.cs b/CNC Controls/CNC Controls/JogFlyoutControl.xaml.cs
index d5ec3b2..56e7894 100644
--- a/CNC Controls/CNC Controls/JogFlyoutControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/JogFlyoutControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * JogFlyoutControl.xaml.cs - part of CNC Controls library
  *
- * v0.36 / 2021-12-25 / Io Engineering (Terje Io)
+ * v0.45 / 2024-05-20 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2021, Io Engineering (Terje Io)
+Copyright (c) 2021-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -40,6 +40,7 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 using System.ComponentModel;
 using System.Windows;
 using CNC.Core;
+using System.Windows.Input;
 
 namespace CNC.Controls
 {
@@ -75,5 +76,27 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                     break;
             }
         }
+
+        protected override void OnPreviewKeyDown(KeyEventArgs e)
+        {
+            if (!(e.Handled = ProcessKeyPreview(e)))
+            {
+                if (Keyboard.Modifiers == (ModifierKeys.Control | ModifierKeys.Shift))
+                    Focus();
+
+                base.OnPreviewKeyDown(e);
+            }
+        }
+
+        protected override void OnPreviewKeyUp(KeyEventArgs e)
+        {
+            if (!(e.Handled = ProcessKeyPreview(e)))
+                base.OnPreviewKeyDown(e);
+        }
+
+        protected bool ProcessKeyPreview(KeyEventArgs e)
+        {
+            return (DataContext as GrblViewModel).Keyboard.ProcessKeypress(e, true, this);
+        }
     }
 }
diff --git a/CNC Controls/CNC Controls/NumericTextBox.cs b/CNC Controls/CNC Controls/NumericTextBox.cs
index 82873b0..06f616c 100644
--- a/CNC Controls/CNC Controls/NumericTextBox.cs	
+++ b/CNC Controls/CNC Controls/NumericTextBox.cs	
@@ -1,13 +1,13 @@
 /*
  * NumericTextBox.cs - part of CNC Controls library
  *
- * v0.42 / 2023-03-01 / Io Engineering (Terje Io)
+ * v0.45 / 2024-01-09 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2023, Io Engineering (Terje Io)
+Copyright (c) 2018-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -57,6 +57,8 @@ public NumericTextBox()
             HorizontalContentAlignment = HorizontalAlignment.Right;
             VerticalContentAlignment = VerticalAlignment.Bottom;
             TextWrapping = TextWrapping.NoWrap;
+            if (Format == NumericProperties.MetricFormat)
+                NumericProperties.OnFormatChanged(this, np, Format);
         }
 
         public new string Text { get { return base.Text; } set { base.Text = value; } }
diff --git a/CNC Controls/CNC Controls/OverrideControl.xaml.cs b/CNC Controls/CNC Controls/OverrideControl.xaml.cs
index 1e21c2f..a353e46 100644
--- a/CNC Controls/CNC Controls/OverrideControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/OverrideControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * OverrideControl.xaml.cs - part of CNC Controls library
  *
- * v0.20 / 2020-07-19 / Io Engineering (Terje Io)
+ * v0.45 / 2024-04-03 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2020, Io Engineering (Terje Io)
+Copyright (c) 2018-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -101,7 +101,7 @@ public void OnMinusChanged(object sender, EventArgs args)
         public GrblEncoderMode EncoderMode
         {
             get { return (GrblEncoderMode)GetValue(EncoderModeProperty); }
-            set { SetValue(MinusOnlyProperty, value); }
+            set { SetValue(EncoderModeProperty, value); }
         }
 
         void btnOverrideClick(object sender, EventArgs e)
diff --git a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs b/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs
index 6088b0d..5359fd4 100644
--- a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs	
+++ b/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs	
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
 [assembly: AssemblyProduct("CNC Controls")]
-[assembly: AssemblyCopyright("Copyright © 2023 Io Engineering")]
+[assembly: AssemblyCopyright("Copyright © 2024 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.44.0")]
-[assembly: AssemblyFileVersion("2.0.44.0")]
+[assembly: AssemblyVersion("2.0.45.0")]
+[assembly: AssemblyFileVersion("2.0.45.0")]
diff --git a/CNC Controls/CNC Controls/SDCardView.xaml b/CNC Controls/CNC Controls/SDCardView.xaml
index 83364fb..abbb26f 100644
--- a/CNC Controls/CNC Controls/SDCardView.xaml	
+++ b/CNC Controls/CNC Controls/SDCardView.xaml	
@@ -9,10 +9,12 @@
              d:DesignHeight="515" d:DesignWidth="875"
              Loaded="SDCardView_Loaded">
     <UserControl.Resources>
+        <local:LogicalNotConverter x:Key="NotConverter" />
         <system:String x:Uid="str_notConnection" x:Key="NoConnection">No connection.</system:String>
         <system:String x:Uid="str_uploading" x:Key="Uploading">Uploading...</system:String>
         <system:String x:Uid="str_downloading" x:Key="Downloading">Downloading {0}...</system:String>
         <system:String x:Uid="str_downloadAndRun" x:Key="DownloandRun">Download and run {0}?</system:String>
+        <system:String x:Uid="str_runMacro" x:Key="RunMacro">Run macro {0} with no parameters?</system:String>
         <system:String x:Uid="str_transferDone" x:Key="TransferDone">Transfer done.</system:String>
         <system:String x:Uid="str_transferAborted" x:Key="TransferAborted">Transfer aborted.</system:String>
         <system:String x:Uid="str_transferring" x:Key="Transferring">Transferred {0} of {1} bytes...</system:String>
@@ -20,11 +22,16 @@
         <system:String x:Uid="str_illegalName" x:Key="IllegalName">File: {0}\n!,?,~ and SPACE is not supported in filenames, please rename.</system:String>
     </UserControl.Resources>
     <Grid>
-        <DataGrid x:Uid="dgr_sdcard" x:Name="dgrSDCard" ItemsSource="{Binding}" IsReadOnly="True" HorizontalAlignment="Left" Margin="30,30,0,0" VerticalAlignment="Top" Height="450" Width="380"
+        <Grid.RowDefinitions>
+            <RowDefinition Height="25"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <CheckBox x:Uid="chk_viewAll" x:Name="checkBox" Content="List CNC files only" IsEnabled="{Binding Path=CanViewAll, RelativeSource={RelativeSource AncestorType=UserControl}}" IsChecked="{Binding Path=ViewAll, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource NotConverter}}" HorizontalAlignment="Left" Margin="30,5,0,0" VerticalAlignment="Top" Click="ViewAll_Click"/>
+        <DataGrid x:Uid="dgr_sdcard" x:Name="dgrSDCard" ItemsSource="{Binding}" IsReadOnly="True" HorizontalAlignment="Left" Margin="30,0,0,0" VerticalAlignment="Top" Height="450" Width="380"
                   SelectionMode="Single" SelectionUnit="FullRow" AutoGenerateColumns="False"
                   CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" CanUserAddRows="False"
                   SelectionChanged="dgrSDCard_SelectionChanged" MouseDoubleClick="dgrSDCard_MouseDoubleClick"
-                  ToolTip="Right click for menu, double click to run file.">
+                  ToolTip="Right click for menu, double click to run file." Grid.Row="1">
             <DataGrid.Columns>
                 <DataGridTextColumn x:Uid="hdr_name" Header="Name" Binding="{Binding Name}" Width="*"/>
                 <DataGridTextColumn x:Uid="hdr_size" Header="Size" Binding="{Binding Size}" Width="70"/>
@@ -37,11 +44,11 @@
                     <MenuItem x:Uid="mnu_run" Header="Run" Click="Run_Click" />
                     <MenuItem x:Uid="mnu_downloadRun" Header="D_ownload and run" Click="DownloadRun_Click" />
                     <MenuItem x:Uid="mnu_enableRewind" Header="Enable rewind" IsEnabled="{Binding Path=CanRewind}" IsChecked="{Binding Path=Rewind, Mode=TwoWay}" IsCheckable="True" />
-                    <MenuItem x:Uid="mnu_viewAll" Header="View all" IsEnabled="{Binding Path=CanViewAll}" IsChecked="{Binding Path=ViewAll, Mode=TwoWay}" IsCheckable="True" Click="ViewAll_Click"/>
+                    <MenuItem x:Uid="mnu_viewAll" Header="List CNC files only" IsEnabled="{Binding Path=CanViewAll}" IsChecked="{Binding Path=ViewAll, Mode=TwoWay, Converter={StaticResource NotConverter}}" IsCheckable="True" Click="ViewAll_Click"/>
                     <MenuItem x:Uid="mnu_delete" Header="Delete" IsEnabled="{Binding Path=CanDelete}" Click="Delete_Click" />
                 </ContextMenu>
             </DataGrid.ContextMenu>
         </DataGrid>
-        <Button x:Uid="btn_upload" Content="Upload" IsEnabled="{Binding Path=CanUpload, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalAlignment="Left" Margin="428,460,0,0" VerticalAlignment="Top" Width="75" Click="Upload_Click"/>
+        <Button x:Uid="btn_upload" Content="Upload" IsEnabled="{Binding Path=CanUpload, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalAlignment="Left" Margin="428,430,0,0" VerticalAlignment="Top" Width="75" Click="Upload_Click" Grid.Row="1"/>
     </Grid>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/SDCardView.xaml.cs b/CNC Controls/CNC Controls/SDCardView.xaml.cs
index a6a9d85..315fb47 100644
--- a/CNC Controls/CNC Controls/SDCardView.xaml.cs	
+++ b/CNC Controls/CNC Controls/SDCardView.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * SDCardView.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.43 / 2023-06-02 / Io Engineering (Terje Io)
+ * v0.45 / 2024-09-07 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2023, Io Engineering (Terje Io)
+Copyright (c) 2018-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -160,9 +160,14 @@ private void AddBlock(string data)
             GCode.File.AddBlock(data);
         }
 
+        private bool isMacro (string filename)
+        {
+            return filename.ToLower().EndsWith(".macro");
+        }
+
         private void DownloadRun_Click(object sender, RoutedEventArgs e)
         {
-            if (currentFile != null && MessageBox.Show(string.Format((string)FindResource("DownloandRun"), (string)currentFile["Name"]), "ioSender", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes) == MessageBoxResult.Yes)
+            if (currentFile != null && !isMacro((string)currentFile["Name"]) && MessageBox.Show(string.Format((string)FindResource("DownloandRun"), (string)currentFile["Name"]), "ioSender", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes) == MessageBoxResult.Yes)
             {
                 var model = DataContext as GrblViewModel;
 
@@ -238,8 +243,13 @@ private void Upload_Click(object sender, RoutedEventArgs e)
                         {
                             using (WebClient client = new WebClient())
                             {
+                                int port = GrblSettings.GetInteger(grblHALSetting.FtpPort0);
+                                if(port == -1)
+                                    port = GrblSettings.GetInteger(grblHALSetting.FtpPort1);
+                                if (port == -1)
+                                    port = GrblSettings.GetInteger(grblHALSetting.FtpPort2);
                                 client.Credentials = new NetworkCredential("grblHAL", "grblHAL");
-                                client.UploadFile(string.Format("ftp://{0}/{1}", GrblInfo.IpAddress, filename.Substring(filename.LastIndexOf('\\') + 1)), WebRequestMethods.Ftp.UploadFile, filename);
+                                client.UploadFile(string.Format("ftp://{0}:{1}/{2}", GrblInfo.IpAddress, port == -1 ? 21 : port, filename.Substring(filename.LastIndexOf('\\') + 1)), WebRequestMethods.Ftp.UploadFile, filename);
                                 ok = true;
                             }
                         }
@@ -296,6 +306,8 @@ private void RunFile()
         {
             if (currentFile != null)
             {
+                (DataContext as GrblViewModel).Message = string.Empty;
+
                 if ((bool)currentFile["Invalid"])
                 {
                     MessageBox.Show(string.Format(((string)FindResource("IllegalName")).Replace("\\n", "\r\r"), (string)currentFile["Name"]), "ioSender",
@@ -303,6 +315,25 @@ private void RunFile()
                 }
                 else
                 {
+                    if (GrblInfo.ExpressionsSupported && isMacro((string)currentFile["Name"])) {
+                        string filename = ((string)currentFile["Name"]).ToLower();
+                        filename = filename.Substring(0, filename.LastIndexOf(".macro"));
+                        int pos = filename.LastIndexOf("p");
+                        if(pos >= 0)
+                        {
+                            int macro;
+                            if(int.TryParse(filename.Substring(pos + 1), out macro) && macro >= 100)
+                            {
+                                if(MessageBox.Show(string.Format((string)FindResource("RunMacro"), macro), "ioSender",
+                   MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+                                {
+                                    Comms.com.WriteCommand("G65P" + macro.ToString());
+                                }
+
+                            }
+                        }
+                        return;
+                    }
                     if (Rewind)
                     {
                         Comms.com.WriteCommand(GrblConstants.CMD_SDCARD_REWIND);
diff --git a/CNC Controls/CNC Controls/SignalsControl.xaml b/CNC Controls/CNC Controls/SignalsControl.xaml
index 6e04ce3..afa1d1a 100644
--- a/CNC Controls/CNC Controls/SignalsControl.xaml	
+++ b/CNC Controls/CNC Controls/SignalsControl.xaml	
@@ -33,6 +33,20 @@
                             </Setter.Value>
                         </Setter>
                     </Style>
+                    <Style x:Key="ResetVisibleStyle">
+                        <Setter Property="Control.Visibility">
+                            <Setter.Value>
+                                <MultiBinding Converter="{StaticResource IsSignalVisibleConverter}">
+                                    <Binding Path="OptionalSignals" />
+                                    <Binding>
+                                        <Binding.Source>
+                                            <core:Signals>Reset</core:Signals>
+                                        </Binding.Source>
+                                    </Binding>
+                                </MultiBinding>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
                     <Style x:Key="EStopVisibleStyle">
                         <Setter Property="Control.Visibility">
                             <Setter.Value>
@@ -127,7 +141,7 @@
                 <local:SignalControl x:Uid="lbl_signalOptionalStop" Label="O" ToolTip="Optional stop" IsSet="{Binding Path=Signals[(core:Signals)OptionalStop], Mode=OneWay}" Style="{StaticResource OptionalStopVisibleStyle}"/>
                 <local:SignalControl x:Uid="lbl_signalFeedHold" Label="H" ToolTip="Feed hold" IsSet="{Binding Path=Signals[(core:Signals)Hold], Mode=OneWay}"/>
                 <local:SignalControl x:Uid="lbl_signalCycleStart" Label="S" ToolTip="Cycle start" IsSet="{Binding Path=Signals[(core:Signals)CycleStart], Mode=OneWay}"/>
-                <local:SignalControl x:Uid="lbl_signalReset" Label="R" ToolTip="Reset" IsSet="{Binding Path=Signals[(core:Signals)Reset], Mode=OneWay}"/>
+                <local:SignalControl x:Uid="lbl_signalReset" Label="R" ToolTip="Reset" IsSet="{Binding Path=Signals[(core:Signals)Reset], Mode=OneWay}" Style="{StaticResource ResetVisibleStyle}"/>
                 <local:SignalControl x:Uid="lbl_signalEStop" Label="E" ToolTip="E-Stop" IsSet="{Binding Path=Signals[(core:Signals)EStop], Mode=OneWay}" Style="{StaticResource EStopVisibleStyle}"/>
                 <local:SignalControl x:Uid="lbl_signalSafetyDoor" Label="D" ToolTip="Safety door" IsSet="{Binding Path=Signals[(core:Signals)SafetyDoor], Mode=OneWay}" Style="{StaticResource DoorOpenVisibleStyle}"/>
                 <local:SignalControl x:Uid="lbl_signalProbe" Label="P" ToolTip="Probe" IsSet="{Binding Path=Signals[(core:Signals)Probe], Mode=OneWay}"/>
diff --git a/CNC Controls/CNC Controls/SpindleControl.xaml b/CNC Controls/CNC Controls/SpindleControl.xaml
index 11ac479..21afe5c 100644
--- a/CNC Controls/CNC Controls/SpindleControl.xaml	
+++ b/CNC Controls/CNC Controls/SpindleControl.xaml	
@@ -11,6 +11,7 @@
              d:DesignHeight="150" d:DesignWidth="250">
     <UserControl.Resources>
         <local:LogicalNotConverter x:Key="LogicalNotConverter" />
+        <local:BoolToVisibleConverter x:Key="IsVisibleConverter" />
     </UserControl.Resources>
     <Grid>
         <GroupBox x:Uid="grp_spindle" x:Name="grpSpindle" Header="Spindle" HorizontalAlignment="Left" VerticalAlignment="Top" Height="150" Width="250">
@@ -25,6 +26,7 @@
                     <RadioButton x:Uid="lbl_cw" x:Name="rbSpindleCW" Content="CW" IsChecked="{Binding Path=SpindleState[(gcode:SpindleState)CW], Mode=TwoWay}" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16" Click="rbSpindle_Click"/>
                     <RadioButton x:Uid="lbl_ccw" x:Name="rbSpindleCCW" Content="CCW" IsChecked="{Binding Path=SpindleState[(gcode:SpindleState)CCW], Mode=TwoWay}" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16" Click="rbSpindle_Click"/>
                 </StackPanel>
+                <ComboBox x:Name="cbxSpindle" DisplayMemberPath="Name" SelectedValuePath="SpindleNum" ItemsSource="{Binding Path=Spindles}" SelectedValue="{Binding Path=SpindleNum, Mode=OneWay}" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource LogicalNotConverter}}" Visibility="{Binding Path=MultiSpindle, Converter={StaticResource IsVisibleConverter}}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,1,2,0" Width="100" Height="22" SelectionChanged="cbxSpindle_SelectionChanged"/>
                 <StackPanel Orientation="Horizontal" Margin="5,0" Height="26" Grid.Row="1">
                     <Label x:Uid="lbl_rpm" x:Name="lblRPM" Content="RPM" HorizontalContentAlignment="Right" VerticalAlignment="Center" Height="24" Width="40"/>
                     <local:NumericTextBox x:Name="cvRPM" Value="{Binding Path=RPM, Mode=TwoWay}" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource LogicalNotConverter}}" Format="####0" HorizontalAlignment="Left" Margin="2,0,0,0" TextWrapping="NoWrap" VerticalAlignment="Center"/>
diff --git a/CNC Controls/CNC Controls/SpindleControl.xaml.cs b/CNC Controls/CNC Controls/SpindleControl.xaml.cs
index 6c27067..2710939 100644
--- a/CNC Controls/CNC Controls/SpindleControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/SpindleControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * SpindleControl.xaml.cs - part of CNC Controls library
  *
- * v0.40 / 2022-07-16 / Io Engineering (Terje Io)
+ * v0.45 / 2024-08-17 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2022, Io Engineering (Terje Io)
+Copyright (c) 2018-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -126,5 +126,17 @@ void overrideControl_CommandGenerated(string command)
         {
             (DataContext as GrblViewModel).ExecuteCommand(command);
         }
+
+        private void cbxSpindle_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.AddedItems.Count == 1 && ((ComboBox)sender).IsDropDownOpen)
+            {
+                if (GrblInfo.IsGrblHAL && GrblInfo.Build < 20240812) // Workaround for controller bug
+                    (DataContext as GrblViewModel).ExecuteCommand(string.Format(GrblCommand.SpindleChange, ((Spindle)e.AddedItems[0]).SpindleId));
+                else
+                    (DataContext as GrblViewModel).ExecuteCommand(string.Format(GrblCommand.SpindleChange, ((Spindle)e.AddedItems[0]).SpindleNum));
+            }
+            // TODO: add disable of CCW and RPM based on caps
+        }
     }
 }
\ No newline at end of file
diff --git a/CNC Core/CNC Core/CNC Core.csproj b/CNC Core/CNC Core/CNC Core.csproj
index 48ea00c..d026a4a 100644
--- a/CNC Core/CNC Core/CNC Core.csproj	
+++ b/CNC Core/CNC Core/CNC Core.csproj	
@@ -22,6 +22,7 @@
     <DefineConstants>TRACE;DEBUG;RESPONSELOG  USEWEBSOCKET xUSEELTIMA</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
diff --git a/CNC Core/CNC Core/GCode.cs b/CNC Core/CNC Core/GCode.cs
index c906c3f..0531f7f 100644
--- a/CNC Core/CNC Core/GCode.cs	
+++ b/CNC Core/CNC Core/GCode.cs	
@@ -1,13 +1,13 @@
 /*
  * GCode.cs - part of CNC Controls library
  *
- * v0.43 / 2023-05-31 / Io Engineering (Terje Io)
+ * v0.45 / 2022-02-28 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2022, Io Engineering (Terje Io)
+Copyright (c) 2018-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -69,7 +69,10 @@ public enum AxisFlags : int
         XY = 0x03,
         XZ = 0x05,
         XYZ = 0x07,
-        All = 0x3F
+        ABC = 0x38,
+        XYZABC = 0x3F,
+        UVW = 0x1C,
+        All = 0x1FF
     }
 
     [Flags]
diff --git a/CNC Core/CNC Core/GCodeEmulator.cs b/CNC Core/CNC Core/GCodeEmulator.cs
index 67d9900..94c7eee 100644
--- a/CNC Core/CNC Core/GCodeEmulator.cs	
+++ b/CNC Core/CNC Core/GCodeEmulator.cs	
@@ -1,13 +1,13 @@
 /*
  * GCodeEmulator.cs - part of CNC Controls library
  *
- * v0.44 / 2023-12-16 / Io Engineering (Terje Io)
+ * v0.45 / 2024-11-10 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2023, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -186,7 +186,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                             {
                                 axisFlags = motion.AxisFlags;
                                 setEndP(motion.Values, motion.AxisFlags);
-                                action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, motion.AxisFlags);
+                                action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, motion.AxisFlags, token.BlockDelete);
                                 yield return action;
                                 action.Start = action.End;
                             } else
@@ -196,7 +196,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                 machinePos[i] = g28.Values[i]; // - offsets[i] - origin[i];
                             action.End = machinePos.Point3D;
                 //            action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.All);
-                            action.Token = new GCAbsLinearMotion(token.Command, Commands.G0, token.LineNumber, machinePos.Array, axisFlags);
+                            action.Token = new GCAbsLinearMotion(token.Command, Commands.G0, token.LineNumber, machinePos.Array, axisFlags, token.BlockDelete);
 
                             yield return action;
                             action.Start = action.End;
@@ -221,7 +221,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                             {
                                 axisFlags = motion.AxisFlags;
                                 setEndP(motion.Values, motion.AxisFlags);
-                                action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, motion.AxisFlags);
+                                action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, motion.AxisFlags, token.BlockDelete);
                                 yield return action;
                                 action.Start = action.End;
                             }
@@ -232,7 +232,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                 machinePos[i] = g30.Values[i]; // - offsets[i] - origin[i];
                             action.End = machinePos.Point3D;
 //                            action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.All);
-                            action.Token = new GCAbsLinearMotion(token.Command, Commands.G0, token.LineNumber, machinePos.Array, axisFlags);
+                            action.Token = new GCAbsLinearMotion(token.Command, Commands.G0, token.LineNumber, machinePos.Array, axisFlags, token.BlockDelete);
                             yield return action;
                             action.Start = action.End;
                         }
@@ -252,7 +252,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                             var motion = token as GCSyncMotion;
                             setEndP(motion.Values, motion.AxisFlags);
                             action.IsSpindleSynced = true;
-                            action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, motion.AxisFlags);
+                            action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, motion.AxisFlags, token.BlockDelete);
                             yield return action;
                             action.IsSpindleSynced = false;
                             action.Start = action.End;
@@ -268,7 +268,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                         {
                             var motion = token as GCLinearMotion;
                             setEndP(motion.Values, motion.AxisFlags);
-                            action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, motion.AxisFlags);
+                            action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, motion.AxisFlags, token.BlockDelete);
                         }
                         break;
 
@@ -330,7 +330,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                     machinePos[i] = motion.Values[i] - offsets[i] - origin[i];
                                 action.End = machinePos.Point3D;
                             }
-                            action.Token = new GCLinearMotion(motion.Motion, token.LineNumber, machinePos.Array, motion.AxisFlags);
+                            action.Token = new GCLinearMotion(motion.Motion, token.LineNumber, machinePos.Array, motion.AxisFlags, token.BlockDelete);
                             yield return action;
                             action.Start = action.End;
                         }
@@ -393,7 +393,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                 infeed_offset = doc * infeed_factor;
                                 action.End.X = origin.X + (doc - thread.Depth) * thread.CutDirection;
                                 action.End.Z = start_z - infeed_offset;
-                                action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.XZ);
+                                action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.XZ, token.BlockDelete);
                                 yield return action;
                                 action.Start = action.End;
                             }
@@ -414,13 +414,13 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
 
                                     // TODO: move this segment outside of synced motion?
                                     action.End.X = origin.X + (thread.Peak + doc - thread.Depth) * thread.CutDirection;
-                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.X);
+                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.X, token.BlockDelete);
                                     yield return action;
                                     action.Start = action.End;
 
                                     action.End.X = origin.X + (thread.Peak + doc) * thread.CutDirection;
                                     action.End.Z -= t_end_taper_length;
-                                    action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, AxisFlags.XZ);
+                                    action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, AxisFlags.XZ, token.BlockDelete);
                                     yield return action;
                                     action.Start = action.End;
                                 }
@@ -428,7 +428,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                 {
                                     // 2. Rapid to DOC
                                     action.End.X = origin.X + (thread.Peak + doc) * thread.CutDirection;
-                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.X);
+                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.X, token.BlockDelete);
                                     yield return action;
                                     action.Start = action.End;
                                     action.IsSpindleSynced = true;
@@ -438,13 +438,13 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                 if (thread.ThreadTaper.HasFlag(ThreadTaper.Exit))
                                 {
                                     action.End.Z = target_z - infeed_offset + t_end_taper_length;
-                                    action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, AxisFlags.Z);
+                                    action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, AxisFlags.Z, token.BlockDelete);
                                     yield return action;
                                     action.Start = action.End;
 
                                     action.End.X = origin.X + (thread.Peak + doc - thread.Depth) * thread.CutDirection;
                                     action.End.Z -= t_end_taper_length;
-                                    action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, AxisFlags.XZ);
+                                    action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, AxisFlags.XZ, token.BlockDelete);
                                     yield return action;
                                     action.Start = action.End;
                                 }
@@ -452,7 +452,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                 {
                                     // 2. Main part
                                     action.End.Z = target_z - infeed_offset;
-                                    action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, AxisFlags.Z);
+                                    action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, machinePos.Array, AxisFlags.Z, token.BlockDelete);
                                     yield return action;
                                     action.Start = action.End;
                                 }
@@ -466,14 +466,14 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
 
                                     // 4. Retract
                                     action.End.X = origin.X + (doc - thread.Depth) * thread.CutDirection;
-                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.X);
+                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.X, token.BlockDelete);
                                     yield return action;
                                     action.Start = action.End;
 
                                     // 5. Back to start, add compound slide angle offset when commanded.
                                     infeed_offset = infeed_factor != 0d ? doc * infeed_factor : 0d;
                                     action.End.Z = start_z - infeed_offset;
-                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.Z);
+                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.Z, token.BlockDelete);
                                     yield return action;
                                     action.Start = action.End;
                                 }
@@ -482,7 +482,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                     // 6. Retract to target position
                                     doc = thread.Depth;
                                     action.End.X = origin.X;
-                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.X);
+                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, machinePos.Array, AxisFlags.X, token.BlockDelete);
                                     yield return action;
                                     action.Start = action.End;
                                 }
@@ -523,7 +523,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                 double[] start = new double[] { action.Start.X, action.Start.Y, r };
                                 isRelative = false;
                                 setEndP(start, AxisFlags.Z);
-                                action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, start, AxisFlags.Z);
+                                action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, start, AxisFlags.Z, token.BlockDelete);
                                 yield return action;
                                 action.Start = action.End;
                             }
@@ -537,7 +537,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                             double[] values = new double[] { action.End.X, action.End.Y, action.End.Z };
 
                             setEndP(values, AxisFlags.XY);
-                            action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, values, AxisFlags.XY);
+                            action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, values, AxisFlags.XY, token.BlockDelete);
                             yield return action;
                             action.Start = action.End;
 
@@ -545,14 +545,14 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                             {
                                 values[2] = z;
                                 setEndP(values, AxisFlags.Z);
-                                action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, values, AxisFlags.Z);
+                                action.Token = new GCLinearMotion(Commands.G1, token.LineNumber, values, AxisFlags.Z, token.BlockDelete);
                                 yield return action;
                                 action.Start = action.End;
 
                                 values[2] = RetractOldZ ? oldZ : r;
                                 setEndP(values, AxisFlags.Z);
                                 action.IsRetract = true;
-                                action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, values, AxisFlags.Z);
+                                action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, values, AxisFlags.Z, token.BlockDelete);
                                 yield return action;
                                 action.Start = action.End;
                                 action.IsRetract = false;
@@ -562,7 +562,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                     values[0] += drill.X;
                                     values[1] += drill.Y;
                                     setEndP(values, AxisFlags.X | AxisFlags.Y);
-                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, values, AxisFlags.XY);
+                                    action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, values, AxisFlags.XY, token.BlockDelete);
                                     yield return action;
                                     action.Start = action.End;
                                 }
diff --git a/CNC Core/CNC Core/GCodeJob.cs b/CNC Core/CNC Core/GCodeJob.cs
index a79b918..1e67cca 100644
--- a/CNC Core/CNC Core/GCodeJob.cs	
+++ b/CNC Core/CNC Core/GCodeJob.cs	
@@ -1,13 +1,13 @@
 /*
  * GCodeJob.cs - part of CNC Controls library
  *
- * v0.44 / 2023-11-30 / Io Engineering (Terje Io)
+ * v0.45 / 2024-02-27 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2023, Io Engineering (Terje Io)
+Copyright (c) 2018-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -196,6 +196,8 @@ public void AddBlock(string block, Action action)
 
                 // Calculate program limits (bounding box)
 
+                BoundingBox.Reset();
+
                 GCodeEmulator emu = new GCodeEmulator(true);
 
                 foreach (var cmd in emu.Execute(Tokens))
@@ -348,9 +350,9 @@ private void MaxValues_PropertyChanged(object sender, PropertyChangedEventArgs e
 
     public class GcodeBoundingBox
     {
-        public double[] Min = new double[6];
-        public double[] Max = new double[6];
-        public double[] Size = new double[6];
+        public double[] Min = new double[9];
+        public double[] Max = new double[9];
+        public double[] Size = new double[9];
 
         public GcodeBoundingBox()
         {
diff --git a/CNC Core/CNC Core/GCodeParser.cs b/CNC Core/CNC Core/GCodeParser.cs
index 9d02adb..253a154 100644
--- a/CNC Core/CNC Core/GCodeParser.cs	
+++ b/CNC Core/CNC Core/GCodeParser.cs	
@@ -1,13 +1,13 @@
 /*
  * GCodeParser.cs - part of CNC Controls library
  *
- * v0.44 / 2023-12-16 / Io Engineering (Terje Io)
+ * v0.45 / 2024-10-11 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2023, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -429,6 +429,16 @@ private string TrimBlock(string block)
             return sb.ToString();
         }
 
+        private bool isMessage(string block)
+        {
+            block = block.ToUpperInvariant();
+
+            return block.StartsWith("(MSG,") ||
+                    block.StartsWith("(PRINT,") ||
+                     block.StartsWith("(DEBUG,") ||
+                      block.StartsWith("(ABORT,");
+        }
+
         public bool ParseBlock(ref string line, bool quiet)
         {
             bool isComment;
@@ -446,7 +456,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             List<StrReplace> replace = new List<StrReplace>();
 
             int userMCode = 0;
-            bool isScaling = false;
+            bool isScaling = false, blockDelete;
             string comment = string.Empty, flowExpression = string.Empty, block;
             double value;
             cmdNonModal = Commands.Undefined;
@@ -468,6 +478,8 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             if (quiet)
                 return true;
 
+            blockDelete = block[0] == '/';
+
             if (block[0] == '%')
             {
                 if (++demarcCount == 2)
@@ -477,9 +489,9 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
 
             gcValues.N++;
             motionModeChanged = false;
-            isComment = block[0] == '(' && block.LastIndexOf(')') == block.Length - 1 && !block.StartsWith("(MSG");
+            isComment = block[0] == '(' && block.LastIndexOf(')') == block.Length - 1 && !isMessage(block);
 
-            int pos = 0, ppos = 0;
+            int pos = blockDelete ? 1 : 0, ppos = 0;
 
             while(pos < block.Length)
             {
@@ -1121,8 +1133,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
 
             if (flowControl != NGCExpr.FlowControl.NoOp)
             {
-                Tokens.Add(new GCFlowControl(Commands.FlowControl, gcValues.N, (uint)gcValues.O, flowControl, flowExpression));
-
+                Tokens.Add(new GCFlowControl(Commands.FlowControl, gcValues.N, (uint)gcValues.O, flowControl, flowExpression, blockDelete));
             }
 
             //
@@ -1130,7 +1141,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             //
             if (comment != string.Empty)
             {
-                Tokens.Add(new GCComment(Commands.Comment, gcValues.N, comment));
+                Tokens.Add(new GCComment(Commands.Comment, gcValues.N, comment, blockDelete));
                 comment = string.Empty;
             }
 
@@ -1142,7 +1153,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             if (modalGroups.HasFlag(ModalGroups.G5))
             {
                 FeedRateMode = (FeedRateMode)(cmdFeedrateMode - 93);
-                Tokens.Add(new GCFeedRateMode(cmdFeedrateMode, gcValues.N));
+                Tokens.Add(new GCFeedRateMode(cmdFeedrateMode, gcValues.N, blockDelete));
             }
 
             //
@@ -1151,7 +1162,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             if (wordFlags.HasFlag(WordFlags.F))
             {
                 feedRate = IsImperial ? gcValues.F * 25.4d : gcValues.F;
-                Tokens.Add(new GCFeedrate(Commands.Feedrate, gcValues.N, feedRate));
+                Tokens.Add(new GCFeedrate(Commands.Feedrate, gcValues.N, feedRate, blockDelete));
             }
 
             //
@@ -1162,12 +1173,12 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             if (modalGroups.HasFlag(ModalGroups.G14))
             {
                 SpindleRpmMode = cmdSpindleRpmMode == Commands.G97;
-                Tokens.Add(new GCodeToken(cmdSpindleRpmMode, gcValues.N));
+                Tokens.Add(new GCodeToken(cmdSpindleRpmMode, gcValues.N, blockDelete));
             }
 
             if (wordFlags.HasFlag(WordFlags.S))
             {
-                Tokens.Add(new GCSpindleRPM(Commands.SpindleRPM, gcValues.N, gcValues.S, wordFlags.HasFlag(WordFlags.Dollar) ? gcValues.Dollar : -1));
+                Tokens.Add(new GCSpindleRPM(Commands.SpindleRPM, gcValues.N, gcValues.S, wordFlags.HasFlag(WordFlags.Dollar) ? gcValues.Dollar : -1, blockDelete));
                 wordFlags &= ~WordFlags.Dollar;
             }
 
@@ -1177,7 +1188,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             if (wordFlags.HasFlag(WordFlags.T))
             {
                 Tool = gcValues.T;
-                Tokens.Add(new GCToolSelect(Commands.ToolSelect, gcValues.N, gcValues.T));
+                Tokens.Add(new GCToolSelect(Commands.ToolSelect, gcValues.N, gcValues.T, blockDelete));
 
                 if (!quiet && ToolChanged != null && !ToolChanged(gcValues.T))
                     MessageBox.Show(string.Format(LibStrings.FindResource("ParserToolProfile"), gcValues.T.ToString()), "GCode parser", MessageBoxButton.OK, MessageBoxImage.Warning);
@@ -1193,7 +1204,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 if (modalGroups.HasFlag(ModalGroups.M6))
                 {
                     ToolChanges++;
-                    Tokens.Add(new GCodeToken(Commands.M6, gcValues.N));
+                    Tokens.Add(new GCodeToken(Commands.M6, gcValues.N, blockDelete));
                 }
 
                 //
@@ -1203,7 +1214,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 // M3, M4, M5
                 if (modalGroups.HasFlag(ModalGroups.M7))
                 {
-                    Tokens.Add(new GCSpindleState(gcValues.N, SpindleState, wordFlags.HasFlag(WordFlags.Dollar) ? gcValues.Dollar : -2));
+                    Tokens.Add(new GCSpindleState(gcValues.N, SpindleState, wordFlags.HasFlag(WordFlags.Dollar) ? gcValues.Dollar : -2, blockDelete));
                     wordFlags &= ~WordFlags.Dollar;
                 }
 
@@ -1214,7 +1225,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 // M7, M8, M9
                 if (modalGroups.HasFlag(ModalGroups.M8))
                 {
-                    Tokens.Add(new GCCoolantState(gcValues.N, CoolantState));
+                    Tokens.Add(new GCCoolantState(gcValues.N, CoolantState, blockDelete));
                 }
 
                 //
@@ -1224,7 +1235,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 // M49, M50, M51, M52, M53, M56
                 if (modalGroups.HasFlag(ModalGroups.M9))
                 {
-                    Tokens.Add(new GCodeToken(cmdOverride, gcValues.N));
+                    Tokens.Add(new GCodeToken(cmdOverride, gcValues.N, blockDelete));
                 }
 
                 //
@@ -1239,7 +1250,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                         case 64:
                         case 65:
                             if(wordFlags.HasFlag(WordFlags.P))
-                                Tokens.Add(new GCDigitalOutput(Commands.M62 + (userMCode - 62), gcValues.N, (uint)gcValues.P));
+                                Tokens.Add(new GCDigitalOutput(Commands.M62 + (userMCode - 62), gcValues.N, (uint)gcValues.P, blockDelete));
                             break;
 
                         case 66:
@@ -1250,23 +1261,25 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                                     throw new GCodeException(LibStrings.FindResource("ParserM66NoPorE"));
                                 uint l = wordFlags.HasFlag(WordFlags.L) ? (uint)gcValues.L : 0;
                                 double q = wordFlags.HasFlag(WordFlags.Q) ? gcValues.Q : 0d;
-                                if (l <= 4 && (l == 0 && q != 0d))
+                                if (l == 0 || (wordFlags.HasFlag(WordFlags.P) && l <= 4 && q != 0d))
                                     Tokens.Add(new GCWaitOnInput(gcValues.N, wordFlags.HasFlag(WordFlags.P) ? (int)gcValues.P : -1,
                                                                               wordFlags.HasFlag(WordFlags.E) ? (int)gcValues.E : -1,
-                                                                              l, gcValues.Q));
+                                                                              l, q, blockDelete));
+                                else
+                                    throw new GCodeException(LibStrings.FindResource("ParserM66BadParams"));
                             }
                             break;
 
                         case 67:
                         case 68:
                             if (wordFlags.HasFlag(WordFlags.E) && wordFlags.HasFlag(WordFlags.Q))
-                                Tokens.Add(new GCAnalogOutput(Commands.M67 + (userMCode - 67), gcValues.N, (uint)gcValues.P, gcValues.Q));
+                                Tokens.Add(new GCAnalogOutput(Commands.M67 + (userMCode - 67), gcValues.N, (uint)gcValues.P, gcValues.Q, blockDelete));
                             break;
 
                         default:
                             Tokens.Add(new GCUserMCommand(gcValues.N, (uint)userMCode,
                                                            wordFlags.HasFlag(WordFlags.P) ? gcValues.P : double.NaN,
-                                                            wordFlags.HasFlag(WordFlags.Q) ? gcValues.Q : double.NaN));
+                                                            wordFlags.HasFlag(WordFlags.Q) ? gcValues.Q : double.NaN, blockDelete));
                             break;
                     }
                 }
@@ -1279,7 +1292,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 if ((modalGroups.HasFlag(ModalGroups.G0) && cmdNonModal == Commands.G4))
                 {
                     if (wordFlags.HasFlag(WordFlags.P))
-                        Tokens.Add(new GCDwell(gcValues.N, gcValues.P));
+                        Tokens.Add(new GCDwell(gcValues.N, gcValues.P, blockDelete));
                     else
                         throw new GCodeException(LibStrings.FindResource("ParserG6NoP"));
                 }
@@ -1291,7 +1304,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 // G17, G18, G19
                 if (modalGroups.HasFlag(ModalGroups.G2))
                 {
-                    Tokens.Add(Plane = new GCPlane(cmdPlane, gcValues.N));
+                    Tokens.Add(Plane = new GCPlane(cmdPlane, gcValues.N, blockDelete));
                 }
 
                 //
@@ -1301,7 +1314,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 // Lathe mode: G7, G8
                 if (modalGroups.HasFlag(ModalGroups.G15))
                 {
-                    var mode = new GCLatheMode(cmdLatheMode, gcValues.N);
+                    var mode = new GCLatheMode(cmdLatheMode, gcValues.N, blockDelete);
                     LatheMode = mode.LatheMode;
                     Tokens.Add(mode);
                 }
@@ -1310,13 +1323,13 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 if (modalGroups.HasFlag(ModalGroups.G6))
                 {
                     IsImperial = cmdUnits == Commands.G20;
-                    Tokens.Add(new GCUnits(cmdUnits, gcValues.N));
+                    Tokens.Add(new GCUnits(cmdUnits, gcValues.N, blockDelete));
                 }
 
                 // Scaling: G50, G51
                 if (modalGroups.HasFlag(ModalGroups.G11))
                 {
-                    Tokens.Add(new GCScaling((isScaling ? Commands.G51 : Commands.G50), gcValues.N, gcValues.XYZ, axisWords));
+                    Tokens.Add(new GCScaling((isScaling ? Commands.G51 : Commands.G50), gcValues.N, gcValues.XYZ, axisWords, blockDelete));
                     IsScaled = false;
                     if (isScaling)
                     {
@@ -1359,7 +1372,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 // G40, G41, G42
                 if (modalGroups.HasFlag(ModalGroups.G7))
                 {
-                    Tokens.Add(new GCPlane(Commands.G40, gcValues.N));
+                    Tokens.Add(new GCPlane(Commands.G40, gcValues.N, blockDelete));
                 }
 
                 //
@@ -1373,7 +1386,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                     {
                         case ToolLengthOffset.Enable:
                             {
-                                var offset = new GCToolOffset(Commands.G43, gcValues.N, (uint)gcValues.H);
+                                var offset = new GCToolOffset(Commands.G43, gcValues.N, (uint)gcValues.H, blockDelete);
                                 if (SetToolOffset(offset))
                                     Tokens.Add(offset);
                                 // else error?
@@ -1382,7 +1395,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
 
                         case ToolLengthOffset.ApplyAdditional:
                             {
-                                var offset = new GCToolOffset(Commands.G43_2, gcValues.N, (uint)gcValues.H);
+                                var offset = new GCToolOffset(Commands.G43_2, gcValues.N, (uint)gcValues.H, blockDelete);
                                 if(AddToolOffset(offset))
                                     Tokens.Add(offset);
                                 // else error?
@@ -1391,7 +1404,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
 
                         case ToolLengthOffset.EnableDynamic:
                             {
-                                var offset = new GCToolOffsets(Commands.G43_1, gcValues.N, gcValues.XYZ, axisWords);
+                                var offset = new GCToolOffsets(Commands.G43_1, gcValues.N, gcValues.XYZ, axisWords, blockDelete);
                                 DynamicToolOffset(offset);
                                 Tokens.Add(offset);
                             }
@@ -1399,7 +1412,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
 
                         case ToolLengthOffset.Cancel:
                             CancelToolCompensation();
-                            Tokens.Add(new GCodeToken(Commands.G49, gcValues.N));
+                            Tokens.Add(new GCodeToken(Commands.G49, gcValues.N, blockDelete));
                             break;
                     }
                 }
@@ -1412,7 +1425,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 if (modalGroups.HasFlag(ModalGroups.G12))
                 {
                     CoordSystem = (int)coordSystem - 53;
-                    Tokens.Add(new GCodeToken(Commands.G54 + CoordSystem - 1, gcValues.N));
+                    Tokens.Add(new GCodeToken(Commands.G54 + CoordSystem - 1, gcValues.N, blockDelete));
                 }
 
                 //
@@ -1422,7 +1435,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 // G61, G61.1, G64
                 if (modalGroups.HasFlag(ModalGroups.G13))
                 {
-                    Tokens.Add(new GCodeToken(cmdPathMode, gcValues.N));
+                    Tokens.Add(new GCodeToken(cmdPathMode, gcValues.N, blockDelete));
                 }
 
                 //
@@ -1432,7 +1445,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 // G90, G91
                 if (modalGroups.HasFlag(ModalGroups.G3))
                 {
-                    var mode = new GCDistanceMode(cmdDistMode, gcValues.N);
+                    var mode = new GCDistanceMode(cmdDistMode, gcValues.N, blockDelete);
                     DistanceMode = mode.DistanceMode;
                     Tokens.Add(mode);
                 }
@@ -1440,7 +1453,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 // G90.1, G91.1
                 if (modalGroups.HasFlag(ModalGroups.G4))
                 {
-                    var mode = new GCIJKMode(cmdDistModeIJK, gcValues.N);
+                    var mode = new GCIJKMode(cmdDistModeIJK, gcValues.N, blockDelete);
                     IJKMode = mode.IJKMode;
                     Tokens.Add(mode);
                 }
@@ -1453,7 +1466,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 if (modalGroups.HasFlag(ModalGroups.G10))
                 {
                     RetractOldZ = cmdRetractMode == Commands.G98;
-                    Tokens.Add(new GCodeToken(cmdRetractMode, gcValues.N));
+                    Tokens.Add(new GCodeToken(cmdRetractMode, gcValues.N, blockDelete));
                 }
 
                 //
@@ -1475,7 +1488,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                                 case 1:
                                     {
                                         var r = wordFlags.HasFlag(WordFlags.R) ? gcValues.R : double.NaN;
-                                        var offset = new GCToolTable(Commands.G10, 1, gcValues.N, (uint)gcValues.P, r, gcValues.XYZ, axisWords);
+                                        var offset = new GCToolTable(Commands.G10, 1, gcValues.N, (uint)gcValues.P, r, gcValues.XYZ, axisWords, blockDelete);
                                         if(SetToolTable(offset))
                                             Tokens.Add(offset);
                                         // else erroor?
@@ -1487,7 +1500,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                                     {
                                         // to current position
                                         var r = wordFlags.HasFlag(WordFlags.R) ? gcValues.R : double.NaN;
-                                        var offset = new GCToolTable(Commands.G10, gcValues.N, (uint)gcValues.L, (uint)gcValues.P, r, gcValues.XYZ, axisWords);
+                                        var offset = new GCToolTable(Commands.G10, gcValues.N, (uint)gcValues.L, (uint)gcValues.P, r, gcValues.XYZ, axisWords, blockDelete);
                                         if (SetToolTable(offset))
                                             Tokens.Add(offset);
                                         // else erroor?
@@ -1497,7 +1510,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                                 case 2:
                                 case 20:
                                     {
-                                        var offset = new GCCoordinateSystem(Commands.G10, gcValues.N, (uint)gcValues.L, (uint)gcValues.P, gcValues.XYZ, axisWords);
+                                        var offset = new GCCoordinateSystem(Commands.G10, gcValues.N, (uint)gcValues.L, (uint)gcValues.P, gcValues.XYZ, axisWords, blockDelete);
                                         if (SetCoordinateSystem(offset))
                                             Tokens.Add(offset);
                                         // else erroor?
@@ -1509,17 +1522,17 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                         case Commands.G28:
                         case Commands.G30:
                             HasGoPredefinedPosition = true;
-                            Tokens.Add(new GCLinearMotion(cmdNonModal, gcValues.N, gcValues.XYZ, axisWords));
+                            Tokens.Add(new GCLinearMotion(cmdNonModal, gcValues.N, gcValues.XYZ, axisWords, blockDelete));
                             break;
 
                         case Commands.G53:
                             if (motionMode == MotionMode.G0 || motionMode == MotionMode.G1)
                             {
                                 if (modalGroups.HasFlag(ModalGroups.G1))
-                                    Tokens.Add(new GCAbsLinearMotion(cmdNonModal, motionMode == MotionMode.G0 ? Commands.G0 : Commands.G1, gcValues.N, gcValues.XYZ, AxisFlags.None));
+                                    Tokens.Add(new GCAbsLinearMotion(cmdNonModal, motionMode == MotionMode.G0 ? Commands.G0 : Commands.G1, gcValues.N, gcValues.XYZ, AxisFlags.None, blockDelete));
                                 else
                                 {
-                                    Tokens.Add(new GCAbsLinearMotion(cmdNonModal, motionMode == MotionMode.G0 ? Commands.G0 : Commands.G1, gcValues.N, gcValues.XYZ, axisWords));
+                                    Tokens.Add(new GCAbsLinearMotion(cmdNonModal, motionMode == MotionMode.G0 ? Commands.G0 : Commands.G1, gcValues.N, gcValues.XYZ, axisWords, blockDelete));
                                     axisWords = AxisFlags.None;
                                 }
                             }
@@ -1528,41 +1541,41 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                             break;
 
                         case Commands.G28_1:
-                            Tokens.Add(new GCCoordinateSystem(cmdNonModal, gcValues.N, 11, gcValues.XYZ, axisWords));
+                            Tokens.Add(new GCCoordinateSystem(cmdNonModal, gcValues.N, 11, gcValues.XYZ, axisWords, blockDelete));
                             break;
 
                         case Commands.G30_1:
-                            Tokens.Add(new GCCoordinateSystem(cmdNonModal, gcValues.N, 12, gcValues.XYZ, axisWords));
+                            Tokens.Add(new GCCoordinateSystem(cmdNonModal, gcValues.N, 12, gcValues.XYZ, axisWords, blockDelete));
                             break;
 
                         case Commands.G92:
                             {
-                                var offset = new GCCoordinateSystem(cmdNonModal, gcValues.N, 10, gcValues.XYZ, axisWords);
+                                var offset = new GCCoordinateSystem(cmdNonModal, gcValues.N, 10, gcValues.XYZ, axisWords, blockDelete);
                                 SetG92Offset(offset);
-                                Tokens.Add(new GCCoordinateSystem(cmdNonModal, gcValues.N, 10, gcValues.XYZ, axisWords));
+                                Tokens.Add(new GCCoordinateSystem(cmdNonModal, gcValues.N, 10, gcValues.XYZ, axisWords, blockDelete));
                             }
                             break;
 
                         case Commands.G92_1:
                             G92Clear();
-                            Tokens.Add(new GCodeToken(cmdNonModal, gcValues.N));
+                            Tokens.Add(new GCodeToken(cmdNonModal, gcValues.N, blockDelete));
                             break;
 
                         case Commands.G92_2:
                             G92Active = false;
-                            Tokens.Add(new GCodeToken(cmdNonModal, gcValues.N));
+                            Tokens.Add(new GCodeToken(cmdNonModal, gcValues.N, blockDelete));
                             break;
 
                         case Commands.G92_3:
                             G92Active = true;
-                            Tokens.Add(new GCodeToken(cmdNonModal, gcValues.N));
+                            Tokens.Add(new GCodeToken(cmdNonModal, gcValues.N, blockDelete));
                             break;
 
                         case Commands.G65:
                             if (!wordFlags.HasFlag(WordFlags.P))
                                 throw new GCodeException(LibStrings.FindResource("ParserCMDInvalid"));
                             wordFlags &= ~(WordFlags.L | WordFlags.N | WordFlags.O | WordFlags.P);
-                            Tokens.Add(new GCMacroCall(cmdNonModal, gcValues.N, (uint)gcValues.P, (uint)gcValues.L, new GCParameters(gcValues, wordFlags).Values));
+                            Tokens.Add(new GCMacroCall(cmdNonModal, gcValues.N, (uint)gcValues.P, (uint)gcValues.L, new GCParameters(gcValues, wordFlags).Values, blockDelete));
                             break;
 
                     }
@@ -1580,7 +1593,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             {
                 motionMode = MotionMode.None;
                 RetractOldZ = true;
-                Tokens.Add(new GCodeToken(Commands.G80, gcValues.N));
+                Tokens.Add(new GCodeToken(Commands.G80, gcValues.N, blockDelete));
             }
 
             if (motionMode != MotionMode.None && (axisWords != AxisFlags.None || ijkWords != IJKFlags.None || modalGroups.HasFlag(ModalGroups.G1)))
@@ -1589,14 +1602,14 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                 {
                     case MotionMode.G0:
                         RetractOldZ = true;
-                        Tokens.Add(new GCLinearMotion(Commands.G0, gcValues.N, gcValues.XYZ, axisWords));
+                        Tokens.Add(new GCLinearMotion(Commands.G0, gcValues.N, gcValues.XYZ, axisWords, blockDelete));
                         break;
 
                     case MotionMode.G1:
                         if (feedRate == 0d)
                             throw new GCodeException(LibStrings.FindResource("ParserG1NoFeed"));
                         RetractOldZ = true;
-                        Tokens.Add(new GCLinearMotion(Commands.G1, gcValues.N, gcValues.XYZ, axisWords));
+                        Tokens.Add(new GCLinearMotion(Commands.G1, gcValues.N, gcValues.XYZ, axisWords, blockDelete));
                         break;
 
                     case MotionMode.G2:
@@ -1631,7 +1644,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                             if(gcValues.P <= 0d)
                                 throw new GCodeException(LibStrings.FindResource("ParserCMDInvalid"));
                         }
-                        Tokens.Add(new GCArc(motionMode == MotionMode.G2 ? Commands.G2 : Commands.G3, gcValues.N, gcValues.XYZ, axisWords, gcValues.IJK, ijkWords, gcValues.R, wordFlags.HasFlag(WordFlags.P) ? (int)gcValues.P : 0, IJKMode));
+                        Tokens.Add(new GCArc(motionMode == MotionMode.G2 ? Commands.G2 : Commands.G3, gcValues.N, gcValues.XYZ, axisWords, gcValues.IJK, ijkWords, gcValues.R, wordFlags.HasFlag(WordFlags.P) ? (int)gcValues.P : 0, IJKMode, blockDelete));
                         break;
 
                     case MotionMode.G5:
@@ -1666,7 +1679,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                                 splinePQ[i] *= scaleFactors[i];
                         }
                         RetractOldZ = true;
-                        Tokens.Add(new GCCubicSpline(Commands.G5, gcValues.N, gcValues.XYZ, axisWords, new double[] { gcValues.IJK[0], gcValues.IJK[1], splinePQ[0], splinePQ[1] }));
+                        Tokens.Add(new GCCubicSpline(Commands.G5, gcValues.N, gcValues.XYZ, axisWords, new double[] { gcValues.IJK[0], gcValues.IJK[1], splinePQ[0], splinePQ[1] }, blockDelete));
                         break;
 
                     case MotionMode.G5_1:
@@ -1682,33 +1695,33 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                                 gcValues.IJK[i] *= scaleFactors[i];
                         }
                         RetractOldZ = true;
-                        Tokens.Add(new GCQuadraticSpline(Commands.G5_1, gcValues.N, gcValues.XYZ, axisWords, new double[] { gcValues.IJK[0], gcValues.IJK[1] }));
+                        Tokens.Add(new GCQuadraticSpline(Commands.G5_1, gcValues.N, gcValues.XYZ, axisWords, new double[] { gcValues.IJK[0], gcValues.IJK[1] }, blockDelete));
                         break;
 
                     case MotionMode.G33:
                         RetractOldZ = true;
-                        Tokens.Add(new GCSyncMotion(Commands.G33, gcValues.N, gcValues.XYZ, axisWords, gcValues.K, wordFlags.HasFlag(WordFlags.Dollar) ? gcValues.Dollar : -1));
+                        Tokens.Add(new GCSyncMotion(Commands.G33, gcValues.N, gcValues.XYZ, axisWords, gcValues.K, wordFlags.HasFlag(WordFlags.Dollar) ? gcValues.Dollar : -1, blockDelete));
                         wordFlags &= ~WordFlags.Dollar;
                         break;
 
                     case MotionMode.G38_2:
                         RetractOldZ = true;
-                        Tokens.Add(new GCLinearMotion(Commands.G38_2, gcValues.N, gcValues.XYZ, axisWords));
+                        Tokens.Add(new GCLinearMotion(Commands.G38_2, gcValues.N, gcValues.XYZ, axisWords, blockDelete));
                         break;
 
                     case MotionMode.G38_3:
                         RetractOldZ = true;
-                        Tokens.Add(new GCLinearMotion(Commands.G38_3, gcValues.N, gcValues.XYZ, axisWords));
+                        Tokens.Add(new GCLinearMotion(Commands.G38_3, gcValues.N, gcValues.XYZ, axisWords, blockDelete));
                         break;
 
                     case MotionMode.G38_4:
                         RetractOldZ = true;
-                        Tokens.Add(new GCLinearMotion(Commands.G38_4, gcValues.N, gcValues.XYZ, axisWords));
+                        Tokens.Add(new GCLinearMotion(Commands.G38_4, gcValues.N, gcValues.XYZ, axisWords, blockDelete));
                         break;
 
                     case MotionMode.G38_5:
                         RetractOldZ = true;
-                        Tokens.Add(new GCLinearMotion(Commands.G38_5, gcValues.N, gcValues.XYZ, axisWords));
+                        Tokens.Add(new GCLinearMotion(Commands.G38_5, gcValues.N, gcValues.XYZ, axisWords, blockDelete));
                         break;
 
                     case MotionMode.G73:
@@ -1718,7 +1731,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                                 throw new GCodeException(LibStrings.FindResource("ParserNoR"));
                             if (motionModeChanged && !wordFlags.HasFlag(WordFlags.Q) || gcValues.Q <= 0d)
                                 throw new GCodeException(LibStrings.FindResource("ParserNoInvalidQ"));
-                            Tokens.Add(new GCCannedDrill(Commands.G73, gcValues.N, gcValues.XYZ, axisWords, ToMetric(gcValues.R), repeats, 0d, ToMetric(gcValues.Q)));
+                            Tokens.Add(new GCCannedDrill(Commands.G73, gcValues.N, gcValues.XYZ, axisWords, ToMetric(gcValues.R), repeats, 0d, ToMetric(gcValues.Q), blockDelete));
                         }
                         break;
 
@@ -1791,7 +1804,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                                 foreach (int i in ijkWords.ToIndices())
                                     gcValues.IJK[i] /= 2d;
                             RetractOldZ = true;
-                            Tokens.Add(new GCThreadingMotion(Commands.G76, gcValues.N, gcValues.P, gcValues.XYZ, axisWords, gcValues.IJK, IJKFlags.All, optValues, optFlags, wordFlags.HasFlag(WordFlags.Dollar) ? gcValues.Dollar : -1));
+                            Tokens.Add(new GCThreadingMotion(Commands.G76, gcValues.N, gcValues.P, gcValues.XYZ, axisWords, gcValues.IJK, IJKFlags.All, optValues, optFlags, wordFlags.HasFlag(WordFlags.Dollar) ? gcValues.Dollar : -1, blockDelete));
                             wordFlags &= ~WordFlags.Dollar;
                         }
                         break;
@@ -1799,7 +1812,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                     case MotionMode.G81:
                         {
                             uint repeats = wordFlags.HasFlag(WordFlags.L) ? (uint)gcValues.L : 1;
-                            Tokens.Add(new GCCannedDrill(Commands.G81, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats));
+                            Tokens.Add(new GCCannedDrill(Commands.G81, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats, blockDelete));
                         }
                         break;
 
@@ -1807,7 +1820,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                         {
                             uint repeats = wordFlags.HasFlag(WordFlags.L) ? (uint)gcValues.L : 1;
                             double dwell = wordFlags.HasFlag(WordFlags.P) ? gcValues.P : 0d;
-                            Tokens.Add(new GCCannedDrill(Commands.G82, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats, dwell));
+                            Tokens.Add(new GCCannedDrill(Commands.G82, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats, dwell, blockDelete));
                         }
                         break;
 
@@ -1816,14 +1829,14 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                             uint repeats = wordFlags.HasFlag(WordFlags.L) ? (uint)gcValues.L : 1;
                             if (motionModeChanged && !wordFlags.HasFlag(WordFlags.Q) || gcValues.Q <= 0d)
                                 throw new GCodeException(LibStrings.FindResource("ParserNoInvalidQ"));
-                            Tokens.Add(new GCCannedDrill(Commands.G83, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats, 0d, ToMetric(gcValues.Q)));
+                            Tokens.Add(new GCCannedDrill(Commands.G83, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats, 0d, ToMetric(gcValues.Q), blockDelete));
                         }
                         break;
 
                     case MotionMode.G85:
                         {
                             uint repeats = wordFlags.HasFlag(WordFlags.L) ? (uint)gcValues.L : 1;
-                            Tokens.Add(new GCCannedDrill(Commands.G85, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats));
+                            Tokens.Add(new GCCannedDrill(Commands.G85, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats, blockDelete));
                         }
                         break;
 
@@ -1832,7 +1845,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                             // error if spindle not running
                             uint repeats = wordFlags.HasFlag(WordFlags.L) ? (uint)gcValues.L : 1;
                             double dwell = wordFlags.HasFlag(WordFlags.P) ? gcValues.P : 0d;
-                            Tokens.Add(new GCCannedDrill(Commands.G86, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats, dwell));
+                            Tokens.Add(new GCCannedDrill(Commands.G86, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats, dwell, blockDelete));
                         }
                         break;
 
@@ -1840,7 +1853,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                         {
                             uint repeats = wordFlags.HasFlag(WordFlags.L) ? (uint)gcValues.L : 1;
                             double dwell = wordFlags.HasFlag(WordFlags.P) ? gcValues.P : 0d;
-                            Tokens.Add(new GCCannedDrill(Commands.G89, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats, dwell));
+                            Tokens.Add(new GCCannedDrill(Commands.G89, gcValues.N, gcValues.XYZ, axisWords, wordFlags.HasFlag(WordFlags.R) ? ToMetric(gcValues.R) : double.NaN, repeats, dwell, blockDelete));
                         }
                         break;
                 }
@@ -1856,7 +1869,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             if (modalGroups.HasFlag(ModalGroups.M4))
             {
                 ProgramEnd = cmdProgramFlow == Commands.M2 || cmdProgramFlow == Commands.M30;
-                Tokens.Add(new GCodeToken(cmdProgramFlow, gcValues.N));
+                Tokens.Add(new GCodeToken(cmdProgramFlow, gcValues.N, blockDelete));
             }
 
             return true;
@@ -1934,7 +1947,7 @@ public static List<string> TokensToGCode(List<GCodeToken> tokens, bool compress
             uint line = 0;
 
             bool isRelative = false, relativeChanged = true;
-            GCodeToken lastMotion = new GCodeToken(Commands.Undefined, 0);
+            GCodeToken lastMotion = new GCodeToken(Commands.Undefined, 0, false);
 
             foreach (var token in tokens)
             {
@@ -1943,7 +1956,7 @@ public static List<string> TokensToGCode(List<GCodeToken> tokens, bool compress
                     if (block != string.Empty)
                     {
                         gc.Add(block);
-                        block = string.Empty;
+                        block = token.BlockDelete ? "/" : string.Empty;
                     }
                     line = token.LineNumber;
                 }
@@ -2094,7 +2107,7 @@ public static List<string> TokensToGCode(List<GCodeToken> tokens, bool compress
                         break;
 
                     case Commands.G80:
-                        lastMotion = new GCodeToken(Commands.Undefined, 0);
+                        lastMotion = new GCodeToken(Commands.Undefined, 0, false);
                         block += token.ToString();
                         break;
 
@@ -2176,6 +2189,7 @@ public class GCodeToken
     {
         public uint LineNumber { get; set; }
         public Commands Command { get; set; }
+        public bool BlockDelete { get; set; }
         /*
         public int ViewIndexStart { get; set; }
         public int ViewIndexEnd { get; set; }
@@ -2185,10 +2199,11 @@ public GCodeToken()
             Command = Commands.Undefined;
         }
 
-        public GCodeToken(Commands command, uint lnr)
+        public GCodeToken(Commands command, uint lnr, bool blockDelete)
         {
             Command = command;
             LineNumber = lnr;
+            BlockDelete = blockDelete;
         }
 
         public new string ToString()
@@ -2201,7 +2216,7 @@ public class GCAxisCommand3 : GCodeToken
         public GCAxisCommand3()
         { }
 
-        public GCAxisCommand3(Commands command, uint lnr, double[] values, AxisFlags axisFlags) : base(command, lnr)
+        public GCAxisCommand3(Commands command, uint lnr, double[] values, AxisFlags axisFlags, bool blockDelete) : base(command, lnr, blockDelete)
         {
             Array.Copy(values, Values, 3);
             AxisFlags = axisFlags;
@@ -2230,7 +2245,7 @@ public class GCAxisCommand9 : GCodeToken
         public GCAxisCommand9()
         { }
 
-        public GCAxisCommand9(Commands command, uint lnr, double[] values, AxisFlags axisFlags) : base(command, lnr)
+        public GCAxisCommand9(Commands command, uint lnr, double[] values, AxisFlags axisFlags, bool blockDelete) : base(command, lnr, blockDelete)
         {
             Array.Copy(values, Values, values.Length); // Only copy for num axes?
             AxisFlags = axisFlags;
@@ -2298,7 +2313,7 @@ public class AxisCommand3IJK : GCAxisCommand3
         public AxisCommand3IJK()
         { }
 
-        public AxisCommand3IJK(Commands command, uint lnr, double[] values, AxisFlags axisFlags, double[] ijkValues, IJKFlags ijkFlags) : base(command, lnr, values, axisFlags)
+        public AxisCommand3IJK(Commands command, uint lnr, double[] values, AxisFlags axisFlags, double[] ijkValues, IJKFlags ijkFlags, bool blockDelete) : base(command, lnr, values, axisFlags, blockDelete)
         {
             Array.Copy(ijkValues, IJKvalues, 3);
             IjkFlags = ijkFlags;
@@ -2328,7 +2343,7 @@ public class GCLinearMotion : GCAxisCommand9
         public GCLinearMotion()
         { }
 
-        public GCLinearMotion(Commands command, uint lnr, double[] values, AxisFlags axisFlags) : base(command, lnr, values, axisFlags)
+        public GCLinearMotion(Commands command, uint lnr, double[] values, AxisFlags axisFlags, bool blockDelete) : base(command, lnr, values, axisFlags, blockDelete)
         { }
 
         public new string ToString()
@@ -2342,7 +2357,7 @@ public class GCAbsLinearMotion : GCAxisCommand9
         public GCAbsLinearMotion()
         { }
 
-        public GCAbsLinearMotion(Commands command, Commands motion, uint lnr, double[] values, AxisFlags axisFlags) : base(command, lnr, values, axisFlags)
+        public GCAbsLinearMotion(Commands command, Commands motion, uint lnr, double[] values, AxisFlags axisFlags, bool blockDelete) : base(command, lnr, values, axisFlags, blockDelete)
         {
             Motion = motion;
         }
@@ -2365,7 +2380,7 @@ public class GCArc : GCAxisCommand3
         public GCArc()
         { }
 
-        public GCArc(Commands cmd, uint lnr, double[] xyz_values, AxisFlags axisFlags, double[] ijk_values, IJKFlags ijkFlags, double r, int p, IJKMode ijkMode) : base(cmd, lnr, xyz_values, axisFlags)
+        public GCArc(Commands cmd, uint lnr, double[] xyz_values, AxisFlags axisFlags, double[] ijk_values, IJKFlags ijkFlags, double r, int p, IJKMode ijkMode, bool blockDelete) : base(cmd, lnr, xyz_values, axisFlags, blockDelete)
         {
             Array.Copy(ijk_values, IJKvalues, 3);
             Array.Copy(Values, end, 3);
@@ -2892,7 +2907,7 @@ public class GCCubicSpline : GCAxisCommand3
         public GCCubicSpline()
         { }
 
-        public GCCubicSpline(Commands cmd, uint lnr, double[] xyz_values, AxisFlags axisFlags, double[] ijpq_values) : base(cmd, lnr, xyz_values, axisFlags)
+        public GCCubicSpline(Commands cmd, uint lnr, double[] xyz_values, AxisFlags axisFlags, double[] ijpq_values, bool blockDelete) : base(cmd, lnr, xyz_values, axisFlags, blockDelete)
         {
             Array.Copy(ijpq_values, IJPQKvalues, 4);
         }
@@ -2940,7 +2955,7 @@ public class GCQuadraticSpline : GCAxisCommand3
         public GCQuadraticSpline()
         { }
 
-        public GCQuadraticSpline(Commands cmd, uint lnr, double[] xyz_values, AxisFlags axisFlags, double[] ij_values) : base(cmd, lnr, xyz_values, axisFlags)
+        public GCQuadraticSpline(Commands cmd, uint lnr, double[] xyz_values, AxisFlags axisFlags, double[] ij_values, bool blockDelete) : base(cmd, lnr, xyz_values, axisFlags, blockDelete)
         {
             Array.Copy(ij_values, IJvalues, 2);
         }
@@ -2989,7 +3004,7 @@ public class GCMacroCall : GCodeToken
         public GCMacroCall()
         { }
 
-        public GCMacroCall(Commands command, uint lnr, uint macroId, uint repeats, double[] values) : base(command, lnr)
+        public GCMacroCall(Commands command, uint lnr, uint macroId, uint repeats, double[] values, bool blockDelete) : base(command, lnr, blockDelete)
         {
             P = macroId;
             L = repeats;
@@ -3012,7 +3027,7 @@ public GCCannedDrill()
         { }
 
         // G81,G85
-        public GCCannedDrill(Commands command, uint lnr, double[] values, AxisFlags axisFlags, double r, uint l) : base(command, lnr, values, axisFlags)
+        public GCCannedDrill(Commands command, uint lnr, double[] values, AxisFlags axisFlags, double r, uint l, bool blockDelete) : base(command, lnr, values, axisFlags, blockDelete)
         {
             R = r;
             L = l == 0 ? 1 : l;
@@ -3020,7 +3035,7 @@ public GCCannedDrill(Commands command, uint lnr, double[] values, AxisFlags axis
         }
 
         // G82,G86,G89
-        public GCCannedDrill(Commands command, uint lnr, double[] values, AxisFlags axisFlags, double r, uint l, double p) : base(command, lnr, values, axisFlags)
+        public GCCannedDrill(Commands command, uint lnr, double[] values, AxisFlags axisFlags, double r, uint l, double p, bool blockDelete) : base(command, lnr, values, axisFlags, blockDelete)
         {
             R = r;
             L = l == 0 ? 1 : l;
@@ -3029,7 +3044,7 @@ public GCCannedDrill(Commands command, uint lnr, double[] values, AxisFlags axis
         }
 
         // G73,G83 // P always 0 for these
-        public GCCannedDrill(Commands command, uint lnr, double[] values, AxisFlags axisFlags, double r, uint l, double p, double q) : base(command, lnr, values, axisFlags)
+        public GCCannedDrill(Commands command, uint lnr, double[] values, AxisFlags axisFlags, double r, uint l, double p, double q, bool blockDelete) : base(command, lnr, values, axisFlags, blockDelete)
         {
             R = r;
             L = l == 0 ? 1 : l;
@@ -3057,7 +3072,7 @@ public class GCSyncMotion : GCAxisCommand3
         public GCSyncMotion()
         { }
 
-        public GCSyncMotion(Commands command, uint lnr, double[] values, AxisFlags axisFlags, double k, int spindle) : base(command, lnr, values, axisFlags)
+        public GCSyncMotion(Commands command, uint lnr, double[] values, AxisFlags axisFlags, double k, int spindle, bool blockDelete) : base(command, lnr, values, axisFlags, blockDelete)
         {
             Spindle = spindle;
             K = k;
@@ -3077,7 +3092,7 @@ public class GCThreadingMotion : AxisCommand3IJK
         public GCThreadingMotion()
         { }
 
-        public GCThreadingMotion(Commands command, uint lnr, double p, double[] values, AxisFlags axisFlags, double[] ijkValues, IJKFlags ijkFlags, double[] optvals, ThreadingFlags threadingFlags, int spindle) : base(command, lnr, values, axisFlags, ijkValues, ijkFlags)
+        public GCThreadingMotion(Commands command, uint lnr, double p, double[] values, AxisFlags axisFlags, double[] ijkValues, IJKFlags ijkFlags, double[] optvals, ThreadingFlags threadingFlags, int spindle, bool blockDelete) : base(command, lnr, values, axisFlags, ijkValues, ijkFlags, blockDelete)
         {
             P = p;
 
@@ -3159,13 +3174,13 @@ public class GCCoordinateSystem : GCAxisCommand9
         public GCCoordinateSystem()
         { }
 
-        public GCCoordinateSystem(Commands cmd, uint lnr, uint p, double[] values, AxisFlags axisFlags) : base(cmd, lnr, values, axisFlags)
+        public GCCoordinateSystem(Commands cmd, uint lnr, uint p, double[] values, AxisFlags axisFlags, bool blockDelete) : base(cmd, lnr, values, axisFlags, blockDelete)
         {
             L = 0;
             P = p;
             R = double.NaN;
         }
-        public GCCoordinateSystem(Commands cmd, uint lnr, uint l, uint p, double[] values, AxisFlags axisFlags) : base(cmd, lnr, values, axisFlags)
+        public GCCoordinateSystem(Commands cmd, uint lnr, uint l, uint p, double[] values, AxisFlags axisFlags, bool blockDelete) : base(cmd, lnr, values, axisFlags, blockDelete)
         {
             L = l;
             P = p;
@@ -3189,7 +3204,7 @@ public class GCToolOffset : GCodeToken
         public GCToolOffset()
         { }
 
-        public GCToolOffset(Commands cmd, uint lnr, uint h) : base(cmd, lnr)
+        public GCToolOffset(Commands cmd, uint lnr, uint h, bool blockDelete) : base(cmd, lnr, blockDelete)
         {
             H = h;
         }
@@ -3207,7 +3222,7 @@ public class GCToolOffsets : GCAxisCommand3
         public GCToolOffsets()
         { }
 
-        public GCToolOffsets(Commands cmd, uint lnr, double[] values, AxisFlags axisFlags) : base(cmd, lnr, values, axisFlags)
+        public GCToolOffsets(Commands cmd, uint lnr, double[] values, AxisFlags axisFlags, bool blockDelete) : base(cmd, lnr, values, axisFlags, blockDelete)
         {
         }
 
@@ -3222,7 +3237,7 @@ public class GCToolTable : GCAxisCommand3
         public GCToolTable()
         { }
 
-        public GCToolTable(Commands cmd, uint lnr, uint l, uint p, double r, double[] values, AxisFlags axisFlags) : base(cmd, lnr, values, axisFlags)
+        public GCToolTable(Commands cmd, uint lnr, uint l, uint p, double r, double[] values, AxisFlags axisFlags, bool blockDelete) : base(cmd, lnr, values, axisFlags, blockDelete)
         {
             P = p;
             R = r;
@@ -3244,7 +3259,7 @@ public class GCScaling : GCAxisCommand9
         public GCScaling()
         { }
 
-        public GCScaling(Commands command, uint lnr, double[] values, AxisFlags axisFlags) : base(command, lnr, values, axisFlags)
+        public GCScaling(Commands command, uint lnr, double[] values, AxisFlags axisFlags, bool blockDelete) : base(command, lnr, values, axisFlags, blockDelete)
         {
         }
 
@@ -3259,7 +3274,7 @@ public class GCToolSelect : GCodeToken
         public GCToolSelect()
         { }
 
-        public GCToolSelect(Commands command, uint lnr, int tool) : base(command, lnr)
+        public GCToolSelect(Commands command, uint lnr, int tool, bool blockDelete) : base(command, lnr, blockDelete)
         {
             Tool = tool;
         }
@@ -3277,12 +3292,12 @@ public class GCFeedrate : GCodeToken
         public GCFeedrate()
         { }
 
-        public GCFeedrate(Commands command, uint lnr, double feedrate) : base(command, lnr)
+        public GCFeedrate(Commands command, uint lnr, double feedrate, bool blockDelete) : base(command, lnr, blockDelete)
         {
             Feedrate = feedrate;
         }
 
-        public GCFeedrate(uint lnr, double feedrate) : base(Commands.Feedrate, lnr)
+        public GCFeedrate(uint lnr, double feedrate, bool blockDelete) : base(Commands.Feedrate, lnr, blockDelete)
         {
             Feedrate = feedrate;
         }
@@ -3300,7 +3315,7 @@ public class GCSpindleRPM : GCodeToken
         public GCSpindleRPM()
         { }
 
-        public GCSpindleRPM(Commands command, uint lnr, double spindleRPM, int spindle) : base(command, lnr)
+        public GCSpindleRPM(Commands command, uint lnr, double spindleRPM, int spindle, bool blockDelete) : base(command, lnr, blockDelete)
         {
             Spindle = spindle;
             SpindleRPM = spindleRPM;
@@ -3320,10 +3335,8 @@ public class GCSpindleState : GCodeToken
         public GCSpindleState()
         { }
 
-        public GCSpindleState(uint lnr, SpindleState spindleState, int spindle)
+        public GCSpindleState(uint lnr, SpindleState spindleState, int spindle, bool blockDelete) : base(spindleState == SpindleState.Off ? Commands.M5 : (spindleState == SpindleState.CW ? Commands.M3 : Commands.M4), lnr, blockDelete)
         {
-            LineNumber = lnr;
-            Command = spindleState == SpindleState.Off ? Commands.M5 : (spindleState == SpindleState.CW ? Commands.M3 : Commands.M4);
             Spindle = spindle;
             SpindleState = spindleState;
         }
@@ -3342,29 +3355,20 @@ public class GCCoolantState : GCodeToken
         public GCCoolantState()
         { }
 
-        public GCCoolantState(uint lnr, CoolantState coolantState)
+        public GCCoolantState(uint lnr, CoolantState coolantState, bool blockDelete) : base(coolantState.HasFlag(CoolantState.Flood) ? Commands.M8 : (coolantState.HasFlag(CoolantState.Mist) ? Commands.M7 : Commands.M9), lnr, blockDelete)
         {
-            LineNumber = lnr;
-            Command = coolantState.HasFlag(CoolantState.Flood) ? Commands.M8 : (coolantState.HasFlag(CoolantState.Mist) ? Commands.M7 : Commands.M9);
             CoolantState = coolantState;
-
         }
 
         public CoolantState CoolantState { get; set; }
-
-        public new string ToString()
-        {
-            return Command.ToString();
-        }
     }
 
-
     public class GCPlane : GCodeToken
     {
         public GCPlane()
         { }
 
-        public GCPlane(Commands cmd, uint lnr) : base(cmd, lnr)
+        public GCPlane(Commands cmd, uint lnr, bool blockDelete) : base(cmd, lnr, blockDelete)
         {
         }
 
@@ -3372,11 +3376,6 @@ public GCPlane(Commands cmd, uint lnr) : base(cmd, lnr)
         public int Axis0 { get { return Plane == Plane.XY ? 0 : (Plane == Plane.XZ ? 2 : 1); } }
         public int Axis1 { get { return Plane == Plane.XY ? 1 : (Plane == Plane.XZ ? 0 : 2); } }
         public int AxisLinear { get { return Plane == Plane.XY ? 2 : (Plane == Plane.XZ ? 1 : 0); } }
-
-        public new string ToString()
-        {
-            return base.ToString();
-        }
     }
 
     public class GCDistanceMode : GCodeToken
@@ -3384,11 +3383,11 @@ public class GCDistanceMode : GCodeToken
         public GCDistanceMode()
         { }
 
-        public GCDistanceMode(Commands command, uint lnr) : base(command, lnr)
+        public GCDistanceMode(Commands command, uint lnr, bool blockDelete) : base(command, lnr, blockDelete)
         {
         }
 
-        public GCDistanceMode(uint lnr, DistanceMode distanceMode) : base(distanceMode == DistanceMode.Absolute ? Commands.G90 : Commands.G91, lnr)
+        public GCDistanceMode(uint lnr, DistanceMode distanceMode, bool blockDelete) : base(distanceMode == DistanceMode.Absolute ? Commands.G90 : Commands.G91, lnr, blockDelete)
         {
         }
 
@@ -3400,11 +3399,11 @@ public class GCFeedRateMode : GCodeToken
         public GCFeedRateMode()
         { }
 
-        public GCFeedRateMode(Commands command, uint lnr) : base(command, lnr)
+        public GCFeedRateMode(Commands command, uint lnr, bool blockDelete) : base(command, lnr, blockDelete)
         {
         }
 
-        public GCFeedRateMode(uint lnr, FeedRateMode feedRateMode) : base(feedRateMode == FeedRateMode.UnitsPerMin ? Commands.G94 : (feedRateMode == FeedRateMode.InverseTime ? Commands.G93 : Commands.G95), lnr)
+        public GCFeedRateMode(uint lnr, FeedRateMode feedRateMode, bool blockDelete) : base(feedRateMode == FeedRateMode.UnitsPerMin ? Commands.G94 : (feedRateMode == FeedRateMode.InverseTime ? Commands.G93 : Commands.G95), lnr, blockDelete)
         {
         }
 
@@ -3416,7 +3415,7 @@ public class GCIJKMode : GCodeToken
         public GCIJKMode()
         { }
 
-        public GCIJKMode(Commands command, uint lnr) : base(command, lnr)
+        public GCIJKMode(Commands command, uint lnr, bool blockDelete) : base(command, lnr, blockDelete)
         {
         }
 
@@ -3428,7 +3427,7 @@ public class GCUnits : GCodeToken
         public GCUnits()
         { }
 
-        public GCUnits(Commands command, uint lnr) : base(command, lnr)
+        public GCUnits(Commands command, uint lnr, bool blockDelete) : base(command, lnr, blockDelete)
         {
         }
 
@@ -3441,7 +3440,7 @@ public class GCLatheMode : GCodeToken
         public GCLatheMode()
         { }
 
-        public GCLatheMode(Commands command, uint lnr) : base(command, lnr)
+        public GCLatheMode(Commands command, uint lnr, bool blockDelete) : base(command, lnr, blockDelete)
         {
         }
 
@@ -3453,7 +3452,7 @@ public class GCDwell : GCodeToken
         public GCDwell()
         { }
 
-        public GCDwell(uint lnr, double delay) : base(Commands.G4, lnr)
+        public GCDwell(uint lnr, double delay, bool blockDelete) : base(Commands.G4, lnr, blockDelete)
         {
             Delay = delay;
         }
@@ -3471,7 +3470,7 @@ public class GCComment : GCodeToken
         public GCComment()
         { }
 
-        public GCComment(Commands command, uint lnr, string comment) : base(command, lnr)
+        public GCComment(Commands command, uint lnr, string comment, bool blockDelete=false) : base(command, lnr, blockDelete)
         {
             Comment = comment.Length == 0 || comment[0] == '(' || comment[0] == ';' ? comment : "(" + comment + ")";
         }
@@ -3489,7 +3488,7 @@ public class GCUserMCommand : GCodeToken
         public GCUserMCommand()
         { }
 
-        public GCUserMCommand(uint lnr, uint mCode, double p, double q) : base(Commands.UserMCommand, lnr)
+        public GCUserMCommand(uint lnr, uint mCode, double p, double q, bool blockDelete) : base(Commands.UserMCommand, lnr, blockDelete)
         {
             M = mCode;
             P = p;
@@ -3511,7 +3510,7 @@ public class GCDigitalOutput : GCodeToken
         public GCDigitalOutput()
         { }
 
-        public GCDigitalOutput(Commands command, uint lnr, uint p) : base(command, lnr)
+        public GCDigitalOutput(Commands command, uint lnr, uint p, bool blockDelete) : base(command, lnr, blockDelete)
         {
             P = p;
         }
@@ -3529,7 +3528,7 @@ public class GCWaitOnInput : GCodeToken
         public GCWaitOnInput()
         { }
 
-        public GCWaitOnInput(uint lnr, int p, int e, uint l, double q) : base(Commands.M67, lnr)
+        public GCWaitOnInput(uint lnr, int p, int e, uint l, double q, bool blockDelete) : base(Commands.M66, lnr, blockDelete)
         {
             P = p;
             E = e;
@@ -3554,7 +3553,7 @@ public class GCAnalogOutput : GCodeToken
         public GCAnalogOutput()
         { }
 
-        public GCAnalogOutput(Commands command, uint lnr, uint e, double q) : base(command, lnr)
+        public GCAnalogOutput(Commands command, uint lnr, uint e, double q, bool blockDelete) : base(command, lnr, blockDelete)
         {
             E = e;
             Q = q;
@@ -3592,7 +3591,7 @@ public class GCFlowControl : GCodeToken
         public GCFlowControl()
         { }
 
-        public GCFlowControl(Commands command, uint lnr, uint o, NGCExpr.FlowControl flowControl, string expression) : base(command, lnr)
+        public GCFlowControl(Commands command, uint lnr, uint o, NGCExpr.FlowControl flowControl, string expression, bool blockDelete) : base(command, lnr, blockDelete)
         {
             O = o;
             FlowControl = flowControl;
@@ -3605,7 +3604,7 @@ public GCFlowControl(Commands command, uint lnr, uint o, NGCExpr.FlowControl flo
 
         public new string ToString()
         {
-            return base.ToString() + "O" + O + FlowControl.ToString().ToLower() + Expression;
+            return base.ToString() + "o" + O + FlowControl.ToString().ToLower() + Expression;
         }
     }
 }
diff --git a/CNC Core/CNC Core/Grbl.cs b/CNC Core/CNC Core/Grbl.cs
index 348b45b..36fc979 100644
--- a/CNC Core/CNC Core/Grbl.cs	
+++ b/CNC Core/CNC Core/Grbl.cs	
@@ -1,13 +1,13 @@
 /*
  * Grbl.cs - part of CNC Controls library
  *
- * v0.44 / 2023-12-27 / Io Engineering (Terje Io)
+ * v0.45 / 2024-11-08 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2023, Io Engineering (Terje Io)
+Copyright (c) 2018-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -116,6 +116,7 @@ public const string
             CMD_GETSETTINGSGROUPS = "$EG",
             CMD_GETALARMCODES = "$EA",
             CMD_GETERRORCODES = "$EE",
+            CMD_GETSPINDLES = "$SPINDLESH",
             CMD_PROGRAM_DEMARCATION = "%",
             CMD_SDCARD_MOUNT = "$FM",
             CMD_SDCARD_DIR = "$F",
@@ -277,6 +278,9 @@ public enum grblHALSetting
         MicroStepsBase = 150,
         StallGuardBase = 200,
         // End per axis settings
+        FtpPort0 = 308,
+        FtpPort1 = 318,
+        FtpPort2 = 328,
         ToolChangeMode = 341,
         UnlockAfterEStop = 484
     }
@@ -870,6 +874,7 @@ public static class GrblCommand
         public static string Mist { get; set; } = ((char)GrblConstants.CMD_COOLANT_MIST_OVR_TOGGLE).ToString();
         public static string Flood { get; set; } = ((char)GrblConstants.CMD_COOLANT_FLOOD_OVR_TOGGLE).ToString();
         public static string Fan { get; set; } = ((char)GrblConstants.CMD_OVERRIDE_FAN0_TOGGLE).ToString();
+        public static string SpindleChange { get; set; } = "M104Q{0}";
         public static string ToolChange { get; set; } = "T{0}";
     }
 
@@ -908,7 +913,7 @@ static GrblInfo()
         }
 
         public static string AxisLetters { get; private set; } = "XYZABCUVW";
-        public static string SignalLetters { get; private set; } = "XYZABCUVWEPRDHSBTOMF"; // Keep in sync with Signals enum above!!
+        public static string SignalLetters { get; private set; } = "XYZABCUVWEPRDHSLTOMF"; // Keep in sync with Signals enum above!!
         public static string PositionFormatString { get; private set; } = string.Empty;
         public static string Version { get; private set; } = string.Empty;
         public static int Build { get; private set; } = 0;
@@ -964,6 +969,8 @@ private set
         public static bool HasPIDLog { get; private set; }
         public static bool HasProbe { get; private set; } = true;
         public static bool HasRTC { get; private set; } = false;
+        public static bool HasVariableSpindle { get; private set; } = false;
+        public static bool HasReversableSpindle { get; private set; } = true;
         public static bool HomingEnabled { get; internal set; } = false;
         public static AxisFlags HomingDirection { get; internal set; } = AxisFlags.None;
         public static bool UseLegacyRTCommands { get; internal set; } = true;
@@ -1237,11 +1244,13 @@ private static void Process(string data)
                         if (s[0].Contains('+'))
                             OptionalSignals |= Signals.SafetyDoor;
                         ForceSetOrigin = s[0].Contains('Z');
+                        HasVariableSpindle = s[0].Contains('V');
+                        HasReversableSpindle = !s[0].Contains('D');
                         if (s.Length > 1)
                             PlanBufferSize = int.Parse(s[1], CultureInfo.InvariantCulture);
                         if (s.Length > 2)
                             SerialBufferSize = int.Parse(s[2], CultureInfo.InvariantCulture);
-                        if (s.Length > 3 && NumAxes != int.Parse(s[3], CultureInfo.InvariantCulture))
+                        if (s.Length > 3 && IsGrblHAL && NumAxes != int.Parse(s[3], CultureInfo.InvariantCulture))
                         {
                             NumAxes = int.Parse(s[3], CultureInfo.InvariantCulture);
                             if (Grbl.GrblViewModel != null)
@@ -1942,6 +1951,102 @@ private static void process(string data)
         }
     }
 
+    public class Spindle
+    {
+        public int SpindleId { get; set; }
+        public int SpindleNum { get; set; }
+        public string Name { get; set; }
+        public bool Variable { get; set; }
+        public bool Direction { get; set; }
+
+        //public IEnumerable<GrblSpindles> Settings
+        //{
+        //    get { return GrblSpindles.Spindles.Where(x => x.SpindleId == Id); }
+        //}
+
+        public Spindle(string data)
+        {
+            string[] values = data.Split('|');
+            if (GrblInfo.IsGrblHAL && GrblInfo.Build < 20240812) // Workaround for controller bug
+            {
+                SpindleId = int.Parse(values[1]);
+                SpindleNum = int.Parse(values[0]);
+            }
+            else
+            {
+                SpindleId = int.Parse(values[0]);
+                SpindleNum = int.Parse(values[1]);
+            }
+            Name = values[4];
+            Variable = values[3].Contains('V');
+            Direction = values[3].Contains('D') || values[3].Contains('L');
+        }
+    }
+
+    public static class GrblSpindles
+    {
+        private static Dispatcher dispatcher;
+        public static ObservableCollection<Spindle> Spindles { get; private set; } = new ObservableCollection<Spindle>();
+
+        private static Action<string> dataReceived;
+
+        public static bool Get()
+        {
+            return Grbl.GrblViewModel != null && Get(Grbl.GrblViewModel);
+        }
+
+        public static bool Get(GrblViewModel model)
+        {
+            bool? res = null;
+
+            if (GrblInfo.IsGrblHAL && GrblInfo.Build >= 20240307 && Spindles.Count == 0)
+            {
+                dispatcher = Dispatcher.CurrentDispatcher;
+                dataReceived += process;
+
+                PollGrbl.Suspend();
+                CancellationToken cancellationToken = new CancellationToken();
+
+                new Thread(() =>
+                {
+                    res = WaitFor.AckResponse<string>(
+                        cancellationToken,
+                        response => dataReceived(response),
+                        a => model.OnResponseReceived += a,
+                        a => model.OnResponseReceived -= a,
+                        400, () => Comms.com.WriteCommand(GrblConstants.CMD_GETSPINDLES));
+                }).Start();
+
+                while (res == null)
+                    EventUtils.DoEvents();
+
+                PollGrbl.Resume();
+                dataReceived -= process;
+            }
+
+            if(Spindles.Count == 0)
+                Spindles.Add(new Spindle("0|0|0|" + (GrblInfo.HasReversableSpindle ? "D" : "") + (GrblInfo.HasVariableSpindle ? "V" : "") + "|Default|0.0|1000.0"));
+
+            return Spindles.Count > 0;
+        }
+
+        private static void process(string data)
+        {
+            if (Dispatcher.CurrentDispatcher != dispatcher)
+            {
+                dispatcher.Invoke(dataReceived, data);
+                return;
+            }
+
+            if (data != "ok")
+            {
+                string[] valuepair = data.TrimEnd(']').Split(':');
+                if (valuepair.Length == 2 && valuepair[0] == "[SPINDLE" && valuepair[1].Split('|')[1] != "-")
+                    Spindles.Add(new Spindle(valuepair[1]));
+            }
+        }
+    }
+
     public class GrblErrors
     {
         private static Dictionary<int, string> messages = new Dictionary<int, string>();
@@ -2878,15 +2983,17 @@ private static void Process(string data)
                             GrblInfo.HasFirmwareJog = true;
                             break;
 
-
                         case GrblSetting.StatusReportMask:
                             {
                                 if (String.IsNullOrEmpty(valuepair[1])) // FluidNC workaround
                                     valuepair[1] = "0";                 // for missing parameter value
-                                var value = int.Parse(valuepair[1]);
-                                Grbl.GrblViewModel.IsParserStateLive = (value & (1 << 9)) != 0;
-                                GrblInfo.ReportProbeResult = ReportProbeCoordinates = (value & (1 << 7)) != 0;
-                                GrblInfo.HasSimpleProbeProtect = (value & (1 << 11)) != 0;
+                                int value;
+                                if (int.TryParse(valuepair[1], out value))
+                                {
+                                    Grbl.GrblViewModel.IsParserStateLive = (value & (1 << 9)) != 0;
+                                    GrblInfo.ReportProbeResult = ReportProbeCoordinates = (value & (1 << 7)) != 0;
+                                    GrblInfo.HasSimpleProbeProtect = (value & (1 << 11)) != 0;
+                                }
                             }
                             break;
                     }
diff --git a/CNC Core/CNC Core/GrblViewModel.cs b/CNC Core/CNC Core/GrblViewModel.cs
index 970f1ac..efccdb5 100644
--- a/CNC Core/CNC Core/GrblViewModel.cs	
+++ b/CNC Core/CNC Core/GrblViewModel.cs	
@@ -1,13 +1,13 @@
 /*
  * GrblViewModel.cs - part of CNC Controls library
  *
- * v0.44 / 2023-12-20 / Io Engineering (Terje Io)
+ * v0.45 / 2024-11-11 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2023, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -49,14 +49,14 @@ namespace CNC.Core
 {
     public class GrblViewModel : MeasureViewModel
     {
-        private string _tool, _message, _WPos, _MPos, _wco, _wcs, _a, _fs, _ov, _pn, _sc, _sd, _fans, _d, _gc, _h, _thcv, _thcs;
+        private string _tool, _message, _WPos, _MPos, _wco, _wcs, _a, _fs, _ov, _pn, _sc, _sd, _fans, _d, _gc, _h, _thcv, _thcs, _spindle;
         private string _mdiCommand, _mdiText, _fileName;
         private string[] _rtState = new string[3];
         private bool has_wco = false, _hasFans = false;
         private bool _flood, _mist, _fan0, _toolChange, _reset, _isMPos, _isJobRunning, _isProbeSuccess, _pgmEnd, _isParserStateLive, _isTloRefSet;
         private bool _isCameraVisible = false, _responseLogVerbose = false, _isProbing = false, _autoReporting = false;
         private bool? _mpg;
-        private int _pwm, _line, _scrollpos, _blocks = 0, _startFromBlock = 0, _executingBlock = 0, _auxinValue = -2, _autoReportInterval = 0;
+        private int _pwm, _line, _scrollpos, _blocks = 0, _startFromBlock = 0, _executingBlock = 0, _auxinValue = -2, _autoReportInterval = 0, _spindle_num = 0;
         private double _feedrate = 0d;
         private double _rpm = 0d, _rpmInput = 0d, _rpmDisplay = 0d, _jogStep = 0.1d, _tloReferenceOffset = double.NaN;
         private double _rpmActual = double.NaN;
@@ -83,6 +83,7 @@ public class GrblViewModel : MeasureViewModel
 
         public delegate void GrblResetHandler();
         public event EventHandler OnCycleStart;
+        public event EventHandler OnStop;
 
         public GrblViewModel()
         {
@@ -110,6 +111,12 @@ public GrblViewModel()
             WorkPositionOffset.PropertyChanged += WorkPositionOffset_PropertyChanged;
             ProbePosition.PropertyChanged += ProbePosition_PropertyChanged;
             ToolOffset.PropertyChanged += ToolOffset_PropertyChanged;
+            GrblSpindles.Spindles.CollectionChanged += Spindles_CollectionChanged;
+        }
+
+        private void Spindles_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(MultiSpindle));
         }
 
         private void Axisletter_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -136,7 +143,7 @@ private void ToolOffset_PropertyChanged(object sender, System.ComponentModel.Pro
 
         private void ProbePosition_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if(e.PropertyName == nameof(Core.Position))
+            if (e.PropertyName == nameof(Core.Position))
                 OnPropertyChanged(nameof(ProbePosition));
         }
 
@@ -188,9 +195,9 @@ public void Clear()
             _fileName = _mdiCommand = _mdiText = string.Empty;
             _streamingState = StreamingState.NoFile;
             _isMPos = _reset = _isJobRunning = _isProbeSuccess = _pgmEnd = _isTloRefSet = false;
-            _pb_avail = _rxb_avail = _rtState[0] = _rtState[1] = _rtState[2] = string.Empty;
+            _pb_avail = _rxb_avail = _rtState[0] = _rtState[1] = _rtState[2] = _spindle = string.Empty;
             _mpg = null;
-            _line = _pwm = _scrollpos = 0;
+            _line = _pwm = _scrollpos = _spindle_num = 0;
             _auxinValue = -2; // No value read (use a nullable type?)
 
             _grblState.Error = 0;
@@ -288,16 +295,14 @@ public void ExecuteCommand(string command)
             }
         }
 
-        public void ExecuteMacro(string macro)
+        public void ExecuteMacro(string[] commands)
         {
-            if (macro != null && macro != string.Empty)
+            if (commands.Length > 0)
             {
                 bool ok = true;
-                var commands = macro.Split('\n');
-
                 var parser = new GCodeParser();
 
-                for(int i = 0; i < commands.Length; i++)
+                for (int i = 0; i < commands.Length; i++)
                 {
                     try
                     {
@@ -311,7 +316,7 @@ public void ExecuteMacro(string macro)
                     }
                 }
 
-                if(ok) foreach (var command in commands)
+                if (ok) foreach (var command in commands)
                 {
                     if (ApplyCommand(command))
                     {
@@ -322,13 +327,19 @@ public void ExecuteMacro(string macro)
             }
         }
 
+        public void ExecuteMacro(string macro)
+        {
+            if (macro != null && macro != string.Empty)
+                ExecuteMacro(macro.Split('\n'));
+        }
+
         private bool canExecuteStartFromBlock(int block)
         {
             return IsFileLoaded && StreamingState == StreamingState.Idle;
         }
         private void ExecuteStartFromBlock(int block)
         {
-            if(canExecuteStartFromBlock(block))
+            if (canExecuteStartFromBlock(block))
                 StartFromBlockNum = block;
         }
 
@@ -365,6 +376,8 @@ public bool LimitTriggered {
         public string MDI { get { return _mdiCommand; } private set { _mdiCommand = value; OnPropertyChanged(); _mdiCommand = string.Empty; } }
         public string MDIText { get { return _mdiText; } set { _mdiText = value; OnPropertyChanged(); } }
         public ObservableCollection<CoordinateSystem> CoordinateSystems { get { return GrblWorkParameters.CoordinateSystems; } }
+        public bool MultiSpindle { get { return GrblSpindles.Spindles.Count > 1; } }
+        public ObservableCollection<Spindle> Spindles { get { return GrblSpindles.Spindles; } }
         public ObservableCollection<Tool> Tools { get { return GrblWorkParameters.Tools; } }
         public ObservableCollection<string> SystemInfo { get { return GrblInfo.SystemInfo; } }
         public string Tool { get { return _tool; } set { _tool = GrblParserState.Tool = value; OnPropertyChanged(); } }
@@ -387,8 +400,8 @@ private set
         //        public bool CanReset { get { return _canReset; } private set { if(value != _canReset) { _canReset = value; OnPropertyChanged(); } } }
         public bool GrblReset { get { return _reset; } set { if ((_reset = value)) { _grblState.Error = 0; OnPropertyChanged(); Message = ""; } } }
         public GrblState GrblState { get { return _grblState; } set { _grblState = value; OnPropertyChanged(); } }
-        public bool AutoReportingEnabled { get { return _autoReporting; } private set { { _autoReporting = value; OnPropertyChanged(); } } }
-        public int AutoReportInterval { get { return _autoReportInterval;  } private set { { _autoReportInterval = value;  OnPropertyChanged();  } } }
+        public bool AutoReportingEnabled { get { return _autoReporting; } set { { _autoReporting = value; OnPropertyChanged(); } } }
+        public int AutoReportInterval { get { return _autoReportInterval; } private set { { _autoReportInterval = value; OnPropertyChanged(); } } }
         public bool IsGCLock { get { return _grblState.State == GrblStates.Alarm; } }
         public bool IsCheckMode { get { return _grblState.State == GrblStates.Check; } }
         public bool IsSleepMode { get { return _grblState.State == GrblStates.Sleep; } }
@@ -399,14 +412,14 @@ public bool IsJobRunning {
             set {
                 if (_isJobRunning != value) {
                     _isJobRunning = value;
-                    if (!_isJobRunning)
+                    if (!_isJobRunning && GrblState.State != GrblStates.Tool)
                         JobTimer.Stop();
                     OnPropertyChanged();
                 }
             }
         }
         public bool IsProbing { get { return _isProbing; } set { _isProbing = value; OnPropertyChanged(); } }
-        public bool ProgramEnd { get { return _pgmEnd; } set { _pgmEnd = value; if(_pgmEnd) OnPropertyChanged(); } }
+        public bool ProgramEnd { get { return _pgmEnd; } set { _pgmEnd = value; if (_pgmEnd) OnPropertyChanged(); } }
         public int GrblError { get { return _grblState.Error; } set { _grblState.Error = value; OnPropertyChanged(); } }
         public StreamingState StreamingState { get { return _streamingState; } set { if (_streamingState != value) { _streamingState = value; OnPropertyChanged(); } } }
         public string WorkCoordinateSystem { get { return _wcs; } private set { _wcs = value; OnPropertyChanged(); } }
@@ -448,7 +461,7 @@ public int Blocks
                 OnPropertyChanged();
             }
         }
-        public int StartFromBlockNum { get { return _startFromBlock; } private set { _startFromBlock = value; OnPropertyChanged(); _startFromBlock = 0;  } }
+        public int StartFromBlockNum { get { return _startFromBlock; } private set { _startFromBlock = value; OnPropertyChanged(); _startFromBlock = 0; } }
         public int BlockExecuting { get { return _executingBlock; } set { _executingBlock = value; OnPropertyChanged(); } }
         public bool IsPhysicalFileLoaded { get { return _fileName != string.Empty && (_fileName.StartsWith(@"\\") || _fileName[1] == ':'); } }
         public bool? IsMPGActive { get { return _mpg; } private set { if (_mpg != value) { _mpg = value; OnPropertyChanged(); } } }
@@ -464,7 +477,7 @@ private set
                 if (_latheMode != value)
                 {
                     _latheMode = value;
-                    if(_latheMode != LatheMode.Disabled && NumAxes == 2)
+                    if (_latheMode != LatheMode.Disabled && NumAxes == 2)
                     {
                         Position.Y = MachinePosition.Y = WorkPosition.Y = WorkPositionOffset.Y = 0d;
                     }
@@ -489,19 +502,19 @@ public AxisFlags AxisEnabledFlags {
                 {
                     if (has_wco)
                         MachinePosition.Set(WorkPosition + WorkPositionOffset);
-                    else if(WorkPosition.IsSet(GrblInfo.AxisFlags))
+                    else if (WorkPosition.IsSet(GrblInfo.AxisFlags))
                         Position.Set(WorkPosition);
                 }
             }
         }
-        public int ScrollPosition { get { return _scrollpos; } set { _scrollpos = value;  OnPropertyChanged(); } }
+        public int ScrollPosition { get { return _scrollpos; } set { _scrollpos = value; OnPropertyChanged(); } }
         public double JogStep { get { return _jogStep; } set { _jogStep = value; OnPropertyChanged(); } }
         public GrblEncoderMode OverrideEncoderMode { get { return _encoder_ovr; } set { _encoder_ovr = value; OnPropertyChanged(); } }
 
         public string RunTime { get { return JobTimer.RunTime; } set { OnPropertyChanged(); } } // Cannot be set...
                                                                                                 // CO2 Laser
         public bool HasFans { get { return _hasFans; } set { _hasFans = value; OnPropertyChanged(); } }
-        public bool Fan0 { get { return _fan0; }  set { _fan0 = value; OnPropertyChanged(); } }
+        public bool Fan0 { get { return _fan0; } set { _fan0 = value; OnPropertyChanged(); } }
         public int LineNumber { get { return _line; } private set { _line = value; OnPropertyChanged(); } }
 
         public double THCVoltage { get { return _thcVoltage; } private set { _thcVoltage = value; OnPropertyChanged(); } }
@@ -509,6 +522,8 @@ public AxisFlags AxisEnabledFlags {
 
         #region A - Spindle, Coolant and Tool change status
 
+        public int SpindleNum { get { return _spindle_num; } set { _spindle_num = value; OnPropertyChanged(); } }
+
         public bool Mist
         {
             get { return _mist; }
@@ -986,7 +1001,7 @@ private bool Set(string parameter, string value)
 
                         if (!IgnoreNextCycleStart)
                         {
-                            if (isCycleStart && !_pn.Contains('H'))
+                            if (isCycleStart && !_pn.Contains('H') && (GrblState.State == GrblStates.Idle || GrblState.State == GrblStates.Tool))
                                 OnCycleStart?.Invoke(this, EventArgs.Empty);
                         } else
                             IgnoreNextCycleStart = false;
@@ -1025,6 +1040,18 @@ private bool Set(string parameter, string value)
                     }
                     break;
 
+                case "S":
+                    if(_spindle != value)
+                    {
+                        _spindle = value;
+                        try
+                        {
+                            SpindleNum = int.Parse(value);
+                        }
+                        catch { };
+                    }
+                    break;
+
                 case "Sc":
                     if (_sc != value)
                     {
@@ -1075,8 +1102,11 @@ private bool Set(string parameter, string value)
                 case "MPG":
                     GrblInfo.MPGMode = _grblState.MPG = value == "1";
                     IsMPGActive = _grblState.MPG;
-                    if(IsMPGActive == false && AutoReportInterval > 0)
+                    if (IsMPGActive == false && AutoReportingEnabled)
+                    {
+                        AutoReportingEnabled = false;
                         Comms.com.WriteByte(GrblConstants.CMD_AUTO_REPORTING_TOGGLE);
+                    }
                     break;
 
                 case "H":
@@ -1250,7 +1280,9 @@ public void DataReceived(string data)
                                 if (IsSDCardJob)
                                     IsJobRunning = false;
                             }
-                        break;
+                            else if (msg == "Stop")
+                                OnStop?.Invoke(this, EventArgs.Empty);
+                            break;
                 }
             }
             else if (data.ToLower().StartsWith("grbl"))
@@ -1266,8 +1298,11 @@ public void DataReceived(string data)
                 _reset = false;
                 OnPropertyChanged(nameof(IsCheckMode));
                 OnPropertyChanged(nameof(IsSleepMode));
-                if(IsReady && AutoReportingEnabled)
+                if (IsReady && AutoReportingEnabled)
+                {
+                    AutoReportingEnabled = false;
                     Comms.com.WriteByte(GrblConstants.CMD_AUTO_REPORTING_TOGGLE);
+                }
             }
             else if (_grblState.State != GrblStates.Jog)
             {
diff --git a/CNC Core/CNC Core/LibStrings.xaml b/CNC Core/CNC Core/LibStrings.xaml
index 45a1b4e..86818c4 100644
--- a/CNC Core/CNC Core/LibStrings.xaml	
+++ b/CNC Core/CNC Core/LibStrings.xaml	
@@ -15,6 +15,7 @@
     <system:String x:Uid="str_gcParserToolProfile" x:Key="ParserToolProfile">Tool {0} not associated with a profile</system:String>
     <system:String x:Uid="str_gcParserM66PandE" x:Key="ParserM66PandE">Cannot use both P- and E-word with M66</system:String>
     <system:String x:Uid="str_gcParserM66NoPorE" x:Key="ParserM66NoPorE">P- or E-word missing for M66</system:String>
+    <system:String x:Uid="str_gcParserM66BadParams" x:Key="ParserM66BadParams">Illegal M66 parameters</system:String>
     <system:String x:Uid="str_gcParserG6NoP" x:Key="ParserG6NoP">G4 - missing P word</system:String>
     <system:String x:Uid="str_gcParserNoG0orG1" x:Key="ParserNoG0orG1">G0 or G1 not active</system:String>
     <system:String x:Uid="str_gcParserG1NoFeed" x:Key="ParserG1NoFeed">G1 used when feed rate is not set</system:String>
diff --git a/CNC Core/CNC Core/Machine.cs b/CNC Core/CNC Core/Machine.cs
index 1634048..e675f61 100644
--- a/CNC Core/CNC Core/Machine.cs	
+++ b/CNC Core/CNC Core/Machine.cs	
@@ -1,13 +1,13 @@
 /*
  * Machine.cs - part of CNC Core library
  *
- * v0.44 / 2023-11-30 / Io Engineering (Terje Io)
+ * v0.45 / 2022-11-10 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2023, Io Engineering (Terje Io)
+Copyright (c) 2020-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -116,20 +116,30 @@ public void Reset()
                 machinePos[i] = 0d;
                 scaleFactors[i] = 1d;
                 toolOffsets[i] = SelectedTool == null ? 0d : SelectedTool.Values[i];
+
+                if(LatheUVWMode && i >= 6)
+                {   
+                    if (g28 != null)
+                        g28.Values[i] = g28.Values[i - 6];
+                    if (g30 != null)
+                        g30.Values[i] = g28.Values[i - 6];
+                    if (g92 != null)
+                        g92.Values[i] = g28.Values[i - 6];
+                }
             }
 
             switch (GrblParserState.Plane)
             {
                 case GCode.Plane.XY:
-                    Plane = new GCPlane(Commands.G17, 0);
+                    Plane = new GCPlane(Commands.G17, 0, false);
                     break;
 
                 case GCode.Plane.XZ:
-                    Plane = new GCPlane(Commands.G18, 0);
+                    Plane = new GCPlane(Commands.G18, 0, false);
                     break;
 
                 case GCode.Plane.YZ:
-                    Plane = new GCPlane(Commands.G19, 0);
+                    Plane = new GCPlane(Commands.G19, 0, false);
                     break;
             }
         }
diff --git a/CNC Core/CNC Core/Properties/AssemblyInfo.cs b/CNC Core/CNC Core/Properties/AssemblyInfo.cs
index c20a5a0..5c620b3 100644
--- a/CNC Core/CNC Core/Properties/AssemblyInfo.cs	
+++ b/CNC Core/CNC Core/Properties/AssemblyInfo.cs	
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
 [assembly: AssemblyProduct("ioSender")]
-[assembly: AssemblyCopyright("Copyright © 2023 Io Engineering")]
+[assembly: AssemblyCopyright("Copyright © 2024 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
@@ -35,5 +35,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.44.0")]
-[assembly: AssemblyFileVersion("2.0.44")]
+[assembly: AssemblyVersion("2.0.45.0")]
+[assembly: AssemblyFileVersion("2.0.45.0")]
diff --git a/CNC Core/CNC Core/SerialStream.cs b/CNC Core/CNC Core/SerialStream.cs
index 56c0978..b16e664 100644
--- a/CNC Core/CNC Core/SerialStream.cs	
+++ b/CNC Core/CNC Core/SerialStream.cs	
@@ -262,6 +262,13 @@ public void WriteString(string data)
         {
             byte[] bytes = Encoding.Default.GetBytes(data);
             WriteBytes(bytes, bytes.Length);
+#if RESPONSELOG
+            if (log != null)
+            {
+                log.WriteLine(data);
+                log.Flush();
+            }
+#endif
         }
 
         public void WriteCommand(string command)
@@ -272,6 +279,13 @@ public void WriteCommand(string command)
                 WriteByte((byte)command.ToCharArray()[0]);
             else
             {
+#if RESPONSELOG
+                if (log != null)
+                {
+                    log.WriteLine(command);
+                    log.Flush();
+                }
+#endif
                 command += "\r";
                 byte[] bytes = System.Text.Encoding.UTF8.GetBytes(command);
                 if(serialPort != null)
diff --git a/Grbl Config App/Grbl Config App/MainWindow.xaml.cs b/Grbl Config App/Grbl Config App/MainWindow.xaml.cs
index 24a3241..1b282c7 100644
--- a/Grbl Config App/Grbl Config App/MainWindow.xaml.cs	
+++ b/Grbl Config App/Grbl Config App/MainWindow.xaml.cs	
@@ -2,13 +2,13 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.38 / 2022-06-13 / Io Engineering (Terje Io)
+ * v0.45 / 2024-12-11 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2022, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -52,7 +52,7 @@ namespace Grbl_Config_App
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.42";
+        private const string version = "2.0.45";
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
 
         public MainWindow()
diff --git a/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs b/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs
index 1dfba20..b962fab 100644
--- a/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs	
+++ b/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs	
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
 [assembly: AssemblyProduct("Grbl Config App")]
-[assembly: AssemblyCopyright("Copyright ©  2023 Io Engineering")]
+[assembly: AssemblyCopyright("Copyright ©  2024 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.42.0")]
-[assembly: AssemblyFileVersion("2.0.42.0")]
+[assembly: AssemblyVersion("2.0.45.0")]
+[assembly: AssemblyFileVersion("2.0.45.0")]
diff --git a/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
index ad69bba..7cf4956 100644
--- a/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
@@ -1,8 +1,11 @@
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Position hinzu
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click for actions menu.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources\\menu_22x22.png
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Position hinzu
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_addProfile:System.Windows.Controls.ContentControl.Content,Button,True,True,,...
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Anwenden
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Anwenden
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Löschen
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_close:System.Windows.Controls.ContentControl.Content,Button,True,True,,Schließen
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,Aus Programmgrenzen einstellen
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,Tastatur Bewegungen aktivieren
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Strg+Shift zum Aktivieren
@@ -24,8 +27,10 @@ CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Wi
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,chk_runonce:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Run once
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Nutze X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useXY:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X,Y"
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,dlg_probingMacros:System.Windows.Window.Title,Title,True,True,,Probing macros
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Antast Tiefe:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Z-Versatz von der aktuellen Position, an der die Antastung erfolgen soll"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_diameter:CNC.Controls.NumericField.Label,None,False,True,,Durchmesser:
@@ -72,15 +77,20 @@ CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffse
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece offset
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Vorschau
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Offset hinzu
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Prüfe Sensor Status vor dem Start (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Ein Alarm wird erzeugt, wenn nicht aktiviert und ein Sensor angeschlossen ist"
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Werkzeug Längenversatz löschen
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Höhe
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Höhe
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Höhe:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Höhe:
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Höhe:
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,T:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Rückzugsweg:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,"Rückzugsweg für die zweite langsame Antastbewegung, zum Überspringen auf 0 setzen"
@@ -91,6 +101,8 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Win
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Deaktivieren und X- oder Y-Größe auf 0 setzen, um nur in eine Richtung zu messen."
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Sperren
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Pause vor dem Antasten
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_postjobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Post job:
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_prejobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Pre job:
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Vorschau
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Vorschau
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Vorschau
@@ -113,8 +125,11 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:Sys
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_width:CNC.Controls.NumericField.Label,None,False,True,,B:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,mit Werkzeug:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Hinzu
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Add
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Löschen
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Setze Koordinatensystem:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Antastung XY-Abstand zu groß für Werkstückgröße {0}.
@@ -141,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Tastatur-Jogging aktiv
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Tastatur-Jogging deaktiviert
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_macroChangedSave:System.String.$Content,None,True,True,,"Macro was changed, save?"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
 CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Antasten…
@@ -174,4 +190,6 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_heightmap:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Höhenkarte
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Rotation:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Drehung
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_toolOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Werkzeuglängenversatz
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_postprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to after before probing completes.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_preprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to run before probing starts.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,Warnung! Vorsicht bei der Verwendung - falsche Parameter können Ihre Tastspitze beschädigen!
diff --git a/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
index 804620d..1bce8d5 100644
--- a/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
@@ -50,6 +50,7 @@ CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Hochladen
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Alles Nullen
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm before executing
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,chk_viewAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Rechtsklick für Menü, Doppelklick zum Ausführen der Datei."
 CNC.Controls.WPF.g.en-US.resources:about.baml,dlg_about:System.Windows.Window.Title,Title,True,True,,Über
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,Verbindung zum Sender
@@ -173,6 +174,7 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalBlockDelete:Sys
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalCycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Start
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalEStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,E-Stop
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalFeedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Pause
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorFault:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Motor fault
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorWarning:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Motor Warnung
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalOptionalStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Optional stop
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalProbe:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Tastsignal
@@ -198,7 +200,7 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windo
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Ausführen
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,Nach einer Änderung der Einstellungen ist ein Neustart erforderlich!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Warnung! - Grbl hat Fehler bei der Jog-Abschaltung (beim Lösen der Taste).
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfCreate:System.String.$Content,None,True,True,,"Config-Datei nicht gefunden oder ungültig, neu erstellen?"
@@ -248,12 +250,15 @@ CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,str_outlineFlyout:System.S
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_pause:System.String.$Content,None,True,True,,Pause
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateG17G18Arcs:System.String.$Content,None,True,True,,Im GCode enthaltene Kreise in XZ- oder YZ-Ebene (G18/19) können nicht umgewandelt werden. Verwenden Sie &apos;Kreisbogen zu Linien&apos; wenn Sie dies wirklich brauchen.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateRadiusArcs:System.String.$Content,None,True,True,,Im GCode enthaltene Kreise können nicht umgewandelt werden. Verwenden Sie &apos;Kreisbogen zu Linien&apos; wenn Sie dies wirklich brauchen.
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_runMacro:System.String.$Content,None,True,True,,Run macro {0} with no parameters?
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Run {0} macro?
 CNC.Controls.WPF.g.en-US.resources:macrotoolbarcontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Macro {0} starten?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_saveSettings:System.String.$Content,None,True,True,,"Einstellungen geändert, speichern?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.String.$Content,None,True,True,,"Einstellung {0} ergab {1}, weiter?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Schade...\\nWeiter laden?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,Datei enthält keine Einstellungen.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"{0} settings were ignored, not supported by the controller."
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"Some settings were ignored, not supported by the controller."
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Einstellungen aus Datei wiederherstellen
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Zeitüberschreitung beim Setzen von {0}, weiter?"
diff --git a/Locale/de-DE/csv/CNC.Core.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Core.resources.de-DE.csv
index 44eceaa..cfb627e 100644
--- a/Locale/de-DE/csv/CNC.Core.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Core.resources.de-DE.csv
@@ -12,6 +12,7 @@ CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserErrE:System.String.$Conte
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG1NoFeed:System.String.$Content,None,True,True,,"G1 wird genutzt, wenn Vorschub nicht angegeben"
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG6NoP:System.String.$Content,None,True,True,,G4 - P Wert fehlt
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserKlesseqJ:System.String.$Content,None,True,True,,K Wert muss größer sein als J Wert
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66BadParams:System.String.$Content,None,True,True,,Illegal M66 parameters
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66NoPorE:System.String.$Content,None,True,True,,P- oder E-Wert fehlen für M66
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66PandE:System.String.$Content,None,True,True,,P- und E-Wort können nicht gleichzeitig mit M66 verwendet werden
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserModalGrpError:System.String.$Content,None,True,True,,Modalgruppenverletzung
diff --git a/Locale/de-DE/translation.txt b/Locale/de-DE/translation.txt
index 1749cf7..ab02659 100644
Binary files a/Locale/de-DE/translation.txt and b/Locale/de-DE/translation.txt differ
diff --git a/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
index 3ffb354..509405b 100644
--- a/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
@@ -1,8 +1,11 @@
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Add _position
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click for actions menu.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources\\menu_22x22.png
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Add _position
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_addProfile:System.Windows.Controls.ContentControl.Content,Button,True,True,,...
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Apply
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Apply
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_close:System.Windows.Controls.ContentControl.Content,Button,True,True,,Close
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set from program limits
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,Click to activate keyboard jogging
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift to activate
@@ -24,8 +27,10 @@ CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Wi
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,chk_runonce:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Run once
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useXY:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X,Y"
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,dlg_probingMacros:System.Windows.Window.Title,Title,True,True,,Probing macros
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Depth:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Z offset from current position where probing will take place
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_diameter:CNC.Controls.NumericField.Label,None,False,True,,Diameter:
@@ -72,15 +77,20 @@ CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffse
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece offset
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Add offset
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Check probe status before start (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,An alarm will be generated by the controller if not enabled and the probe is asserted.
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear tool length offset
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Height
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Height
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Height:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Height:
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Height:
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Latch distance:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,"Distance to retract for second slow probing move, set to 0 to skip"
@@ -91,6 +101,8 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Win
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Unlock and set X or Y size to 0 to probe in one direction only.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Lock
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Pause before probing
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_postjobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Post job:
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_prejobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Pre job:
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
@@ -113,8 +125,11 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:Sys
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_width:CNC.Controls.NumericField.Label,None,False,True,,W:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,with tool:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Add
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Add
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set coordinate system:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Probing XY clearance too large for workpiece {0} size.
@@ -141,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Keyboard jogging active
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Keyboard jogging disabled
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_macroChangedSave:System.String.$Content,None,True,True,,"Macro was changed, save?"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
 CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Probing...
@@ -174,4 +190,6 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_heightmap:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Height map
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Rotation:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Rotation
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_toolOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Tool length offset
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_postprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to after before probing completes.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_preprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to run before probing starts.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,Warning! Use with care - incorrect parameters may damage your probe!
diff --git a/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
index a398ecd..52dbecb 100644
--- a/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
@@ -50,6 +50,7 @@ CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Upload
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zero all
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm before executing
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,chk_viewAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Right click for menu, double click to run file."
 CNC.Controls.WPF.g.en-US.resources:about.baml,dlg_about:System.Windows.Window.Title,Title,True,True,,About
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,Sender connection
@@ -173,6 +174,7 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalBlockDelete:Sys
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalCycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Cycle start
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalEStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,E-Stop
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalFeedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed hold
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorFault:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Motor fault
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorWarning:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Motor warning
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalOptionalStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Optional stop
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalProbe:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Probe
@@ -198,7 +200,7 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windo
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Run
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,A restart is required after changing settings!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Warning! - Grbl has outstanding bug(s) in jog cancel (on key up).
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfCreate:System.String.$Content,None,True,True,,"Config file not found or invalid, create new?"
@@ -248,12 +250,15 @@ CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,str_outlineFlyout:System.S
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_pause:System.String.$Content,None,True,True,,Pause
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateG17G18Arcs:System.String.$Content,None,True,True,,"GCode contains arcs in XZ or YZ plane (G18/19), can&apos;t apply transform. Use &apos;Arcs to Lines&apos; if you really need this."
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateRadiusArcs:System.String.$Content,None,True,True,,"GCode contains radius mode arcs, can&apos;t apply transform. Use &apos;Arcs to Lines&apos; if you really need this."
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_runMacro:System.String.$Content,None,True,True,,Run macro {0} with no parameters?
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Run {0} macro?
 CNC.Controls.WPF.g.en-US.resources:macrotoolbarcontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Run {0} macro?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_saveSettings:System.String.$Content,None,True,True,,"Settings changed, save now?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.String.$Content,None,True,True,,"Setting {0} returned {1}, continue?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Bummer...\\nContinue loading?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,The file does not contain any settings.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"{0} settings were ignored, not supported by the controller."
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"Some settings were ignored, not supported by the controller."
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Restore settings from file
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Timed out while setting {0}, continue?"
diff --git a/Locale/en-US/csv/CNC.Core.resources.en-US.csv b/Locale/en-US/csv/CNC.Core.resources.en-US.csv
index aa3fc8a..39b9a6c 100644
--- a/Locale/en-US/csv/CNC.Core.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Core.resources.en-US.csv
@@ -12,6 +12,7 @@ CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserErrE:System.String.$Conte
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG1NoFeed:System.String.$Content,None,True,True,,G1 used when feed rate is not set
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG6NoP:System.String.$Content,None,True,True,,G4 - missing P word
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserKlesseqJ:System.String.$Content,None,True,True,,K word must be greater than J word
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66BadParams:System.String.$Content,None,True,True,,Illegal M66 parameters
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66NoPorE:System.String.$Content,None,True,True,,P- or E-word missing for M66
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66PandE:System.String.$Content,None,True,True,,Cannot use both P- and E-word with M66
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserModalGrpError:System.String.$Content,None,True,True,,Modal group violation
diff --git a/Locale/en-US/translation.txt b/Locale/en-US/translation.txt
index b7f988f..49cced6 100644
Binary files a/Locale/en-US/translation.txt and b/Locale/en-US/translation.txt differ
diff --git a/Locale/hu-HU/csv/CNC.Controls.Probing.resources.hu-HU.csv b/Locale/hu-HU/csv/CNC.Controls.Probing.resources.hu-HU.csv
index c826e92..12dfe7b 100644
--- a/Locale/hu-HU/csv/CNC.Controls.Probing.resources.hu-HU.csv
+++ b/Locale/hu-HU/csv/CNC.Controls.Probing.resources.hu-HU.csv
@@ -1,8 +1,11 @@
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Hozzáadás _pozíció
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click for actions menu.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources\\menu_22x22.png
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Hozzáadás _pozíció
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_addProfile:System.Windows.Controls.ContentControl.Content,Button,True,True,,...
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Alkalmaz
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Alkalmaz
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Tisztít
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_close:System.Windows.Controls.ContentControl.Content,Button,True,True,,Bezárás
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,Beállítás a program korlátaiból
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,Kattintson a billentyűzet kocogás aktiválásához
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift az aktiváláshoz
@@ -24,8 +27,10 @@ CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Wi
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Használja a kameraállásokat
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,chk_runonce:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Run once
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Használja X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useXY:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X,Y"
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,dlg_probingMacros:System.Windows.Window.Title,Title,True,True,,Probing macros
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Mélység:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Z eltolás az aktuális pozícióhoz képest, ahol a tapintásra kerül sor"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_diameter:CNC.Controls.NumericField.Label,None,False,True,,Átmérő:
@@ -72,15 +77,20 @@ CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffse
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece offset
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Előnézet
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Eltolás hozzáadása
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,A szonda manuális ellenőrzése csatlakoztatva van
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Egy párbeszédpanel jelenik meg mindaddig, amíg a szondát érvényesítik vagy a párbeszédpanelt meg nem szakítják."
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Indítás előtt ellenőrizze a szonda állapotát (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"A vezérlő riasztást generál, ha nincs engedélyezve, és a szonda érvényesül."
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Tiszta szerszámhossz-eltolás
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Magasság
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Magasság
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Magasság:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Magasság:
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Magasság:
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Retesz távolság:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,"Távolság a visszahúzáshoz a második lassú tapintási lépéshez, állítsa 0-ra az átugráshoz"
@@ -91,6 +101,8 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Win
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Oldja fel a zárolást, és állítsa az X vagy Y méretet 0-ra, hogy csak egy irányban vizsgáljon."
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Zár
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Szünet a szondázás előtt
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_postjobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Post job:
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_prejobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Pre job:
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Előnézet
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Előnézet
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Előnézet
@@ -113,8 +125,11 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:Sys
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_width:CNC.Controls.NumericField.Label,None,False,True,,W:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,szerszámmal:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Hozzáadás
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Add
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Törlés
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Frissítés
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Állítsa be a koordinátarendszert:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Kamera Pozíció {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,A tapintási XY hézag túl nagy a munkadarab {0} méretéhez.
@@ -141,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Billentyűzet kocogás aktív
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Billentyűzet kocogás letiltva
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_macroChangedSave:System.String.$Content,None,True,True,,"Macro was changed, save?"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} szondapozíció szükséges.
 CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Állítsd a szondát a kapcsolat ellenőrzéséhez.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Szondázás...
@@ -174,4 +190,6 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_heightmap:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Magasság térkép
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Rotation:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Forgás
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_toolOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Tool length eltolása
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_postprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to after before probing completes.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_preprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to run before probing starts.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,Figyelem! Használja körültekintően – a helytelen paraméterek károsíthatják a szondát!
diff --git a/Locale/hu-HU/csv/CNC.Controls.WPF.resources.hu-HU.csv b/Locale/hu-HU/csv/CNC.Controls.WPF.resources.hu-HU.csv
index 950f21f..10a8c09 100644
--- a/Locale/hu-HU/csv/CNC.Controls.WPF.resources.hu-HU.csv
+++ b/Locale/hu-HU/csv/CNC.Controls.WPF.resources.hu-HU.csv
@@ -50,6 +50,7 @@ CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Feltöltés
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Mind nullára
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Végrehajtás előtt erősítse meg
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,chk_viewAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Kattintson a jobb gombbal a menühöz, kattintson duplán a fájl futtatásához."
 CNC.Controls.WPF.g.en-US.resources:about.baml,dlg_about:System.Windows.Window.Title,Title,True,True,,Az IOSender
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,Feladó kapcsolat
@@ -173,6 +174,7 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalBlockDelete:Sys
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalCycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ciklusindítás
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalEStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,E-Stop
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalFeedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Előtolás tartás
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorFault:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Motor fault
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorWarning:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Motor figyelmeztetés
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalOptionalStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Opcionális megállás
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalProbe:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Szonda
@@ -198,7 +200,7 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windo
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Fut
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,A beállítások módosítása után újraindítás szükséges!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Figyelem! - A Grbl-nek kiemelkedő hibái vannak a kocogó-megszakításnál (felfelé mutató gombnál).
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfCreate:System.String.$Content,None,True,True,,"A konfigurációs fájl nem található vagy érvénytelen, hozzon létre újat?"
@@ -248,12 +250,15 @@ CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,str_outlineFlyout:System.S
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_pause:System.String.$Content,None,True,True,,Szünet
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateG17G18Arcs:System.String.$Content,None,True,True,,"A GCode XZ vagy YZ síkban íveket tartalmaz (G18/19), transzformáció nem alkalmazható. Használat &apos;Arcs to Lines&apos; ha tényleg szüksége van erre."
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateRadiusArcs:System.String.$Content,None,True,True,,"A GCode sugármódú íveket tartalmaz, nem alkalmazható transzformáció. Használat &apos;Arcs to Lines&apos; ha tényleg szüksége van erre."
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_runMacro:System.String.$Content,None,True,True,,Run macro {0} with no parameters?
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Fut {0} makró?
 CNC.Controls.WPF.g.en-US.resources:macrotoolbarcontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Fut {0} makró?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_saveSettings:System.String.$Content,None,True,True,,"A beállítások megváltoztak, mentse most?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.String.$Content,None,True,True,,"A(z) {0} beállítás eredménye {1}, folytassa?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Baj...\\nBetöltés folytatása?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,A fájl nem tartalmaz semmilyen beállítást.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"{0} settings were ignored, not supported by the controller."
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"Some settings were ignored, not supported by the controller."
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Beállítások visszaállítása fájlból
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Beállítások elmentve.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Időtúllépés történt a(z) {0} beállítása közben, folytassa?"
diff --git a/Locale/hu-HU/csv/CNC.Core.resources.hu-HU.csv b/Locale/hu-HU/csv/CNC.Core.resources.hu-HU.csv
index e6a7747..edacd1c 100644
--- a/Locale/hu-HU/csv/CNC.Core.resources.hu-HU.csv
+++ b/Locale/hu-HU/csv/CNC.Core.resources.hu-HU.csv
@@ -12,6 +12,7 @@ CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserErrE:System.String.$Conte
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG1NoFeed:System.String.$Content,None,True,True,,"G1 akkor használatos, ha az előtolás nincs beállítva"
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG6NoP:System.String.$Content,None,True,True,,G4 - hiányzik a P paraméter
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserKlesseqJ:System.String.$Content,None,True,True,,"K paraméternek nagyobbnak kell lennie, mint J paraméter"
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66BadParams:System.String.$Content,None,True,True,,Illegal M66 parameters
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66NoPorE:System.String.$Content,None,True,True,,P- vagy E-paraméter hiányzik az M66-nál
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66PandE:System.String.$Content,None,True,True,,Nem használható egyszerre a P- és az E-paraméter az M66-tal
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserModalGrpError:System.String.$Content,None,True,True,,Modális csoport megsértése
diff --git a/Locale/hu-HU/translation.txt b/Locale/hu-HU/translation.txt
index 9a1f3a5..231f74b 100644
Binary files a/Locale/hu-HU/translation.txt and b/Locale/hu-HU/translation.txt differ
diff --git a/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv b/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv
index 1966a0c..4af9642 100644
--- a/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv
+++ b/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv
@@ -1,8 +1,11 @@
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Adicionar _posição
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click for actions menu.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources\\menu_22x22.png
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Adicionar _posição
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_addProfile:System.Windows.Controls.ContentControl.Content,Button,True,True,,...
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Aplicar
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Aplicar
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Limpar
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_close:System.Windows.Controls.ContentControl.Content,Button,True,True,,Fechar
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,Definir a partir dos limites do programa
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clique para ativar o movimento da sonda a partir do teclado
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift para ativar
@@ -24,8 +27,10 @@ CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Wi
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Usar posições da camera
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,chk_runonce:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Run once
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Usar X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useXY:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X,Y"
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,dlg_probingMacros:System.Windows.Window.Title,Title,True,True,,Probing macros
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Profundidade:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Offset de Z da sonda para o ponto controlado
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_diameter:CNC.Controls.NumericField.Label,None,False,True,,Diametro:
@@ -72,15 +77,20 @@ CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffse
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece offset
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Adicionar deslocamento (offset)
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verifique o status da sonda antes de iniciar (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Um alarme será ativado pelo controle se não estiver ligado e a sonda verificada.
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Limpar o deslocamento do tamanho da ferramenta
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Altura
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Altura
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Altura:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Altura:
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Altura:
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Latch distance:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,"Distancia para retrair para a segunda movimentação devagar da sonda, colocar como 0 para pular"
@@ -91,6 +101,8 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Win
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Destravar e definir o tamanho X ou Y como 0 para realizar a sondagem em apenas uma direção.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Travar
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Pausar antes de fazer a sondagem
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_postjobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Post job:
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_prejobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Pre job:
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
@@ -113,8 +125,11 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:Sys
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_width:CNC.Controls.NumericField.Label,None,False,True,,W:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,com ferramenta:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Adicionar
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Add
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Deletar
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Atualizar
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Definir sistema de coordenadas:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Posição da camera {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Probing XY clearance muito grande para o tamanho do objeto {0}.
@@ -141,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Jogging com teclado está ativo
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Jogging com teclado desativado
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_macroChangedSave:System.String.$Content,None,True,True,,"Macro was changed, save?"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} posições da sonda são necessárias.
 CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Sondando...
@@ -174,4 +190,6 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_heightmap:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Mapa de alturas
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Rotation:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Rotatição
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_toolOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Deslocamento do comprimento da ferramente
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_postprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to after before probing completes.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_preprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to run before probing starts.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,Aviso! Use com cuidado - parametros incorretos podem danificar sua sonda!
diff --git a/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv b/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv
index becd0c7..c9ff0ed 100644
--- a/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv
+++ b/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv
@@ -50,6 +50,7 @@ CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Envio
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zerar tudo
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirmar antes de executar
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,chk_viewAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Botão direito para menu, clicar duas vezes para executar arquivo."
 CNC.Controls.WPF.g.en-US.resources:about.baml,dlg_about:System.Windows.Window.Title,Title,True,True,,Sobre
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,Sender connection
@@ -173,6 +174,7 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalBlockDelete:Sys
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalCycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Iniciar Ciclo
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalEStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,E-Stop
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalFeedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Espera feed
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorFault:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Motor fault
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorWarning:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Aviso de motor
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalOptionalStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Parada opcional
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalProbe:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Sonda
@@ -198,7 +200,7 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windo
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Executar
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,É necessário reiniciar o programa após mudar as configurações!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Aviso! - Grbl tem muitos bug ao cancelar o movimento (na tecla pra cima).
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfCreate:System.String.$Content,None,True,True,,"Arquivo de configuração não encontrado, criar novo?"
@@ -248,12 +250,15 @@ CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,str_outlineFlyout:System.S
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_pause:System.String.$Content,None,True,True,,Pausar
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateG17G18Arcs:System.String.$Content,None,True,True,,"GCode contem arcos nos planos XZ ou YZ (G18/19), não é possível aplicar tranformação. Use &apos;Arcos para Linhas&apos; se isto é realmente necessário."
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateRadiusArcs:System.String.$Content,None,True,True,,"GCode contem arcos do modo radial, não é possível aplicar tranformação. Use &apos;Arcos para Linhas&apos; se isto é realmente necessário."
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_runMacro:System.String.$Content,None,True,True,,Run macro {0} with no parameters?
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Executar {0} macro?
 CNC.Controls.WPF.g.en-US.resources:macrotoolbarcontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Executar {0} macro?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_saveSettings:System.String.$Content,None,True,True,,"Configurações alteradas, salvar agora?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.String.$Content,None,True,True,,"Configurações {0} retornaram {1}, continuar?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Que pena...\\nContinuar carregando?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,O arquivo não contém configurações.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"{0} settings were ignored, not supported by the controller."
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"Some settings were ignored, not supported by the controller."
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Restaurar configurações do arquivo
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Configurações salvas.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Tempo esgotado realizando a configuração {0}, continuar?"
diff --git a/Locale/pt-BR/csv/CNC.Core.resources.pt-BR.csv b/Locale/pt-BR/csv/CNC.Core.resources.pt-BR.csv
index d82fa3e..834a9e6 100644
--- a/Locale/pt-BR/csv/CNC.Core.resources.pt-BR.csv
+++ b/Locale/pt-BR/csv/CNC.Core.resources.pt-BR.csv
@@ -12,6 +12,7 @@ CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserErrE:System.String.$Conte
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG1NoFeed:System.String.$Content,None,True,True,,G1 usado quando o feed rate não foi definido
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG6NoP:System.String.$Content,None,True,True,,G4 - faltando o código P
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserKlesseqJ:System.String.$Content,None,True,True,,K word deve ser maior que a J word
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66BadParams:System.String.$Content,None,True,True,,Illegal M66 parameters
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66NoPorE:System.String.$Content,None,True,True,,P- ou E-word faltando para M66
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66PandE:System.String.$Content,None,True,True,,Não é possível utilizar códigos P- e E- ao mesmo tempo com M66
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserModalGrpError:System.String.$Content,None,True,True,,Violação de grupo modal
diff --git a/Locale/pt-BR/translation.txt b/Locale/pt-BR/translation.txt
index 6670e65..4fb281e 100644
Binary files a/Locale/pt-BR/translation.txt and b/Locale/pt-BR/translation.txt differ
diff --git a/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
index b69c200..7e593c2 100644
--- a/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
@@ -1,8 +1,11 @@
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Добавиь _точку
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click for actions menu.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources\\menu_22x22.png
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Добавиь _точку
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_addProfile:System.Windows.Controls.ContentControl.Content,Button,True,True,,...
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Применить
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Применить
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистить
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_close:System.Windows.Controls.ContentControl.Content,Button,True,True,,Закрыть
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,По границе обработки
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,Перемещение клавиатурой
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift для активации
@@ -24,8 +27,10 @@ CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Wi
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Использовать камеру.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,chk_runonce:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Run once
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Центр X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useXY:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X,Y"
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,dlg_probingMacros:System.Windows.Window.Title,Title,True,True,,Probing macros
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Глубина:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Смещение места измерения по Z от текущей позиции.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_diameter:CNC.Controls.NumericField.Label,None,False,True,,Диаметр:
@@ -72,15 +77,20 @@ CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffse
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece offset
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Предпросмотр
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Добавить смещение
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Проверять состояние датчика перед стартом (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Авария будет активирована контроллером, при срабатвании не активного датчика."
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отменить коррекцию длинны
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Высота
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Высота
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Высота:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Высота:
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Высота:
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Дистанция поиска:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,Расстояние отскока для повторного медленного измерения. 0 для пропуска.
@@ -91,6 +101,8 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Win
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Разблокируйте и установите X или Y в 0 для измерения по одной оси.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Связать
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Пауза перед замером
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_postjobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Post job:
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_prejobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Pre job:
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Предпросмотр
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Предпросмотр
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Предпросмотр
@@ -113,8 +125,11 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:Sys
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_width:CNC.Controls.NumericField.Label,None,False,True,,W:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,с инструментом:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Добавить
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Add
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Удалить
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Обновить
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Система координат:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Позиция камеры {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Зазор измерения XY слишком велик для детали размера {0}.
@@ -141,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Перемещение клавиатурой активно
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Перемещение клавиатурой отключено
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_macroChangedSave:System.String.$Content,None,True,True,,"Macro was changed, save?"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,Необходимо {0} точек измерения.
 CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Измерение...
@@ -174,4 +190,6 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_heightmap:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Карта высот
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Rotation:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Поворот
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_toolOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Коррекция инструмента
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_postprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to after before probing completes.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_preprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to run before probing starts.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,Внемание! Используйте с осторожностью - возможно повреждение датчика!
diff --git a/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
index 3389d46..62e6b83 100644
--- a/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
@@ -50,6 +50,7 @@ CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Загрузить
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Обнул. все
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Подтверждать перед выполнением
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,chk_viewAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Щелкните правой кнопкой для меню, двойной щелчек для выполнения файла."
 CNC.Controls.WPF.g.en-US.resources:about.baml,dlg_about:System.Windows.Window.Title,Title,True,True,,О программе
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,Подключение контроллера
@@ -173,6 +174,7 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalBlockDelete:Sys
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalCycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Запуск программы.
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalEStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,E-Stop
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalFeedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Запрет движения
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorFault:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Motor fault
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorWarning:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Сообщения мотора
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalOptionalStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Не обязательная остановка
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalProbe:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Датчик
@@ -198,7 +200,7 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windo
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Пуск
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,После изменения настроек необходима перезагрузка!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Внемание! - Grbl имеет ошибки в прерывании перемещения (при отпускании клавиши).
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfCreate:System.String.$Content,None,True,True,,Файл конфигурации не найден или поврежден. Создать новый?
@@ -248,12 +250,15 @@ CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,str_outlineFlyout:System.S
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_pause:System.String.$Content,None,True,True,,Пауза
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateG17G18Arcs:System.String.$Content,None,True,True,,GCode содержит дуги в плоскости XZ или YZ (G18/19). Трансляция невозможна. Используйте &apos;Arcs to Lines&apos; при необходимости.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateRadiusArcs:System.String.$Content,None,True,True,,Gcode содердит дуги в радиусной записи.  Трансляция невозможна. Используйте &apos;Arcs to Lines&apos; при необходимости.
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_runMacro:System.String.$Content,None,True,True,,Run macro {0} with no parameters?
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Выполнить макрос {0}?
 CNC.Controls.WPF.g.en-US.resources:macrotoolbarcontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Выполнить макрос {0}?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_saveSettings:System.String.$Content,None,True,True,,Установки изменены. Сохранить сейчас?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.String.$Content,None,True,True,,"Установка {0} вернула {1}, продолжить?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Ошибка...\\nПродолжить загрузку?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,Файл не содержит параметров настройки.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"{0} settings were ignored, not supported by the controller."
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"Some settings were ignored, not supported by the controller."
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Восстановить настройки из файла
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Установки сохранены.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Превышено время при установке {0}, продолжить?"
diff --git a/Locale/ru-RU/csv/CNC.Core.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Core.resources.ru-RU.csv
index 27c16af..64d8d55 100644
--- a/Locale/ru-RU/csv/CNC.Core.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Core.resources.ru-RU.csv
@@ -12,6 +12,7 @@ CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserErrE:System.String.$Conte
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG1NoFeed:System.String.$Content,None,True,True,,G1 - подача не установлена
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG6NoP:System.String.$Content,None,True,True,,G4 - параметр P не установлен
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserKlesseqJ:System.String.$Content,None,True,True,,Параметр K должен быть больше чем J
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66BadParams:System.String.$Content,None,True,True,,Illegal M66 parameters
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66NoPorE:System.String.$Content,None,True,True,,Параметр P или E отсутствует в M66
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66PandE:System.String.$Content,None,True,True,,Невозможно оиспользовать одновременно параметры P- и E- для M66
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserModalGrpError:System.String.$Content,None,True,True,,Нарушение модальной группы
diff --git a/Locale/ru-RU/translation.txt b/Locale/ru-RU/translation.txt
index 6e0cfa8..480a1e8 100644
Binary files a/Locale/ru-RU/translation.txt and b/Locale/ru-RU/translation.txt differ
diff --git a/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv
index 9b0c6c1..c0bd953 100644
--- a/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv
+++ b/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv
@@ -1,8 +1,11 @@
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Додати _точку
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click for actions menu.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources\\menu_22x22.png
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Додати _точку
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_addProfile:System.Windows.Controls.ContentControl.Content,Button,True,True,,...
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Застосувати
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Застосувати
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистити
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_close:System.Windows.Controls.ContentControl.Content,Button,True,True,,Закрити
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,По границі обробки
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,Переміщення клавіатурою
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift для активації
@@ -24,8 +27,10 @@ CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Wi
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Використати камеру.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,chk_runonce:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Run once
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Центр X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useXY:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X,Y"
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,dlg_probingMacros:System.Windows.Window.Title,Title,True,True,,Probing macros
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Глибина:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Зміщення точки вимірювання по Z від поточної позіції.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_diameter:CNC.Controls.NumericField.Label,None,False,True,,Діаметр:
@@ -72,15 +77,20 @@ CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffse
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece offset
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Перед-перегляд
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Додати зміщення
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Перевіряти стан щупа перед стартом (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Аварія будет активована контролером, у разі спрацювання не активованого щупа."
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Відміна корекцію довжини
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Висота
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Висота
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Висота:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Висота:
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Висота:
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,дистанція пошуку:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,Відстань відскоку для повторного повільного вимірювання. 0 для пропуска.
@@ -91,6 +101,8 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Win
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Розблокируйте та встановіть X або Y в 0 для вимірювання за однією віссю.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Зв'язати
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Пауза перед виміром
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_postjobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Post job:
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_prejobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Pre job:
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Перед-перегляд
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Перед-перегляд
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Перед-перегляд
@@ -113,8 +125,11 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:Sys
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_width:CNC.Controls.NumericField.Label,None,False,True,,W:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,з інструментом:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Додати
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Add
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Видалити
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Обновити
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Система координат:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Позиція камери {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Кліренс вимірювання XY надто великий для деталі размером {0}.
@@ -141,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Переміщення клавіатурою включене
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Переміщення клавіатурою вимкнено
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_macroChangedSave:System.String.$Content,None,True,True,,"Macro was changed, save?"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,Необхідно задати {0} точок вимірювання.
 CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Вимірювання...
@@ -174,4 +190,6 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_heightmap:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Мапа висот
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Rotation:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Поворот
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_toolOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Корекція інструмента
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_postprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to after before probing completes.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_preprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to run before probing starts.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,Увага! Використовуйте обережно - невірні параметри можуть призвести до пошкодження зонда!
diff --git a/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv
index b9a6802..6c0b737 100644
--- a/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv
+++ b/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv
@@ -50,6 +50,7 @@ CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Загрузити
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Обнул. Все
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Підтверджувати виконання
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,chk_viewAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Клікніть правою кнопкою для меню, подвійний клік для виконання файла."
 CNC.Controls.WPF.g.en-US.resources:about.baml,dlg_about:System.Windows.Window.Title,Title,True,True,,Про програму
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,Підключення контролера
@@ -173,6 +174,7 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalBlockDelete:Sys
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalCycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Запуск програми.
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalEStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,E-Stop
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalFeedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Заборона руху
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorFault:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Motor fault
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorWarning:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Попередження мотора
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalOptionalStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Не обов'язкова зупинка
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalProbe:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Зонд
@@ -198,7 +200,7 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windo
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Пуск
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,List CNC files only
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,Зміни налаштувань почнуть діяти після перезапуска програми!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Увага! - Grbl має помилки при перериванні переміщення (при відпусканні клавиш).
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfCreate:System.String.$Content,None,True,True,,Файл конфігурації не існує або пошкоджено. Створити новий?
@@ -248,12 +250,15 @@ CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,str_outlineFlyout:System.S
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_pause:System.String.$Content,None,True,True,,Пауза
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateG17G18Arcs:System.String.$Content,None,True,True,,GCode містить дуги у площині XZ або YZ (G18/19). Трансляція неможлива. Використовуйте &apos;Arcs to Lines&apos; за потреби трансляції.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateRadiusArcs:System.String.$Content,None,True,True,,GCode містить дуги у радіусній формі.  Трансляція неможлива. Використовуйте &apos;Arcs to Lines&apos; за потреби трансляції.
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_runMacro:System.String.$Content,None,True,True,,Run macro {0} with no parameters?
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Виконати макрос {0}?
 CNC.Controls.WPF.g.en-US.resources:macrotoolbarcontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Виконати макрос {0}?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_saveSettings:System.String.$Content,None,True,True,,Налаштування змінено. Зберегти зараз?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.String.$Content,None,True,True,,"Установка {0} повернула {1}, продовжити?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Помилка...\\nПродовжити завантаження?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,Файл не містить бідьяких налаштувань.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"{0} settings were ignored, not supported by the controller."
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,"Some settings were ignored, not supported by the controller."
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Відновити налаштування з файла
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Налаштування збережено.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Перевищєно час при встановленні {0}, продовжити?"
diff --git a/Locale/uk-UA/csv/CNC.Core.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Core.resources.uk-UA.csv
index a8630cc..0e1a1b9 100644
--- a/Locale/uk-UA/csv/CNC.Core.resources.uk-UA.csv
+++ b/Locale/uk-UA/csv/CNC.Core.resources.uk-UA.csv
@@ -12,6 +12,7 @@ CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserErrE:System.String.$Conte
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG1NoFeed:System.String.$Content,None,True,True,,G1 - подача не встановлена
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG6NoP:System.String.$Content,None,True,True,,G4 - відсутній параметр P
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserKlesseqJ:System.String.$Content,None,True,True,,Параметр K повинен бути більше за J!
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66BadParams:System.String.$Content,None,True,True,,Illegal M66 parameters
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66NoPorE:System.String.$Content,None,True,True,,Параметер P або E Відсутній в M66
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66PandE:System.String.$Content,None,True,True,,Одночасну використання параметрів P- та E- для M66 неможливе
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserModalGrpError:System.String.$Content,None,True,True,,Порушення модальної группи
diff --git a/Locale/uk-UA/translation.txt b/Locale/uk-UA/translation.txt
index aeae97c..e6d99d9 100644
Binary files a/Locale/uk-UA/translation.txt and b/Locale/uk-UA/translation.txt differ
diff --git a/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
index 064a25a..c61d467 100644
--- a/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
@@ -1,12 +1,12 @@
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,获取当前位置
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,移动偏移
-CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use as probe position
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,用作探头位置
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_confirmMove:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,确认移动
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_moveToSpindle:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,初始移动到主轴
-CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,X offset:
-CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Y offset:
-CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,相机
-CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,camera to spindle
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,X 偏移：
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Y 偏移：
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,摄像头
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,摄像头到主轴
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,偏移运动：
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveCameraTo:System.String.$Content,None,True,True,,将相机移动到主轴位置？
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveSpindleTo:System.String.$Content,None,True,True,,将主轴移动到相机位置？
diff --git a/Locale/zh-CN/csv/CNC.Controls.DragKnife.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.DragKnife.resources.zh-CN.csv
index adc8695..fe3361a 100644
--- a/Locale/zh-CN/csv/CNC.Controls.DragKnife.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.DragKnife.resources.zh-CN.csv
@@ -4,15 +4,15 @@ CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,dlg_dragKnife:Syst
 CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_cutDepth:CNC.Controls.NumericField.Label,None,False,True,,铣削深度：
 CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_cutDepth:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_dentLength:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_dentLength:CNC.Controls.NumericField.Label,None,False,True,,Dent length:
-CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_retractAngle:CNC.Controls.NumericField.Label,None,False,True,,Retract angle:
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_dentLength:CNC.Controls.NumericField.Label,None,False,True,,凹痕长度:
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_retractAngle:CNC.Controls.NumericField.Label,None,False,True,,缩回角度：
 CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_retractAngle:CNC.Controls.NumericField.Unit,None,False,True,,角度
 CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_retractDepth:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_retractDepth:CNC.Controls.NumericField.Label,None,False,True,,Retract depth:
-CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_swivelAngle:CNC.Controls.NumericField.Label,None,False,True,,Swivel angle:
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_retractDepth:CNC.Controls.NumericField.Label,None,False,True,,缩回深度：
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_swivelAngle:CNC.Controls.NumericField.Label,None,False,True,,旋转角度：
 CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_swivelAngle:CNC.Controls.NumericField.Unit,None,False,True,,角度
 CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_tipOffset:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_tipOffset:CNC.Controls.NumericField.Label,None,False,True,,Tip offset:
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_tipOffset:CNC.Controls.NumericField.Label,None,False,True,,尖端偏移：
 CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,grp_knife:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,刀
-CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,grp_retract:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Retract
-CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,lbl_retractEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Retract enable
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,grp_retract:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,缩回
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,lbl_retractEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,缩回启用
diff --git a/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
index d09e74c..a6b802e 100644
--- a/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
@@ -1,177 +1,195 @@
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Add _position
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click for actions menu.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_actionMenu:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources\\menu_22x22.png
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,添加位置
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_addProfile:System.Windows.Controls.ContentControl.Content,Button,True,True,,...
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_应用
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_应用
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set from program limits
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,单击以激活键盘点动
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,btn_close:System.Windows.Controls.ContentControl.Content,Button,True,True,,关闭
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,从程序限制设置
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,单击以激活键盘慢跑
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift 激活
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_load:System.Windows.Controls.ContentControl.Content,Button,True,True,,_加载
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_probe:System.Windows.Controls.ContentControl.Content,Button,True,True,,_探测
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,_保存
-CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setG92:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set offset (G92)
-CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setMeasure:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Measure
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setG92:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,设置偏置 (G92)
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setMeasure:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,测量
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,启动
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,启动
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,启动
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,启动
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,启动
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,启动
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X0,Y0"
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useXY:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X,Y"
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,使用相机位置
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,chk_runonce:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Run once
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"使用X0,Y0"
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useXY:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"使用 X,Y"
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,dlg_probingMacros:System.Windows.Window.Title,Title,True,True,,Probing macros
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,深度：
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Z offset from current position where probing will take place
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,距当前探测位置的 Z 偏移量
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_diameter:CNC.Controls.NumericField.Label,None,False,True,,直径：
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,fld_distance:CNC.Controls.NumericField.Label,None,False,True,,距离
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_fixture:CNC.Controls.NumericField.Label,None,False,True,,夹具：
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_offset:CNC.Controls.NumericField.Label,None,False,True,,抵消：
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_offset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,从拐角到探头的距离
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_passes:CNC.Controls.NumericField.Label,None,False,True,,Passes:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_offset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,角点到探头的距离
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_passes:CNC.Controls.NumericField.Label,None,False,True,,通过：
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_passes:CNC.Controls.NumericField.Unit,None,False,True,,
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_probeOffsetX:CNC.Controls.NumericField.Label,None,False,True,,X:
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_probeOffsetX:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,X offset from probe to controlled point
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_probeOffsetX:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,从探头到控制点的 X 偏移
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_probeOffsetY:CNC.Controls.NumericField.Label,None,False,True,,Y:
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_probeOffsetY:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Y offset from probe to controlled point
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_touchPlate:CNC.Controls.NumericField.Label,None,False,True,,触控板：
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_xSize:CNC.Controls.NumericField.Label,None,False,True,,X size:
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Label,None,False,True,,XY Clearance:
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Tooltip2,None,False,True,,面到探头的初始距离
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_ySize:CNC.Controls.NumericField.Label,None,False,True,,Y size:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_probeOffsetY:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,从探头到控制点的 Y 偏移
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_touchPlate:CNC.Controls.NumericField.Label,None,False,True,,触摸板：
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_xSize:CNC.Controls.NumericField.Label,None,False,True,,X 大小:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Label,None,False,True,,XY 间隙：
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Tooltip2,None,False,True,,工件表面到探头的初始距离
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_ySize:CNC.Controls.NumericField.Label,None,False,True,,Y 大小:
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击边缘以选择探测操作。
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击边、角或中心以选择探测动作。
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击边、角或中心以选择探测动作。
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击边缘、角或中心来选择探测操作。
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击边缘、角或中心来选择探测操作。
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击以选择探测操作。
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,grp_action:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,行动
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,相机
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_clearances:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing clearances
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,摄像头
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_clearances:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,探测间隙
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_dimensions:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件尺寸
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_distanceAndSpeed:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing distances and speed
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,grp_gridSize:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,网格大小:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_distanceAndSpeed:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,探测距离和速度
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,grp_gridSize:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,网格尺寸
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_passes:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Passes
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_passes:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,通常需要不止一次通过才能获得准确的尺寸。
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_passes:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,通常需要多次通过才能获得准确的尺寸。
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_prbeProperties:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,探头 XY 偏移
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,预览
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,grp_probeArea:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,探测区域
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,grp_probeConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,探测
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_probeTipOrTool:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,探头尖端/工具
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击以选择相对于作业的旋转中心，如果未选择，则使用 X0，Y0。
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Rotation center
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_touchOrFixture:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,触摸板/夹具高度
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_probeTipOrTool:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,探针/刀具
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击选择相对于作业的旋转中心，如果不选择X0，则使用Y0。
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,旋转中心
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_touchOrFixture:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,触摸板/治具高度
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件偏移
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece offset
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件偏置
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件偏置
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,预览
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,添加偏移量
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启动前检查探头状态 (G59.3)
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,如果未启用并且探针被触发，控制器将生成警报。
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除刀具长度偏移
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,高度
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,高度
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,在左边缘添加一个探测点。
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"确定直角工件的X0,Y0"
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,手动验证探头是否已连接
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,将显示一个对话框，直到探测成功或取消该对话框。
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启动前检查探头状态（G59.3）
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,如果未启用且探头已置位，控制器将生成警报。
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除刀具长度偏置
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Set to 0 to use 0.5 x probe/tool diameter
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_edgeoffsetxy:CNC.Controls.NumericField.Label,None,False,True,,Edge offset:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,高度:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,高度:
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,高度:
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Latch distance:
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,第二次慢速探测移动的缩回距离，设置为 0 跳过
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,第二次慢速探测移动的进给速度
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Label,None,False,True,,Latch feed rate:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,闩锁距离：
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,第二次缓慢探测移动的缩回距离，设置为 0 以跳过
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,第二次缓慢探测移动的进给速率
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Label,None,False,True,,闩锁进给速度：
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,锁定
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Unlock and set X or Y size to 0 to probe in one direction only.
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,锁定
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,锁
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,解锁并将 X 或 Y 尺寸设置为 0，以便仅在一个方向上进行探测。
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,锁
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,探测前暂停
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_probeFixture:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,探针夹具@G59.3
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_probingDistance:CNC.Controls.NumericField.Label,None,False,True,,Probing distance:
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_probingDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,最大限度。 探测移动的距离
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_profile:System.Windows.Controls.ContentControl.Content,Label,True,True,,轮廓:
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,快速移动的进给速率，设置为 0 以使用控制器设置
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Label,None,False,True,,Rapids feed rate:
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_postjobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Post job:
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,lbl_prejobmacro:System.Windows.Controls.ContentControl.Content,Label,True,True,,Pre job:
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,预览
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,预览
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,预览
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,预览
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_probeFixture:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,探针夹具 @G59.3
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,探头Z
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,探头Z
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_probingDistance:CNC.Controls.NumericField.Label,None,False,True,,探测距离：
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_probingDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,最大限度。 探测移动距离
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_profile:System.Windows.Controls.ContentControl.Content,Label,True,True,,轮廓：
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"快速移动的进给速率,设置为 0 以使用控制器设置"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Label,None,False,True,,快速进给速度:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,初始探测移动的进给速率
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Search feed rate:
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setCoordOrOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Set coordinate system or offset
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,搜索进给率：
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setCoordOrOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,设置坐标系或偏移
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setRefernecOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,建立参考偏移
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Set Z = 0 at X0Y0:
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_width:CNC.Controls.NumericField.Label,None,False,True,,W:
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,with tool:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,使用刀具:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,添加
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Add
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,删除
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
-CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set coordinate system:
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Probing XY clearance too large for workpiece {0} size.
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,"Probing completed: X distance {0}, Y distance {1}."
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,Probing failed
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,更新
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,设置坐标系：
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,摄像头位置 {0}，X：{1}，Y：{2}
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,探测 XY 间隙对于工件 {0} 尺寸来说太大。
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,探测完成：X 距离{0}，Y 距离{1}。
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,探测失败
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderInitFailed:System.String.$Content,None,True,True,,初始化失败！
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_CenterFinderInstructions:System.String.$Content,None,True,True,,单击上图选择探测动作。\\n在开始前将探头放在工件的大致中心上方。
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderPass:System.String.$Content,None,True,True,,"Probing, pass {0} of {1}..."
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderType:System.String.$Content,None,True,True,,Select type of probe by clicking on one of the images above.
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderWpSize:System.String.$Content,None,True,True,,工件 {0} 尺寸不能为 0。
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderCompleted:System.String.$Content,None,True,True,,Probing completed.
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderFailed:System.String.$Content,None,True,True,,Probing failed
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderInitFailed:System.String.$Content,None,True,True,,"Probing failed, machine position not known."
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_EdgeFinderInstructions:System.String.$Content,None,True,True,,单击上图中的边缘、角或中心以选择探测动作。\\n在开始之前将探头移动到绿点指示的位置上方。
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderType:System.String.$Content,None,True,True,,Select edge or corner to probe by clicking on the relevant part of the image above.
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderCompleted:System.String.$Content,None,True,True,,Probing completed.
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderFailed:System.String.$Content,None,True,True,,Probing failed
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderInitFailed:System.String.$Content,None,True,True,,"Probing failed, machine position not known."
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderInstructions:System.String.$Content,None,True,True,,单击上图中的边缘、角或中心以选择探测动作。\\n在开始之前将探头移动到绿点指示的位置上方。
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderType:System.String.$Content,None,True,True,,Select edge or corner to probe by clicking on the relevant part of the image above.
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapCompleted:System.String.$Content,None,True,True,,"Probing completed: Z min: {0}, Z max: {1}."
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed:System.String.$Content,None,True,True,,Probing failed
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,A rapid motion to X0Y0 will be performed before probing the height map starts.\\nEnsure the initial Z-position is clear of any obstacles that might be encountered during probing.
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_CenterFinderInstructions:System.String.$Content,None,True,True,,单击上图选择探测动作。\\n开始前将探头放置在工件大致中心上方。
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderPass:System.String.$Content,None,True,True,,正在探测，通过了 {0} 个，共 {1} 个…
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderType:System.String.$Content,None,True,True,,单击上面的图像之一选择探头类型。
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderWpSize:System.String.$Content,None,True,True,,工件{0}尺寸不能为0。
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderCompleted:System.String.$Content,None,True,True,,探测完成。
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderFailed:System.String.$Content,None,True,True,,探测失败
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderInitFailed:System.String.$Content,None,True,True,,探测失败，机器位置未知。
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_EdgeFinderInstructions:System.String.$Content,None,True,True,,单击上图中的边缘、角点或中心来选择探测动作。\\n开始前将探头移动到绿点指示的位置上方。
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderType:System.String.$Content,None,True,True,,单击上图的相关部分，选择要探测的边缘或角点。
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderCompleted:System.String.$Content,None,True,True,,探测完成。
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderFailed:System.String.$Content,None,True,True,,探测失败
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderInitFailed:System.String.$Content,None,True,True,,探测失败，机器位置未知。
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderInstructions:System.String.$Content,None,True,True,,单击上图中的边缘、角点或中心来选择探测动作。\\n开始前将探头移动到绿点指示的位置上方。
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderType:System.String.$Content,None,True,True,,单击上图的相关部分，选择要探测的边缘或角点。
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapCompleted:System.String.$Content,None,True,True,,"探测完成:Z最小值:{0},Z最大值:{1}。"
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed:System.String.$Content,None,True,True,,探测失败
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,"在开始探测高度图之前,将执行到 X0Y0 的快速运动。\\n请确保初始Z位置在探测过程中不会碰撞到任何障碍物。"
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,探测点 {0}（共 {1} 个）…
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,键盘点动激活
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,键盘慢跑已禁用
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
-CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Probing...
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Probing distance must be larger than XY Clearance + ½ Probe/tool diameter.
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Probing failed with alarm, clear in Grbl tab."
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,Probing cancelled/failed.
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,键盘点动已禁用
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_macroChangedSave:System.String.$Content,None,True,True,,"Macro was changed, save?"
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,需要 {0} 个探针位置。
+CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,置位探针以验证连接。
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,探测…
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,探测距离必须大于 XY 间隙 + ? 探头/工具直径。
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,探测失败并发出警报，在 Grbl 选项卡中清除。
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,探测已取消/失败。
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapMinSize:System.String.$Content,None,True,True,,高度图必须至少有 4 个点。
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapNarrow:System.String.$Content,None,True,True,,高度图不能无限窄。
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,探头位置非法，重试。
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,Latch distance must be less than Probing distance.
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Probing failed, could not establish current machine position."
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Probing failed, probe is not connected."
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Probing failed, Grbl is not in idle or tool changing state."
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Probing failed, probe signal is asserted."
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbingAtX0Y0:System.String.$Content,None,True,True,,Probing @X0Y0...
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,GCode 包含 XZ 或 YZ 平面 (G18/19) 中的弧，不能应用变换。 使用“弧线” 如果你真的需要这个。
-CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Probing completed.
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationFailed:System.String.$Content,None,True,True,,Probing failed
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,"探头位置非法,请重试。"
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,闩锁距离必须小于探测距离。
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,探测失败，无法确定当前机器位置。
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"探测失败,探头未连接。"
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"探测失败,Grbl 未处于空闲或换刀状态。"
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,探针连接未验证，是否仍继续？
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"探测失败,探测信号有效。"
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbingAtX0Y0:System.String.$Content,None,True,True,,探测@X0Y0…
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,"GCode contains arcs in XZ or YZ plane (G18/19), can&apos;t apply transform. Use &apos;Arcs to Lines&apos; if you really need this."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,再次按[开始]开始探测。
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,探测完成。
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationFailed:System.String.$Content,None,True,True,,探测失败
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationInitFailed:System.String.$Content,None,True,True,,角度：{0} 度
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationInstructions:System.String.$Content,None,True,True,,单击上图中的边缘以选择探测操作。\\n在开始前将探头移动到绿点指示的位置上方。
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationType:System.String.$Content,None,True,True,,Select edge to probe by clicking on the relevant part of the image above.
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_runMacro:System.String.$Content,None,True,True,,Run {0} macro?
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,str_toolLengthCompleted:System.String.$Content,None,True,True,,Probing completed.
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,str_toolLengthFailed:System.String.$Content,None,True,True,,Probing failed
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,str_toolLengthInitFailed:System.String.$Content,None,True,True,,在探测夹具之前，轴必须归位！
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Center:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,中心查找器
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeExternal:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,寻边器，内部
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,寻边器，外部
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationInstructions:System.String.$Content,None,True,True,,单击上图中的边缘以选择探测动作。\\n开始前将探头移动到绿点指示的位置上方。
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationType:System.String.$Content,None,True,True,,"单击上图的相关部分,选择要探测的边缘。"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_runMacro:System.String.$Content,None,True,True,,运行 {0} 宏吗？
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,str_toolLengthCompleted:System.String.$Content,None,True,True,,探测完成。
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,str_toolLengthFailed:System.String.$Content,None,True,True,,探测失败
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,str_toolLengthInitFailed:System.String.$Content,None,True,True,,在探测夹具之前必须将轴归位！
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Center:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,中心点查找
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeExternal:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,"寻边器,内部"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,"寻边器,外部"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_heightmap:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,高度图
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Rotation:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,旋转
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_toolOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,刀具长度偏置
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,Warning! Use with care - incorrect parameters may damage your probe!
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_postprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to after before probing completes.
+CNC.Controls.Probing.g.en-US.resources:macrodialog.baml,txt_preprobecommands:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Commands to run before probing starts.
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,警告!小心使用 - 错误的参数可能会损坏您的探头！
diff --git a/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv
index 08552cf..c9170b1 100644
--- a/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv
@@ -1,41 +1,41 @@
-CNC.Controls.Viewer.g.en-US.resources:viewer.baml,btn_resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset view
+CNC.Controls.Viewer.g.en-US.resources:viewer.baml,btn_resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,重置视图
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Label,None,False,True,,圆弧分辨率：
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Unit,None,False,True,,segments
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_minDistance:CNC.Controls.NumericField.Label,None,False,True,,最小距离：
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Unit,None,False,True,,段
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_minDistance:CNC.Controls.NumericField.Label,None,False,True,,最短距离：
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,刀具直径：
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,默认刀具直径。
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolScalePct:CNC.Controls.NumericField.Unit,None,False,True,,%
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,grp_gcodeViewer:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,G代码查看器
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_blackBackgroud:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Black background
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_cutColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,剪裁颜色：
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启用
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_blackBackgroud:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,黑色背景
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_cutColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,切割颜色：
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,使能
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_gridColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,网格颜色：
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_highlightColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,突出颜色：
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_highlightCompleted:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,突出显示已完成的剪辑
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_rapidsColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Rapids color:
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_retractColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Retract color:
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showAxes:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show axes
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showBbox:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show bounding box
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showCoordSys:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show coordinate system
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showGrid:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show grid
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showOverlay:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show text overlay
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showViewCube:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show ViewCube
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_highlightColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,高亮显示颜色：
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_highlightCompleted:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,高亮显示已完成的刀路
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_rapidsColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,快速颜色：
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_retractColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,缩回颜色：
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showAxes:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,显示轴
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showBbox:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,显示边界框
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showCoordSys:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,显示坐标系
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showGrid:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,显示网格
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showOverlay:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,显示文本叠加
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showViewCube:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,显示视图立方体
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_toolAutoScale:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,自动缩放工具
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reset view (Ctrl+V)
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,重置视图 (Ctrl+V)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/ResetView.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/RestoreView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore view (Ctrl+R)
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save view
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,恢复视图 (Ctrl+R)
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,保存视图
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,切换网格可见性 (Ctrl+G)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/GridOn.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/JobBoxOn.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,切换作业边界可见性 (Ctrl+J)
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,切换工作边界可见性 (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,切换机器工作范围可见性 (Ctrl+W)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/WorkBoxOn.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showXYZMarkers:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,切换轴可见性
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showXYZMarkers:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/XYZOn.png
 CNC.Controls.Viewer.g.en-US.resources:renderer.baml,str_toolCone:System.String.$Content,None,True,True,,锥体
-CNC.Controls.Viewer.g.en-US.resources:renderer.baml,str_toolCrosshair:System.String.$Content,None,True,True,,十字准线
+CNC.Controls.Viewer.g.en-US.resources:renderer.baml,str_toolCrosshair:System.String.$Content,None,True,True,,十字线
 CNC.Controls.Viewer.g.en-US.resources:renderer.baml,str_toolNoShow:System.String.$Content,None,True,True,,没有刀具
diff --git a/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
index 19c7a9c..583ff30 100644
--- a/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
@@ -1,287 +1,292 @@
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_add:System.Windows.Controls.ContentControl.Content,Button,True,True,,添加
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows.Controls.ContentControl.Content,Button,True,True,,Backup
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows.Controls.ContentControl.Content,Button,True,True,,备份
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
-CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,全部清除
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,全部清除
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除全部
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除全部
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_currPos:System.Windows.Controls.ContentControl.Content,Button,True,True,,获取当前位置
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_currPos:System.Windows.Controls.ContentControl.Content,Button,True,True,,获取当前位置
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_cycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+R
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_cycleStart:System.Windows.Controls.ContentControl.Content,Button,True,True,,循环开始
-CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,btn_edit:System.Windows.Controls.ContentControl.Content,Button,True,True,,编辑
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_feedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Space
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_cycleStart:System.Windows.Controls.ContentControl.Content,Button,True,True,,开始加工
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,btn_edit:System.Windows.Controls.ContentControl.Content,Button,True,True,,编辑添加
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_feedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,空间
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_feedHold:System.Windows.Controls.ContentControl.Content,Button,True,True,,进给保持
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,btn_getStatus:System.Windows.Controls.ContentControl.Content,Button,True,True,,获取状态
-CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,btn_getStatusAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,获取状态，所有驱动程序
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,btn_getStatusAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,获取所有驱动程序的状态
 CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,btn_go:System.Windows.Controls.ContentControl.Content,Button,True,True,,Go
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,btn_go:System.Windows.Controls.ContentControl.Content,Button,True,True,,Go
 CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG28:System.Windows.Controls.ContentControl.Content,Button,True,True,,转到位置 1 (G28)
 CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG30:System.Windows.Controls.ContentControl.Content,Button,True,True,,转到位置 2 (G30)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+H
-CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.Controls.ContentControl.Content,Button,True,True,,起始点
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.Controls.ContentControl.Content,Button,True,True,,归位
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reload settings from controller.
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,从控制器重新加载设置。
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,重新加载
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,复位
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift+R
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Windows.Controls.ContentControl.Content,Button,True,True,,Restore
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Rewind
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
-CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
-CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save settings
-CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Send
-CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Windows.Controls.ContentControl.Content,Button,True,True,,恢复
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,重置发送列表
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,保存
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,将更改的设置保存到控制器。
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,保存键盘映射
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,保存设置
+CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,发送
+CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,设置
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,设置全部
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,设置全部
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+S
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,将 grbl 版本信息和设置复制到剪贴板
-CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,To Clipboard
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,到剪贴板
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+U
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,解锁
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Upload
-CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zero all
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,上传
+CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,全部清零
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,执行前确认
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Right click for menu, double click to run file."
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,chk_viewAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,List CNC files only
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,右键单击菜单，双击运行文件。
 CNC.Controls.WPF.g.en-US.resources:about.baml,dlg_about:System.Windows.Window.Title,Title,True,True,,关于
-CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,Sender connection
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,上位机连接
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,dlg_macroEditor:System.Windows.Window.Title,Title,True,True,,宏编辑器
-CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.Windows.Window.Title,Title,True,True,,Sender Console
-CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Sender connection
-CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,度数
-CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,角度:
+CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.Windows.Window.Title,Title,True,True,,上位机控制台
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,上位机连接
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,度
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,角度：
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,直径：
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,快速进给距离：
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,快速距离：
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,快速进给：
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Unit,None,False,True,,bytes
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,最大缓冲区：
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,快速进给速度：
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Unit,None,False,True,,字节
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,最大缓冲区:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,使用的最大串行缓冲区大小（限制为报告值的 90%）。
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Time between status request sent to controller.
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,状态请求发送到控制器的间隔时间。
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Unit,None,False,True,,ms
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Poll interval:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,轮询间隔:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Unit,None,False,True,,ms
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Reset delay:
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,延迟以允许控制器在通信开始之前完成引导。
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowDistance:CNC.Controls.NumericField.Label,None,False,True,,Slow distance:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Slow feedrate:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,复位延迟:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"延迟,允许控制器在通信开始前完成启动。 "
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowDistance:CNC.Controls.NumericField.Label,None,False,True,,慢速距离：
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Label,None,False,True,,慢速进给：
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepDistance:CNC.Controls.NumericField.Label,None,False,True,,Step distance:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Step feedrate:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepDistance:CNC.Controls.NumericField.Label,None,False,True,,步距：
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Label,None,False,True,,步进进给速度：
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,grb_mainConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Main
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,grp_coolant:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,冷却液
-CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,grp_dro:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,DRO
-CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,grp_feedrate:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,给进速率
-CNC.Controls.WPF.g.en-US.resources:stripgcodeconfigcontrol.baml,grp_gcodeStrip:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,GCode 命令剥离
-CNC.Controls.WPF.g.en-US.resources:gotocontrol.baml,grp_goto:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,转到
+CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,grp_dro:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件坐标
+CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,grp_feedrate:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,进给倍率
+CNC.Controls.WPF.g.en-US.resources:stripgcodeconfigcontrol.baml,grp_gcodeStrip:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,G代码命令剥离
+CNC.Controls.WPF.g.en-US.resources:gotocontrol.baml,grp_goto:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Goto
 CNC.Controls.WPF.g.en-US.resources:jogbasecontrol.baml,grp_jogDistance:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,距离
-CNC.Controls.WPF.g.en-US.resources:jogbasecontrol.baml,grp_jogFeedrate:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,进给速率
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,grp_kbdJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,键盘手动进给
+CNC.Controls.WPF.g.en-US.resources:jogbasecontrol.baml,grp_jogFeedrate:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,进给倍率
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,grp_kbdJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,键盘JOG
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,grp_mdi:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,MDI
-CNC.Controls.WPF.g.en-US.resources:outlinecontrol.baml,grp_outline:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Outline
-CNC.Controls.WPF.g.en-US.resources:limitscontrol.baml,grp_programLimits:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Program limits
-CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,grp_rotationCenter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击以选择相对于作业的旋转中心，如果未选择，则使用 X0，Y0。
-CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,grp_rotationCenter:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Rotation center
-CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,grp_signals:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Signals
+CNC.Controls.WPF.g.en-US.resources:outlinecontrol.baml,grp_outline:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,加工范围
+CNC.Controls.WPF.g.en-US.resources:limitscontrol.baml,grp_programLimits:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,程序范围
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,grp_rotationCenter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击选择相对于工件的旋转中心，如果不选择X0，则使用Y0。
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,grp_rotationCenter:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,旋转中心
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,grp_signals:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,信号状态
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,grp_spindle:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,主轴
-CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,stallGuard
-CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,手动进给中
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,UI jogging
-CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Work Parameters
-CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,代码
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,档位保护
+CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,JOG
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,用户JOG界面
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工作参数
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,G代码
 CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,信息
-CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,块
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,行
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,数据
 CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,代码
 CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,信息
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,名称
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,名字
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,偏移
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingId:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Id
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingName:System.Windows.Controls.DataGridColumn.Header,None,True,True,,名称
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingUnit:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Unit
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingValue:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Value
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_size:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Size
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingName:System.Windows.Controls.DataGridColumn.Header,None,True,True,,名字
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingUnit:System.Windows.Controls.DataGridColumn.Header,None,True,True,,单元
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingValue:System.Windows.Controls.DataGridColumn.Header,None,True,True,,值
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_size:System.Windows.Controls.DataGridColumn.Header,None,True,True,,大小
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,hdr_tool:System.Windows.Controls.DataGridColumn.Header,None,True,True,,刀具
-CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,过滤掉实时响应
-CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show all realtime responses
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Buffers more than one GCode block in controller for smoother execution. For grblHAL only!
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,积极缓冲
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,在转换上自动压缩 gcode
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Removes superfluous gcode command elements.
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_axis:System.String.$Content,None,True,True,,{0} axis:
-CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_ccw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,逆时针
-CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_check:System.Windows.Controls.ContentControl.Content,Label,True,True,,查看
-CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_configure:System.Windows.Controls.ContentControl.Content,Button,True,True,,配置文件未找到或无效，是否创建新的？
-CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_cw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,顺时针
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Label,None,False,True,,距离 0：
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,过滤掉实时回复
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,显示所有实时回复
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,在控制器中缓冲多行G代码以使执行更流畅。只限grblHAL!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,多个缓冲区块
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,在转换时自动压缩G代码
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,删除多余的 gcode 命令。
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_axis:System.String.$Content,None,True,True,,{0} 轴:
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_ccw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,反转
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_check:System.Windows.Controls.ContentControl.Content,Label,True,True,,检查
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_configure:System.Windows.Controls.ContentControl.Content,Button,True,True,,配置
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_cw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,正转
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Label,None,False,True,,距离 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Label,None,False,True,,距离1：
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Label,None,False,True,,距离 1:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Label,None,False,True,,距离2：
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Label,None,False,True,,距离 2：
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,距离3：
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启用
-CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_fan:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Fan
-CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,进给速率:
-CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,进给速度：
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,距离 3：
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,使能
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_fan:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,风扇
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,进给速度:
+CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,进给速度:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,进给速度0：
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,进给倍率 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,进给速度1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,进给倍率 1:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Label,None,False,True,,进给速度2:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Label,None,False,True,,进给倍率 2:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,进给3:
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,如果 ok 响应压倒控制台日志记录，则启用，通常在发送大量短命令时发生。
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter &quot;ok&quot; response
-CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,过滤掉实时响应
-CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_flood:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,切削液
-CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_ipAddress:System.Windows.Controls.ContentControl.Content,Label,True,True,,IP地址：
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Buffers more than one GCode block in controller for smoother execution. For grblHAL only!
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,保持 MDI 焦点
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_linkStepToUi:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Link step distance to UI jogging
-CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,lbl_machinePosition:System.Windows.Controls.TextBlock.Text,Text,True,True,,机器位置
-CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_mist:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Mist
-CNC.Controls.WPF.g.en-US.resources:mpgpending.baml,lbl_mpgModeActive:System.Windows.Controls.ContentControl.Content,Label,True,True,,手轮模式激活，等待禁用...
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,进给倍率 3:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"如果 ok 响应覆盖了控制台日志记录,则启用,通常在发送大量短命令时发生。"
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,过滤“ok” 回复信息
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,过滤掉实时回复
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_flood:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,水冷
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_ipAddress:System.Windows.Controls.ContentControl.Content,Label,True,True,,IP地址:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,在控制器中缓冲多行G代码以使执行更流畅。只限grblHAL!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,保持MDI焦点
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_linkStepToUi:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,将步距显示到JOG页面
+CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,lbl_machinePosition:System.Windows.Controls.TextBlock.Text,Text,True,True,,机械坐标
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_mist:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,气冷
+CNC.Controls.WPF.g.en-US.resources:mpgpending.baml,lbl_mpgModeActive:System.Windows.Controls.ContentControl.Content,Label,True,True,,"MPG 模式已激活,等待其被禁用..."
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_netPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,端口:
-CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,lbl_noMacrosDefined:System.Windows.Controls.ContentControl.Content,Label,True,True,,未定义宏，使用编辑按钮添加。
-CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,lbl_noMacrosDefined:System.Windows.Controls.TextBlock.Text,Text,True,True,,未定义宏，使用编辑按钮添加。
-CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_off:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Off
-CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_offset:System.Windows.Controls.ContentControl.Content,Label,True,True,,偏移:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_offset:System.Windows.Controls.ContentControl.Content,Label,True,True,,偏移:
-CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_onConnect:System.Windows.Controls.ContentControl.Content,Label,True,True,,连接时：
-CNC.Controls.WPF.g.en-US.resources:overridecontrol.baml,lbl_override:System.Windows.Controls.ContentControl.Content,Label,True,True,,Override
-CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,lbl_rapids:System.Windows.Controls.ContentControl.Content,Label,True,True,,Rapids:
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore window size on next startup.
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Restore last window size on startup
-CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_rpm:System.Windows.Controls.ContentControl.Content,Label,True,True,,RPM
-CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialBaud:System.Windows.Controls.ContentControl.Content,Label,True,True,,Baud rate:
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,lbl_noMacrosDefined:System.Windows.Controls.ContentControl.Content,Label,True,True,,"没有定义宏,请使用编辑按钮添加"
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,lbl_noMacrosDefined:System.Windows.Controls.TextBlock.Text,Text,True,True,,"没有定义宏,请使用编辑按钮添加"
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_off:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,关闭
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_offset:System.Windows.Controls.ContentControl.Content,Label,True,True,,坐标系偏移:
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_offset:System.Windows.Controls.ContentControl.Content,Label,True,True,,坐标系偏移:
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_onConnect:System.Windows.Controls.ContentControl.Content,Label,True,True,,连接时:
+CNC.Controls.WPF.g.en-US.resources:overridecontrol.baml,lbl_override:System.Windows.Controls.ContentControl.Content,Label,True,True,,倍率
+CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,lbl_rapids:System.Windows.Controls.ContentControl.Content,Label,True,True,,快速G0:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,下次启动时恢复窗口大小。
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,在启动时恢复上次窗口大小
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_rpm:System.Windows.Controls.ContentControl.Content,Label,True,True,,转速
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialBaud:System.Windows.Controls.ContentControl.Content,Label,True,True,,波特率:
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,端口:
-CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_sgLoad:System.Windows.Controls.ContentControl.Content,Label,True,True,,Load (SG_RESULT)
-CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show all realtime responses
-CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalBlockDelete:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Block delete
-CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalCycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,循环开始
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_sgLoad:System.Windows.Controls.ContentControl.Content,Label,True,True,,加载（SG_RESULT）
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,显示所有实时回复
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalBlockDelete:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,行删除
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalCycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,开始加工
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalEStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,急停
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalFeedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,进给保持
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorFault:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Motor fault
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorWarning:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,电机警告
-CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalOptionalStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,可选停止
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalOptionalStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,选择停
 CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalProbe:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,探测
-CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalReset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reset
-CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalSafetyDoor:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Safety door
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalReset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,复位
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalSafetyDoor:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,安全门
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_stallGuardEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启用过滤器 (SFILT)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_state:System.Windows.Controls.ContentControl.Content,Label,True,True,,状态:
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_theme:System.Windows.Controls.ContentControl.Content,Label,True,True,,Theme:
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tipRadius:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Tip radius:
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,工具：
-CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,工具：
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_theme:System.Windows.Controls.ContentControl.Content,Label,True,True,,主题:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tipRadius:CNC.Controls.CoordValueSetControl.Label,None,True,True,,尖端半径：
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,刀具:
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,刀具:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verbose
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z axis:
-CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_copyToMDI:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Copy to MDI
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X 轴:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y 轴:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z 轴:
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_copyToMDI:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,复制到 MDI
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,删除
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,下载并运行
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Enable rewind
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Run
-CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
-CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,启用快退
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,运行
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,发送至控制器
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,从这里开始
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,查看全部
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,更改设置后需要重新启动！
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Warning! - Grbl has outstanding bug(s) in jog cancel (on key up).
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,警告！ - Grbl 在点动取消（按键上）方面存在冲突的错误。
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfCreate:System.String.$Content,None,True,True,,配置文件未找到或无效，是否创建新的？
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfCreateFail:System.String.$Content,None,True,True,,无法保存配置文件。
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfNoConnect:System.String.$Content,None,True,True,,Unable to open connection ({0})
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_checking:System.String.$Content,None,True,True,,检查...
-CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,str_clearEStop:System.String.$Content,None,True,True,,Clear E-Stop before &lt;Reset&gt;&gt;
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_convBlockOfBlocks:System.String.$Content,None,True,True,,Block: {0}/{1}
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_convNumBlocks:System.String.$Content,None,True,True,,Blocks: {1}
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_deleteFile:System.String.$Content,None,True,True,,删除 {0}？
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_downloadAndRun:System.String.$Content,None,True,True,,下载并运行 {0}？
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_downloading:System.String.$Content,None,True,True,,正在下载 {0}...
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_g28g30:System.String.$Content,None,True,True,,Job has G28/G30 moves and machine is not homed.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfNoConnect:System.String.$Content,None,True,True,,无法打开连接 ({0})
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_checking:System.String.$Content,None,True,True,,检查…
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,str_clearEStop:System.String.$Content,None,True,True,,在复位之前&lt;先清除报警&gt;&gt;
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_convBlockOfBlocks:System.String.$Content,None,True,True,,行: {0}/{1}
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_convNumBlocks:System.String.$Content,None,True,True,,行：{1}
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_deleteFile:System.String.$Content,None,True,True,,删除{0}？
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_downloadAndRun:System.String.$Content,None,True,True,,下载并运行{0}？
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_downloading:System.String.$Content,None,True,True,,正在下载{0}…
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_g28g30:System.String.$Content,None,True,True,,加工程序有 G28/G30 移动且机器未回零。
 CNC.Controls.WPF.g.en-US.resources:gotoflyoutcontrol.baml,str_gotoFlyout:System.String.$Content,None,True,True,,_转到
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateAlarm:System.String.$Content,None,True,True,,警报
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateCheck:System.String.$Content,None,True,True,,查看
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateDoor:System.String.$Content,None,True,True,,DOOR
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateAlarm:System.String.$Content,None,True,True,,报警代码
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateCheck:System.String.$Content,None,True,True,,检查
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateDoor:System.String.$Content,None,True,True,,安全门
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateHold:System.String.$Content,None,True,True,,进给保持
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateHome:System.String.$Content,None,True,True,,归位
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateIdle:System.String.$Content,None,True,True,,空闲
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateJog:System.String.$Content,None,True,True,,JOG
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateRun:System.String.$Content,None,True,True,,RUN
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateSleep:System.String.$Content,None,True,True,,SLEEP
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.String.$Content,None,True,True,,刀具
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,UNKNOWN
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"File: {0}\\n!,?,~ and SPACE is not supported in filenames, please rename."
-CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_手动进给
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,键映射保存到 {0}
-CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_宏
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateRun:System.String.$Content,None,True,True,,运行
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateSleep:System.String.$Content,None,True,True,,睡眠
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.String.$Content,None,True,True,,刀具:
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,未知
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"文件：{0}\\n!,?,~ 文件名不支持空格，请重命名。"
+CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_Jog
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,按键映射已保存到 {0}
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_宏按钮
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,str_mposFlyout:System.String.$Content,None,True,True,,机械坐标
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgBadResponseExit:System.String.$Content,None,True,True,,"Unexpected response received from controller: {0}, exiting."
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Door is open, close door and continue?"
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Door state cannot be cleared with &lt;Reset&gt;
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgEStop:System.String.$Content,None,True,True,,急停激活！ - 在继续之前解除...
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgEStopExit:System.String.$Content,None,True,True,,急停仍然被按下，退出？
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgHome:System.String.$Content,None,True,True,,"Homing cycle required, &lt;Home&gt; to continue"
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoComm:System.String.$Content,None,True,True,,控制器处于 {0} 状态且无法响应，尝试软复位？
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,由于警报 {0}，控制器无法通信，正在尝试软复位。
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgBadResponseExit:System.String.$Content,None,True,True,,从控制器收到意外响应：{0}，正在退出。
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,门还开着，要退出吗？
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,门打开，关上门并继续吗？
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,门状态解除不能用&lt;复位&gt;
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgEStop:System.String.$Content,None,True,True,,急停被按下！ - 在继续之前先解除...
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgEStopExit:System.String.$Content,None,True,True,,"急停仍然被按下,要退出吗？"
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgHome:System.String.$Content,None,True,True,,"需要归位循环,&lt;归位&gt;然后继续"
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoComm:System.String.$Content,None,True,True,,控制器处于 {0} 状态且无法响应，是否尝试软重置？
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,由于警报 {0}，控制器无法通信，正在尝试软重置。
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoResponse:System.String.$Content,None,True,True,,控制器没有响应！
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoResponseExit:System.String.$Content,None,True,True,,没有收到来自控制器的响应，退出。
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgResetExit:System.String.$Content,None,True,True,,控制器软复位失败，退出。
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgResetFailed:System.String.$Content,None,True,True,,控制器软复位失败，退出。
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgWait:System.String.$Content,None,True,True,,Waiting for controller ({0})...
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_notConnection:System.String.$Content,None,True,True,,没有关联。
-CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,str_outlineFlyout:System.String.$Content,None,True,True,,_概述
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoResponseExit:System.String.$Content,None,True,True,,未收到控制器的响应，正在退出。
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgResetExit:System.String.$Content,None,True,True,,控制器软重置失败，正在退出。
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgResetFailed:System.String.$Content,None,True,True,,控制器软重置失败，正在退出。
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgWait:System.String.$Content,None,True,True,,正在等待控制器 ({0})…
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_notConnection:System.String.$Content,None,True,True,,无连接。
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,str_outlineFlyout:System.String.$Content,None,True,True,,_加工范围
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_pause:System.String.$Content,None,True,True,,暂停
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateG17G18Arcs:System.String.$Content,None,True,True,,GCode 包含 XZ 或 YZ 平面 (G18/19) 中的弧，不能应用变换。 使用“弧线” 如果你真的需要这个。
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateRadiusArcs:System.String.$Content,None,True,True,,GCode 包含半径模式弧，不能应用变换。 使用“弧线” 如果你真的需要这个。
-CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Run {0} macro?
-CNC.Controls.WPF.g.en-US.resources:macrotoolbarcontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Run {0} macro?
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_saveSettings:System.String.$Content,None,True,True,,"Settings changed, save now?"
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.String.$Content,None,True,True,,"Setting {0} returned {1}, continue?"
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Bummer...\\nContinue loading?
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,The file does not contain any settings.
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Restore settings from file
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Timed out while setting {0}, continue?"
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,All settings written to {0} in the sender folder.
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,Stop
-CNC.Controls.WPF.g.en-US.resources:thcmonitorcontrol.baml,str_ThcFlyout:System.String.$Content,None,True,True,,_监视器
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_themeBlack:System.String.$Content,None,True,True,,Black
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_themeDark:System.String.$Content,None,True,True,,Dark
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_themeDefault:System.String.$Content,None,True,True,,Default
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_themeLight:System.String.$Content,None,True,True,,Light
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_themeWhite:System.String.$Content,None,True,True,,White
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_toolchanges:System.String.$Content,None,True,True,,"Job has {0} tool change(s) using M6, only a few Grbl ports supports that."
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_toolchangeTLO:System.String.$Content,None,True,True,,"Job has {0} tool change(s), tool length reference should be established before start."
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateG17G18Arcs:System.String.$Content,None,True,True,,"GCode contains arcs in XZ or YZ plane (G18/19), can&apos;t apply transform. Use &apos;Arcs to Lines&apos; if you really need this."
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateRadiusArcs:System.String.$Content,None,True,True,,"GCode contains radius mode arcs, can&apos;t apply transform. Use &apos;Arcs to Lines&apos; if you really need this."
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_runMacro:System.String.$Content,None,True,True,,Run macro {0} with no parameters?
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_runMacro:System.String.$Content,None,True,True,,运行 {0} 宏吗？
+CNC.Controls.WPF.g.en-US.resources:macrotoolbarcontrol.baml,str_runMacro:System.String.$Content,None,True,True,,要运行 {0} 宏吗？
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_saveSettings:System.String.$Content,None,True,True,,设置已更改，现在保存吗？
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.String.$Content,None,True,True,,设置 {0} 返回 {1}，是否继续？
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,糟糕...\\n继续加载吗？
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,该文件不包含任何设置。
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,{0} 设置被忽略，控制器不支持。
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsReloadMismatch:System.String.$Content,None,True,True,,某些设置被忽略，控制器不支持。
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,从文件恢复设置
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,设置已保存。
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,设置 {0} 时超时，是否继续？
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,所有设置均写入上位机文件夹中的 {0}。
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,停止
+CNC.Controls.WPF.g.en-US.resources:thcmonitorcontrol.baml,str_ThcFlyout:System.String.$Content,None,True,True,,_等离子监控
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_themeBlack:System.String.$Content,None,True,True,,黑色
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_themeDark:System.String.$Content,None,True,True,,暗黑
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_themeDefault:System.String.$Content,None,True,True,,默认
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_themeLight:System.String.$Content,None,True,True,,高亮
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_themeWhite:System.String.$Content,None,True,True,,白色
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_toolchanges:System.String.$Content,None,True,True,,"加工程序使用M6进行了 {0} 次刀具更换,只有少数 Grbl 端口支持自动换刀。"
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_toolchangeTLO:System.String.$Content,None,True,True,,加工程序有 {0} 次换刀，在加工开始前应建立刀具长度参考。
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_transferAborted:System.String.$Content,None,True,True,,传输中止。
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_transferComplete:System.String.$Content,None,True,True,,传输完成
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_transferDone:System.String.$Content,None,True,True,,传输完成。
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_transferring:System.String.$Content,None,True,True,,已传输 {0} 个字节，共 {1} 个字节...
-CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_uploading:System.String.$Content,None,True,True,,Uploading...
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String.$Content,None,True,True,,无效输入：允许的最大值为 {0}。
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,无效输入：允许的最小值为 {0}。
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,输入无效：不是 IP4 地址..
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,无效输入：允许的范围是 {0} - {1}。
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifySendController:System.String.$Content,None,True,True,,Are you sure you want to send the selected blocks to the controller?
-CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifyStartFrom:System.String.$Content,None,True,True,,Are you sure the controller is in the correct state to start from block {0}?
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_transferring:System.String.$Content,None,True,True,,已传输 {0} 个字节，共 {1} 个字节…
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_uploading:System.String.$Content,None,True,True,,正在上传…
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String.$Content,None,True,True,,输入无效：允许的最大值为 {0}.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,输入无效：允许的最小值为 {0}.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,输入无效：不是 IP4 地址。
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,输入无效：允许的范围为 {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifySendController:System.String.$Content,None,True,True,,您确定要将选定的行发送到控制器吗？
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifyStartFrom:System.String.$Content,None,True,True,,您确定控制器处于从块 {0} 开始的正确状态吗？
 CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,报警代码
-CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Error codes
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,错误代码
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,以太网
-CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Serial
-CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,执行移动以勾勒 X 和 Y 程序限制。
-CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,确保工具尖端没有任何障碍物！
-CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,控制器错误和报警代码
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,串口
+CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,"执行动作,勾勒出程序X/Y的最大范围。"
+CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,确保刀具不会碰到障碍物!! 
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,控制器错误和警报代码
diff --git a/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv
index db5f339..ac96088 100644
--- a/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv
@@ -3,16 +3,16 @@ CNC.Converters.g.en-US.resources:jobparametersdialog.baml,btn_ok:System.Windows.
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Controls.NumericField.Label,None,False,True,,铣削深度：
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Label,None,False,True,,进给速度：
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Label,None,False,True,,Plunge rate:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Label,None,False,True,,Feed rate:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Label,None,False,True,,下降率：
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Label,None,False,True,,Rapids:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Label,None,False,True,,快速:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rpm:CNC.Controls.NumericField.Label,None,False,True,,RPM:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rpm:CNC.Controls.NumericField.Unit,None,False,True,,
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_toolChange:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_toolChange:CNC.Controls.NumericField.Label,None,False,True,,刀具长度:
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_scalingFactors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Scaling factors
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_spindle_feed:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Spindle and feed
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_toolChange:CNC.Controls.NumericField.Label,None,False,True,,换刀：
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_scalingFactors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,比例因子
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_spindle_feed:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,主轴与进给
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_tool:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,刀具
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_zPosition:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Z positions (relative to workpiece surface)
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_zPosition:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Z位置(相对于工件表面)
diff --git a/Locale/zh-CN/csv/CNC.Core.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Core.resources.zh-CN.csv
index fd74ed6..c8a1084 100644
--- a/Locale/zh-CN/csv/CNC.Core.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Core.resources.zh-CN.csv
@@ -1,43 +1,44 @@
-CNC.Core.g.en-US.resources:libstrings.baml,str_contClearResetUnlock:System.String.$Content,None,True,True,,clear then &lt;Reset&gt; then &lt;Unlock&gt; to continue
-CNC.Core.g.en-US.resources:libstrings.baml,str_contHome:System.String.$Content,None,True,True,,&lt;Home&gt; to continue
-CNC.Core.g.en-US.resources:libstrings.baml,str_contHomeUnlock:System.String.$Content,None,True,True,,&lt;Home&gt; or &lt;Unlock&gt; to continue
-CNC.Core.g.en-US.resources:libstrings.baml,str_contResetUnlock:System.String.$Content,None,True,True,,&lt;Reset&gt; then &lt;Unlock&gt; to continue
-CNC.Core.g.en-US.resources:libstrings.baml,str_contUnlock:System.String.$Content,None,True,True,,&lt;Unlock&gt; to continue
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcLoadError:System.String.$Content,None,True,True,,{0}\\nLine: {1}\\nBlock: {2}\\n\\nContinue loading?
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserAxisError:System.String.$Content,None,True,True,,轴指令冲突
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserBadExpr:System.String.$Content,None,True,True,,Bad expression
+CNC.Core.g.en-US.resources:libstrings.baml,str_contClearResetUnlock:System.String.$Content,None,True,True,,清除报警然后 &lt;复位&gt; 然后&lt;解锁&gt; 然后继续
+CNC.Core.g.en-US.resources:libstrings.baml,str_contHome:System.String.$Content,None,True,True,,&lt;归位&gt; 然后继续
+CNC.Core.g.en-US.resources:libstrings.baml,str_contHomeUnlock:System.String.$Content,None,True,True,,&lt;归位&gt; 或者 &lt;解锁&gt; 然后继续
+CNC.Core.g.en-US.resources:libstrings.baml,str_contResetUnlock:System.String.$Content,None,True,True,,&lt;复位&gt;然后&lt;解锁&gt;然后继续
+CNC.Core.g.en-US.resources:libstrings.baml,str_contUnlock:System.String.$Content,None,True,True,,&lt;解锁&gt;然后继续
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcLoadError:System.String.$Content,None,True,True,,{0}\\nLine: {1}\\nBlock: {2}\\n\\n继续加载?
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserAxisError:System.String.$Content,None,True,True,,轴命令冲突
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserBadExpr:System.String.$Content,None,True,True,,不好的表达式
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserCMDInvalid:System.String.$Content,None,True,True,,无效的 G 代码
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserCmdUnknown:System.String.$Content,None,True,True,,命令字无法识别
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserErrE:System.String.$Content,None,True,True,,E word greater than half the drive line length
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG1NoFeed:System.String.$Content,None,True,True,,进给速度未设定时使用 G1
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserErrE:System.String.$Content,None,True,True,,E字大于驱动线长度的一半
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG1NoFeed:System.String.$Content,None,True,True,,未设定进给速度时使用G1
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG6NoP:System.String.$Content,None,True,True,,G4 - 缺少 P 字
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserKlesseqJ:System.String.$Content,None,True,True,,K字必须大于J字
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserKlesseqJ:System.String.$Content,None,True,True,,K 字必须大于 J 字
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66BadParams:System.String.$Content,None,True,True,,Illegal M66 parameters
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66NoPorE:System.String.$Content,None,True,True,,M66 缺少 P 或 E 字
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66PandE:System.String.$Content,None,True,True,,M66 不能同时使用 P 字和 E 字
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserModalGrpError:System.String.$Content,None,True,True,,模态组违规
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegH:System.String.$Content,None,True,True,,H字为负
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegJ:System.String.$Content,None,True,True,,J word negative
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegK:System.String.$Content,None,True,True,,K字否定
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegP:System.String.$Content,None,True,True,,P字否定
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegH:System.String.$Content,None,True,True,,H字负数
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegJ:System.String.$Content,None,True,True,,J字负数
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegK:System.String.$Content,None,True,True,,K字负数
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegP:System.String.$Content,None,True,True,,P字负数
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoG0orG1:System.String.$Content,None,True,True,,G0 或 G1 未激活
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoIandorJ:System.String.$Content,None,True,True,,I 和/或 J 字缺失
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoInvalidQ:System.String.$Content,None,True,True,,Q word missing or out of range
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoIandorJ:System.String.$Content,None,True,True,,I 和/或 J 词缺失
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoInvalidQ:System.String.$Content,None,True,True,,Q 字缺失或超出范围
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoK:System.String.$Content,None,True,True,,K字缺失
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoP:System.String.$Content,None,True,True,,P字缺失
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoPandorQ:System.String.$Content,None,True,True,,P 和/或 Q 字缺失
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoR:System.String.$Content,None,True,True,,R word missing
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserPlaneNotXY:System.String.$Content,None,True,True,,Plane not XY
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserPlaneNotZx:System.String.$Content,None,True,True,,Plane not ZX
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoR:System.String.$Content,None,True,True,,R 字缺失
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserPlaneNotXY:System.String.$Content,None,True,True,,平面不是 XY
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserPlaneNotZx:System.String.$Content,None,True,True,,平面不是 ZX
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserRadiusErr:System.String.$Content,None,True,True,,计算圆弧半径时出错。
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserRless1:System.String.$Content,None,True,True,,R word less than 1
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserStrip:System.String.$Content,None,True,True,,"{0} command found, strip?"
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserStripHdr:System.String.$Content,None,True,True,,Strip command
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserToolNoI:System.String.$Content,None,True,True,,I 缺失
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserRless1:System.String.$Content,None,True,True,,R字小于1
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserStrip:System.String.$Content,None,True,True,,找到 {0} 命令，剥离？
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserStripHdr:System.String.$Content,None,True,True,,剥离命令
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserToolNoI:System.String.$Content,None,True,True,,I字缺失
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserToolNoJ:System.String.$Content,None,True,True,,J字缺失
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserToolProfile:System.String.$Content,None,True,True,,工具 {0} 未与配置文件关联
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserUnsupportedCmd:System.String.$Content,None,True,True,,Unsupported command
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserToolProfile:System.String.$Content,None,True,True,,刀具 {0} 未与配置文件关联
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserUnsupportedCmd:System.String.$Content,None,True,True,,不支持的命令
 CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserWordRepeated:System.String.$Content,None,True,True,,命令字重复
-CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserZPlus:System.String.$Content,None,True,True,,找到除 Z 以外的轴代码
-CNC.Core.g.en-US.resources:libstrings.baml,str_joggingOnly:System.String.$Content,None,True,True,,换刀时只允许点动和部分系统指令！
-CNC.Core.g.en-US.resources:libstrings.baml,str_sdStreamComplete:System.String.$Content,None,True,True,,SD Card streaming {0}% complete
-CNC.Core.g.en-US.resources:libstrings.baml,str_serialPortError:System.String.$Content,None,True,True,,Unable to open serial port: {0}
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserZPlus:System.String.$Content,None,True,True,,找到除Z以外的轴字
+CNC.Core.g.en-US.resources:libstrings.baml,str_joggingOnly:System.String.$Content,None,True,True,,换刀时只允许点动和一些系统命令！
+CNC.Core.g.en-US.resources:libstrings.baml,str_sdStreamComplete:System.String.$Content,None,True,True,,SD 卡流式传输已完成 {0}%
+CNC.Core.g.en-US.resources:libstrings.baml,str_serialPortError:System.String.$Content,None,True,True,,无法打开串行端口：{0}
diff --git a/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv b/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
index c731298..805758b 100644
--- a/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
@@ -1,9 +1,9 @@
-ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,键盘控制手动进给的距离（使用 &lt;CTRL&gt; 修饰符）。
-ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_关于
-ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,简短的游览
-ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_相机
+ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,键盘步进点动的距离 (with &lt;CTRL&gt; modifier).
+ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_关于<老陈头翻译>
+ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_简要游览
+ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_摄像头
 ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_关闭
-ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_错误和警报代码
+ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_错误和报警代码
 ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_退出
 ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_文件
 ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_帮助
@@ -12,42 +12,42 @@ ioSender.g.en-US.resources:mainwindow.baml,mnu_open:System.Windows.Controls.Head
 ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_打开控制台
 ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_保存
 ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_转换
-ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Usage _tips
+ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,使用提示
 ioSender.g.en-US.resources:mainwindow.baml,mnu_videoTutorials:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_视频教程
-ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_文档
-ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,手动进给距离：{0}
-ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,弧线到线
+ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_帮助
+ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,Jog 一步: {0}
+ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,弧线到直线
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuCompress:System.String.$Content,None,True,True,,压缩（实验）
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuDragKnife:System.String.$Content,None,True,True,,添加拖刀动作
-ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,Rotate
-ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
-ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Door is open, close door and continue?"
-ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Door state cannot be cleared with &lt;Reset&gt;
-ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,急停激活！ - 在继续之前解除...
-ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,急停仍然被按下，是否退出？
-ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"Homing cycle required, &lt;Home&gt; to continue"
-ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,控制器处于 {0} 状态且无法响应，尝试软复位？
-ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,由于警报 {0}，控制器无法通信，正在尝试软复位。
+ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,旋转
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"门还开着,退出吗？"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,门打开，关上门并继续吗？
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,门状态解除不能用&lt;复位&gt;
+ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,急停被按下!在继续之前先解除...
+ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,"急停仍然被按下,要退出吗？"
+ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"需要归位循环,&lt;归位&gt;然后继续"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,控制器处于 {0} 状态且无法响应，是否尝试软重置？
+ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,由于警报 {0}，控制器无法通信，正在尝试软重置。
 ioSender.g.en-US.resources:jobview.baml,str_msgNoResponse:System.String.$Content,None,True,True,,控制器没有响应！
-ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,控制器软复位失败，退出。
-ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,控制器软复位失败，退出。
-ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,Waiting for controller ({0})...
-ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,Run time: {0}
-ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D刀路
-ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D刀路
-ioSender.g.en-US.resources:mainwindow.baml,tab_appConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Settings: App
-ioSender.g.en-US.resources:jobview.baml,tab_console:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Console
+ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,控制器软重置失败，正在退出。
+ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,控制器软重置失败，正在退出。
+ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,正在等待控制器 ({0})…
+ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,运行时间：{0}
+ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D仿真
+ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D仿真
+ioSender.g.en-US.resources:mainwindow.baml,tab_appConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,设置：应用程序
+ioSender.g.en-US.resources:jobview.baml,tab_console:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,控制台
 ioSender.g.en-US.resources:mainwindow.baml,tab_facing:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Facing
 ioSender.g.en-US.resources:mainwindow.baml,tab_grbl:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Grbl
-ioSender.g.en-US.resources:mainwindow.baml,tab_grblConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Settings: Grbl
-ioSender.g.en-US.resources:mainwindow.baml,tab_jogSidebar:System.Windows.Controls.ContentControl.Content,None,True,True,,_手动进给
+ioSender.g.en-US.resources:mainwindow.baml,tab_grblConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,设置：Grbl
+ioSender.g.en-US.resources:mainwindow.baml,tab_jogSidebar:System.Windows.Controls.ContentControl.Content,None,True,True,,_Jog
 ioSender.g.en-US.resources:mainwindow.baml,tab_offsets:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,偏移量
 ioSender.g.en-US.resources:mainwindow.baml,tab_parting:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Parting
-ioSender.g.en-US.resources:mainwindow.baml,tab_pidTuner:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,PID Tuner
+ioSender.g.en-US.resources:mainwindow.baml,tab_pidTuner:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,PID调节器
 ioSender.g.en-US.resources:mainwindow.baml,tab_probing:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,探测
-ioSender.g.en-US.resources:jobview.baml,tab_program:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Program
-ioSender.g.en-US.resources:mainwindow.baml,tab_sdCard:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,SD Card
-ioSender.g.en-US.resources:mainwindow.baml,tab_threading:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Threading
-ioSender.g.en-US.resources:mainwindow.baml,tab_tools:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工具
+ioSender.g.en-US.resources:jobview.baml,tab_program:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,程序
+ioSender.g.en-US.resources:mainwindow.baml,tab_sdCard:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,SD卡
+ioSender.g.en-US.resources:mainwindow.baml,tab_threading:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,螺纹加工
+ioSender.g.en-US.resources:mainwindow.baml,tab_tools:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,刀具
 ioSender.g.en-US.resources:mainwindow.baml,tab_trinamic:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Trinamic tuner
-ioSender.g.en-US.resources:mainwindow.baml,tab_turning:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Turning
+ioSender.g.en-US.resources:mainwindow.baml,tab_turning:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,车削
diff --git a/Locale/zh-CN/translation.txt b/Locale/zh-CN/translation.txt
index 31570c9..4e60d27 100644
Binary files a/Locale/zh-CN/translation.txt and b/Locale/zh-CN/translation.txt differ
diff --git a/changelog.md b/changelog.md
index d49396e..2e1ccf6 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,23 @@
 ## ioSender changelog
 
+2024-12-30: [Release 2.0.45](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.45).
+
+* Added spindle selection using drop down, ref. issue #399.
+* Remove R\(eset\) Signals "LED" if the input is not available.
+* Fixes for issue #414 & #429, heightmap probing failures. NOTE: these issues were due to a regression in a 2.0.45 prerelease.
+* Added parser support for block delete character.
+* Added filter button in SD card viewer for show/hide non-CNC files.
+* Allow use of modified legacy Grbl controller.
+* Added support for spindle selection when multiple spindles is available.
+* No longer stops jobtimer when changing tool.
+* Added FTP port settings, available when controller supports FTP file transfer.
+* Fixed and improved lathe turning wizard, taper mode.
+* Improved handling of cycle start signal
+* Improved tool length probing
+* Added pre/post probing job macro support.
+* Added Edge offset input in Edge finder tabs.
+* A number of minor bug fixes and improvements.
+
 2023-12-30: [Release 2.0.44](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.44).
 
 * Fix for issue #350 - improved handling of cycle start message coming from the controller to avoid unwanted start of loaded program.
diff --git a/ioSender XL/ioSender XL/JobView.xaml.cs b/ioSender XL/ioSender XL/JobView.xaml.cs
index 13b80e4..16dc770 100644
--- a/ioSender XL/ioSender XL/JobView.xaml.cs	
+++ b/ioSender XL/ioSender XL/JobView.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * JobView.xaml.cs - part of Grbl Code Sender
  *
- * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
+ * v0.45 / 2024-03-14 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2023, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -380,6 +380,7 @@ private bool InitSystem()
                 {
                     GrblParserState.Get();
                     GrblWorkParameters.Get();
+                    GrblSpindles.Get();
                 }
                 else
                     GrblParserState.Get(true);
diff --git a/ioSender XL/ioSender XL/MainWindow.xaml b/ioSender XL/ioSender XL/MainWindow.xaml
index c8d0933..a3c0bc1 100644
--- a/ioSender XL/ioSender XL/MainWindow.xaml	
+++ b/ioSender XL/ioSender XL/MainWindow.xaml	
@@ -112,7 +112,7 @@
             <cnccontrols:MachinePositionFlyout x:Name="mposFlyout" Visibility="Hidden" Canvas.Right="22"/>
             <cnccontrols:THCMonitorControl x:Name="thcControl" Visibility="Hidden" Canvas.Right="22"/>
         </Canvas>
-        <TabControl Background="Transparent" DockPanel.Dock="Left" x:Name="tabMode" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="False" SelectionChanged="TabMode_SelectionChanged">
+        <TabControl IsEnabled="{Binding Path=IsMPGActive, Converter={StaticResource BooleanConverter}}" Background="Transparent" DockPanel.Dock="Left" x:Name="tabMode" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="False" SelectionChanged="TabMode_SelectionChanged">
             <TabControl.Resources>
                 <Style TargetType="{x:Type TabItem}">
                     <Setter Property="Height" Value="32" />
diff --git a/ioSender XL/ioSender XL/MainWindow.xaml.cs b/ioSender XL/ioSender XL/MainWindow.xaml.cs
index b365c34..eed8397 100644
--- a/ioSender XL/ioSender XL/MainWindow.xaml.cs	
+++ b/ioSender XL/ioSender XL/MainWindow.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
+ * v0.45 / 2024-12-11 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2023, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.44";
+        private const string version = "2.0.45";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
diff --git a/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs b/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs
index f44f6e6..e1c434e 100644
--- a/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs	
+++ b/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs	
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
 [assembly: AssemblyProduct("ioSender")]
-[assembly: AssemblyCopyright("Copyright © 2023 Io Engineering")]
+[assembly: AssemblyCopyright("Copyright © 2024 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.44.0")]
-[assembly: AssemblyFileVersion("2.0.44.0")]
+[assembly: AssemblyVersion("2.0.45.0")]
+[assembly: AssemblyFileVersion("2.0.45.0")]
diff --git a/ioSender/ioSender/JobView.xaml.cs b/ioSender/ioSender/JobView.xaml.cs
index 04fb002..016d0a0 100644
--- a/ioSender/ioSender/JobView.xaml.cs
+++ b/ioSender/ioSender/JobView.xaml.cs
@@ -1,13 +1,13 @@
 /*
  * JobView.xaml.cs - part of Grbl Code Sender
  *
- * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
+ * v0.45 / 2024-03-14 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2023, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -375,6 +375,7 @@ bool InitSystem()
                 {
                     GrblParserState.Get();
                     GrblWorkParameters.Get();
+                    GrblSpindles.Get();
                 }
                 else
                     GrblParserState.Get(true);
diff --git a/ioSender/ioSender/MainWindow.xaml b/ioSender/ioSender/MainWindow.xaml
index 1c2ace8..1eafb9c 100644
--- a/ioSender/ioSender/MainWindow.xaml
+++ b/ioSender/ioSender/MainWindow.xaml
@@ -30,7 +30,7 @@
         <cnccore:GrblViewModel />
     </Window.DataContext>
 
-    <DockPanel IsEnabled="{Binding Path=IsMPGActive, Converter={StaticResource BooleanConverter}}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+    <DockPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
         <Menu IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" DockPanel.Dock="Top">
             <MenuItem x:Uid="mnu_file" x:Name="menuFile" Header="_File">
                 <MenuItem x:Uid="mnu_load" Header="_Load" Click="fileOpenMenuItem_Click"/>
@@ -52,7 +52,7 @@
                 <MenuItem x:Uid="mnu_about" Header="_About" Click="aboutMenuItem_Click"/>
             </MenuItem>
         </Menu>
-        <ToolBarTray DockPanel.Dock="Top" IsLocked="True">
+        <ToolBarTray IsEnabled="{Binding Path=IsMPGActive, Converter={StaticResource BooleanConverter}}" DockPanel.Dock="Top" IsLocked="True">
             <ToolBar IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" Height="42" VerticalAlignment="Top" Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DockPanel}}}" >
                 <cnccontrols:FileActionControl IsEnabled="{Binding Path=IsToolChanging, Converter={StaticResource BooleanConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
                 <Separator Margin="4,0"></Separator>
@@ -98,7 +98,7 @@
                 <TextBlock x:Uid="lbl_jogStep" ToolTip="Distance for keyboard step jog (with &lt;CTRL&gt; modifier)." Text="{Binding Path=JogStep, StringFormat={StaticResource JogStep}}" HorizontalAlignment="Right" TextWrapping="NoWrap" Margin="4,0"/>
             </StatusBarItem>
         </StatusBar>
-        <Canvas DockPanel.Dock="Right" Width="22" VerticalAlignment="Stretch" HorizontalAlignment="Right" ClipToBounds="False" Panel.ZIndex="1" Margin="0,34,0,0">
+        <Canvas IsEnabled="{Binding Path=IsMPGActive, Converter={StaticResource BooleanConverter}}" DockPanel.Dock="Right" Width="22" VerticalAlignment="Stretch" HorizontalAlignment="Right" ClipToBounds="False" Panel.ZIndex="1" Margin="0,34,0,0">
             <ItemsControl x:Name="xx" Width="22" VerticalAlignment="Stretch">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
@@ -113,7 +113,7 @@
             <cnccontrols:MachinePositionFlyout x:Name="mposFlyout" Visibility="Hidden" Canvas.Right="22"/>
             <cnccontrols:THCMonitorControl x:Name="thcControl" Visibility="Hidden" Canvas.Right="22"/>
         </Canvas>
-        <TabControl Background="Transparent" DockPanel.Dock="Left" x:Name="tabMode" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="False" SelectionChanged="TabMode_SelectionChanged">
+        <TabControl IsEnabled="{Binding Path=IsMPGActive, Converter={StaticResource BooleanConverter}}" Background="Transparent" DockPanel.Dock="Left" x:Name="tabMode" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="False" SelectionChanged="TabMode_SelectionChanged">
             <TabControl.Resources>
                 <Style TargetType="{x:Type TabItem}">
                     <Setter Property="Height" Value="32" />
diff --git a/ioSender/ioSender/MainWindow.xaml.cs b/ioSender/ioSender/MainWindow.xaml.cs
index 955471e..b300e4f 100644
--- a/ioSender/ioSender/MainWindow.xaml.cs
+++ b/ioSender/ioSender/MainWindow.xaml.cs
@@ -1,13 +1,13 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
+ * v0.45 / 2024-12-11 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2023, Io Engineering (Terje Io)
+Copyright (c) 2019-2024, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.44";
+        private const string version = "2.0.45";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
@@ -218,6 +218,12 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
 #endif
                 Comms.com.DataReceived -= (DataContext as GrblViewModel).DataReceived;
 
+                if (CNC.Core.Grbl.GrblViewModel.AutoReportInterval > 0)
+                {
+                    Comms.com.WriteByte(GrblConstants.CMD_AUTO_REPORTING_TOGGLE);
+                    System.Threading.Thread.Sleep(50);
+                }
+
                 using (new UIUtils.WaitCursor())
                 {
                     Comms.com.Close(); // disconnecting from websocket may take some time...
diff --git a/ioSender/ioSender/Properties/AssemblyInfo.cs b/ioSender/ioSender/Properties/AssemblyInfo.cs
index f44f6e6..e1c434e 100644
--- a/ioSender/ioSender/Properties/AssemblyInfo.cs
+++ b/ioSender/ioSender/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
 [assembly: AssemblyProduct("ioSender")]
-[assembly: AssemblyCopyright("Copyright © 2023 Io Engineering")]
+[assembly: AssemblyCopyright("Copyright © 2024 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.44.0")]
-[assembly: AssemblyFileVersion("2.0.44.0")]
+[assembly: AssemblyVersion("2.0.45.0")]
+[assembly: AssemblyFileVersion("2.0.45.0")]
diff --git a/readme.md b/readme.md
index 801f71e..e9ecc98 100644
--- a/readme.md
+++ b/readme.md
@@ -10,7 +10,7 @@ Please check out the [Wiki](https://github.com/terjeio/Grbl-GCode-Sender/wiki) f
 
 If you want to test ioSender with grblHAL but do not have a board yet you can use the [grblHAL simulator](https://github.com/grblHAL/Simulator).
 Build it with the [Web Builder](http://svn.io-engineering.com:8080/?driver=Simulator&board=Windows), unpack the .exe-files in the downloaded .zip somewhere and
-open a command window (cmd or PowerShell) in the folder by \<Shift\>+Right clicking in it, select the _Open PowerShell window here_ or
+open a command window (cmd or PowerShell) in the folder by \<Shift\>+Right clicking in it, select _Open PowerShell window here_ or
 _Open command window here_ from the popup menu to open it.
 Then find your computers IP address by typing `ipconfig` - the IP address can be found in the report generated.  
 Run the simulator by typing `./grblHAL_sim -p 23` - 23 is the default Telnet port number and you may have to change it if a Telnet server is already running on the machine.
@@ -22,7 +22,7 @@ The simulator can be stopped by typing \<Ctrl\>+C in the command window or by cl
 
 ---
 
-Latest release is 2.0.44, see the [changelog](changelog.md) for details. 
+Latest release is 2.0.45, see the [changelog](changelog.md) for details. 
 
 ---
 
@@ -68,4 +68,4 @@ Lathe mode.
 Conversational programming for Lathe Mode. Threading requires [grblHAL](https://github.com/grblHAL) controller with driver that has spindle sync support.
 
 ---
-2024-02-20
+2024-12-11