4sval · Krowe-moh · Jul 31, 2026 · Jul 31, 2026 · Aug 17, 2026 · Aug 17, 2026
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
         run: dotnet restore FModel
 
       - name: .NET Publish
-        run: dotnet publish FModel -c Release --no-self-contained -r win-x64 -f net8.0-windows -o "./FModel/bin/Publish/" -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:DebugType=None -p:GenerateDocumentationFile=false -p:DebugSymbols=false -p:AssemblyVersion=${{ github.event.inputs.appVersion }} -p:FileVersion=${{ github.event.inputs.appVersion }}
+        run: dotnet publish FModel -c Release --no-self-contained -r win-x64 -f net10.0-windows -o "./FModel/bin/Publish/" -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:DebugType=None -p:GenerateDocumentationFile=false -p:DebugSymbols=false -p:AssemblyVersion=${{ github.event.inputs.appVersion }} -p:FileVersion=${{ github.event.inputs.appVersion }}
 
       - name: ZIP File
         uses: papeloto/action-zip@v1.2

diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/App.xaml.cs b/FModel/App.xaml.cs
@@ -1,18 +1,17 @@
-using AdonisUI.Controls;
-using Microsoft.Win32;
-using Serilog;
 using System;
 using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Threading;
-using CUE4Parse;
+using AdonisUI.Controls;
 using FModel.Framework;
 using FModel.Services;
 using FModel.Settings;
 using FModel.Views.Snooper;
+using Microsoft.Win32;
 using Newtonsoft.Json;
+using Serilog;
 using Serilog.Events;
 using Serilog.Sinks.SystemConsole.Themes;
 using MessageBox = AdonisUI.Controls.MessageBox;

diff --git a/FModel/Creator/Bases/FN/BaseBundle.cs b/FModel/Creator/Bases/FN/BaseBundle.cs
@@ -4,9 +4,7 @@
 using CUE4Parse.UE4.Objects.Core.i18N;
 using CUE4Parse.UE4.Objects.UObject;
 using CUE4Parse.Utils;
-using FModel.Framework;
 using SkiaSharp;
-using SkiaSharp.HarfBuzz;
 
 namespace FModel.Creator.Bases.FN;
 

diff --git a/FModel/Creator/Bases/FN/BaseIcon.cs b/FModel/Creator/Bases/FN/BaseIcon.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
+using CUE4Parse_Conversion.Textures;
 using CUE4Parse.GameTypes.FN.Enums;
 using CUE4Parse.UE4.Assets.Exports;
 using CUE4Parse.UE4.Assets.Exports.Engine;
@@ -12,7 +13,6 @@
 using CUE4Parse.UE4.Objects.Core.Math;
 using CUE4Parse.UE4.Objects.GameplayTags;
 using CUE4Parse.UE4.Objects.UObject;
-using CUE4Parse_Conversion.Textures;
 using FModel.Settings;
 using SkiaSharp;
 

diff --git a/FModel/Creator/Bases/FN/BaseQuest.cs b/FModel/Creator/Bases/FN/BaseQuest.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using CUE4Parse.UE4.Assets.Exports;
 using CUE4Parse.UE4.Assets.Exports.Engine;
 using CUE4Parse.UE4.Assets.Exports.Material;
@@ -9,9 +8,7 @@
 using CUE4Parse.UE4.Objects.Core.i18N;
 using CUE4Parse.UE4.Objects.UObject;
 using CUE4Parse.Utils;
-using FModel.Framework;
 using SkiaSharp;
-using SkiaSharp.HarfBuzz;
 
 namespace FModel.Creator.Bases.FN;
 

diff --git a/FModel/Creator/Bases/FN/BaseUserControl.cs b/FModel/Creator/Bases/FN/BaseUserControl.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Globalization;
 using CUE4Parse.UE4.Assets.Exports;
 using CUE4Parse.UE4.Assets.Objects;
 using CUE4Parse.UE4.Objects.Core.i18N;

