merge(dev): Re-apply changes after conflict resolution

2026-04-27 18:16:45 -04:00
parent 20a22d2dd9
commit 7fe06cf565
35 changed files with 78 additions and 3561 deletions
--- a/backend/Domain/Entities/Printer.cs
+++ b/backend/Domain/Entities/Printer.cs
@@ -94,10 +94,4 @@ public class Printer : AuditableEntity
    /// Navigation collection of print jobs executed on this printer.
    /// </summary>
    public ICollection<PrintJob> PrintJobs { get; set; } = new List<PrintJob>();
-
-    /// <summary>
-    /// Navigation collection of filament usage records tracking consumption on this printer.
-    /// Enables querying per-printer filament usage and COGS.
-    /// </summary>
-    public ICollection<FilamentUsage> FilamentUsages { get; set; } = new List<FilamentUsage>();
 }