aj/OpenNest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge: resolve conflicts from remote nesting progress changes

Browse Source 
Kept using OpenNest.Api in Timing.cs and EditNestForm.cs alongside
remote's reorganized usings and namespace changes.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-19 09:35:25 -04:00
parent e656956c1c 0f953b8701
commit 9a58782c46
211 changed files with 4751 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenNest.Mcp/Program.cs
View File

@@ -1,6 +1,5 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using ModelContextProtocol.Server;
using OpenNest.Mcp;
var builder = Host.CreateApplicationBuilder(args);

9
OpenNest.Mcp/Tools/InputTools.cs
View File

@@ -1,11 +1,10 @@
using ModelContextProtocol.Server;
using OpenNest.Converters;
using OpenNest.IO;
using OpenNest.Shapes;
using System.ComponentModel;
using System.IO;
using System.Text;
using ModelContextProtocol.Server;
using OpenNest.Converters;
using OpenNest.Geometry;
using OpenNest.IO;
using OpenNest.Shapes;
using CncProgram = OpenNest.CNC.Program;
namespace OpenNest.Mcp.Tools

7
OpenNest.Mcp/Tools/InspectionTools.cs
View File

@@ -1,10 +1,9 @@
using System.Collections.Generic;
using ModelContextProtocol.Server;
using OpenNest.Engine.Fill;
using OpenNest.Math;
using System.ComponentModel;
using System.Linq;
using System.Text;
using ModelContextProtocol.Server;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.Mcp.Tools
{

5
OpenNest.Mcp/Tools/NestingTools.cs
View File

@@ -1,10 +1,11 @@
using ModelContextProtocol.Server;
using OpenNest.Engine.Fill;
using OpenNest.Geometry;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading;
using ModelContextProtocol.Server;
using OpenNest.Geometry;
namespace OpenNest.Mcp.Tools
{

4
OpenNest.Mcp/Tools/SetupTools.cs
View File

@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Text;
using ModelContextProtocol.Server;
using OpenNest.Geometry;
using System.ComponentModel;
using System.Text;
namespace OpenNest.Mcp.Tools
{

2
OpenNest.Mcp/Tools/TestTools.cs
View File

@@ -1,8 +1,8 @@
using ModelContextProtocol.Server;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Text;
using ModelContextProtocol.Server;
namespace OpenNest.Mcp.Tools
{