diff --git a/FModel/Creator/Bases/MV/BaseFighter.cs b/FModel/Creator/Bases/MV/BaseFighter.cs
@@ -1,15 +1,14 @@
 using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using CUE4Parse.UE4.Assets.Exports;
 using CUE4Parse.UE4.Assets.Exports.Engine;
 using CUE4Parse.UE4.Assets.Exports.Material;
 using CUE4Parse.UE4.Assets.Objects;
 using CUE4Parse.UE4.Objects.Core.i18N;
 using CUE4Parse.UE4.Objects.Core.Math;
 using CUE4Parse.UE4.Objects.UObject;
-using FModel.Extensions;
 using SkiaSharp;
 
 namespace FModel.Creator.Bases.MV;

diff --git a/FModel/Creator/CreatorPackage.cs b/FModel/Creator/CreatorPackage.cs
@@ -5,6 +5,7 @@
 using FModel.Creator.Bases;
 using FModel.Creator.Bases.FN;
 using FModel.Creator.Bases.MV;
+using BaseQuest = FModel.Creator.Bases.FN.BaseQuest;
 
 namespace FModel.Creator;
 
@@ -214,7 +215,7 @@ when _pkgName.Contains("/MI_OfferImages/", StringComparison.OrdinalIgnoreCase) |
             case "FortQuestItemDefinition_Campaign":
             case "AthenaDailyQuestDefinition":
             case "FortUrgentQuestItemDefinition":
-                creator = new Bases.FN.BaseQuest(_object.Value, _style);
+                creator = new BaseQuest(_object.Value, _style);
                 return true;
             case "FortCompendiumItemDefinition":
             case "FortCompendiumBundleDefinition":

diff --git a/FModel/Creator/Utils.cs b/FModel/Creator/Utils.cs
@@ -5,16 +5,16 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using CUE4Parse_Conversion.Textures;
 using CUE4Parse.UE4.Assets.Exports;
 using CUE4Parse.UE4.Assets.Exports.Material;
 using CUE4Parse.UE4.Assets.Exports.Texture;
+using CUE4Parse.UE4.Assets.Objects;
 using CUE4Parse.UE4.Objects.UObject;
 using CUE4Parse.UE4.Versions;
-using CUE4Parse_Conversion.Textures;
-using CUE4Parse.UE4.Assets.Objects;
 using CUE4Parse.Utils;
-using FModel.Framework;
 using FModel.Extensions;
+using FModel.Framework;
 using FModel.Services;
 using FModel.Settings;
 using FModel.ViewModels;

diff --git a/FModel/Extensions/AvalonExtensions.cs b/FModel/Extensions/AvalonExtensions.cs
@@ -2,6 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Xml;
 using FModel.Extensions.Themes;
+using FModel.Settings;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Highlighting.Xshd;
 
@@ -61,7 +62,7 @@ public static IHighlightingDefinition HighlighterSelector(string ext)
             case "po":
                 return null;
             default:
-                _jsonHighlighter.ApplyJsonTheme(Settings.UserSettings.Default.JsonHighlightTheme);
+                _jsonHighlighter.ApplyJsonTheme(UserSettings.Default.JsonHighlightTheme);
                 return _jsonHighlighter;
         }
     }

diff --git a/FModel/Extensions/ClipboardExtensions.cs b/FModel/Extensions/ClipboardExtensions.cs
@@ -1,11 +1,11 @@
-using SkiaSharp;
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Windows;
+using SkiaSharp;
 
 namespace FModel.Extensions;
 
@@ -195,4 +195,4 @@ private static string GenerateHTMLFragment(string html)
 
         return sb.ToString();
     }
-}
+}
diff --git a/FModel/Extensions/Themes/HighlightingThemeExtensions.cs b/FModel/Extensions/Themes/HighlightingThemeExtensions.cs
@@ -1,7 +1,6 @@
 using System.Windows;
 using System.Windows.Media;
 using ICSharpCode.AvalonEdit.Highlighting;
-using static FModel.Extensions.AvalonExtensions;
 using static FModel.Extensions.Themes.JsonHighlightThemes;
 
 namespace FModel.Extensions.Themes;