Merge branch 'feature/Osai_ToolTable' into develop

# Conflicts: # Libs/CMS_CORE_Library.dll # Step.Core/ThreadsFunctions.cs # Step.Core/ThreadsHandler.cs # Step.Database/DatabaseContext.cs # Step.Database/Migrations/201806220920193_InitMigration.Designer.cs # Step.Database/Migrations/201806220920193_InitMigration.cs # Step.Database/Migrations/201807120908403_InitMigration.Designer.cs # Step.Database/Migrations/201807120908403_InitMigration.cs # Step.Database/Migrations/201807120908403_InitMigration.resx # Step.Database/Migrations/201807251330036_InitMigration.Designer.cs # Step.Database/Migrations/201807251330036_InitMigration.cs # Step.Database/Step.Database.csproj # Step.Model/Constants.cs # Step.NC/NcHandler.cs # Step/Listeners/ListenersHandler.cs # Step/Step.csproj
2018-08-03 12:59:14 +02:00
parent 15f8e0e834 10610c481a
commit bbd4535dbf
46 changed files with 3431 additions and 787 deletions
@@ -21,8 +21,8 @@ namespace Step.Core
                ThreadsFunctions.ReadUserSoftKeysData,
                ThreadsFunctions.ReadHeadsData,
                ThreadsFunctions.ReadAxesNamesData,
-                ThreadsFunctions.ReadActiveProgramData
-            
+                ThreadsFunctions.ReadActiveProgramData,
+                ThreadsFunctions.UpdateToolsData
                // ThreadsFunctions.ReadNcSoftKeysData,
            };