Merge branch 'main' into '3dSkinRenderer'

PCK-Studio/Classes/API/Miles/Binka.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using PckStudio.Extensions;
 using PckStudio.Internal;
+using PckStudio.Internal.App;
 using SharpMSS;
 
 namespace PckStudio.API.Miles

PCK-Studio/Classes/Utils/BinkaConverter.cs

@@ -9,6 +9,7 @@ using System.Windows.Forms;
 using System.IO;
 using PckStudio.Internal;
 using System.Text.RegularExpressions;
+using PckStudio.Internal.App;
 
 namespace PckStudio.Classes.Utils
 {

PCK-Studio/Extensions/ImageExtensions.cs

@@ -26,6 +26,7 @@ using System.Linq;
 using PckStudio.Internal;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using PckStudio.Internal.App;
 
 namespace PckStudio.Extensions
 {

PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs

@@ -5,6 +5,7 @@ using System.Windows.Forms;
 using MetroFramework.Forms;
 using PckStudio.Extensions;
 using PckStudio.Internal;
+using PckStudio.Internal.App;
 using PckStudio.Internal.Json;
 
 namespace PckStudio.Forms.Additional_Popups.Animation

PCK-Studio/Forms/ContributorsForm.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using MetroFramework.Forms;
 using PckStudio.Internal;
+using PckStudio.Internal.App;
 using PckStudio.ToolboxItems;
 
 namespace PckStudio.Forms

PCK-Studio/Forms/Editor/AudioEditor.cs

@@ -20,6 +20,7 @@ using PckStudio.API.Miles;
 using PckStudio.Internal;
 using PckStudio.Internal.FileFormats;
 using PckStudio.Extensions;
+using PckStudio.Internal.App;
 
 // Audio Editor by MattNL and Miku-666
 

PCK-Studio/Forms/Editor/BehaviourEditor.cs

@@ -15,6 +15,7 @@ using PckStudio.Properties;
 using PckStudio.Internal;
 using PckStudio.Extensions;
 using PckStudio.Internal.Json;
+using PckStudio.Internal.App;
 
 namespace PckStudio.Forms.Editor
 {

PCK-Studio/Forms/Editor/MaterialsEditor.cs

@@ -13,6 +13,7 @@ using OMI.Workers.Material;
 using PckStudio.Internal;
 using PckStudio.Extensions;
 using PckStudio.Internal.Json;
+using PckStudio.Internal.App;
 
 namespace PckStudio.Forms.Editor
 {

PCK-Studio/Internal/App/ApplicationBuildInfo.cs

@@ -19,7 +19,7 @@ using System;
 using System.IO;
 using System.Reflection;
 
-namespace PckStudio.Internal
+namespace PckStudio.Internal.App
 {
     static internal class ApplicationBuildInfo
     {

PCK-Studio/Internal/App/ApplicationScope.cs

@@ -10,7 +10,7 @@ using PckStudio.Internal.Misc;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace PckStudio.Internal
+namespace PckStudio.Internal.App
 {
     internal static class ApplicationScope
     {

PCK-Studio/Internal/App/CommitInfo.cs

@@ -18,7 +18,7 @@
 using System.Linq;
 using System.Reflection;
 
-namespace PckStudio.Internal
+namespace PckStudio.Internal.App
 {
     static internal class CommitInfo
     {

PCK-Studio/Internal/App/Profiler.cs

@@ -23,7 +23,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PckStudio.Internal
+namespace PckStudio.Internal.App
 {
     internal static class Profiler
     {

PCK-Studio/Internal/App/SettingsManager.cs

@@ -21,7 +21,7 @@ using System.ComponentModel;
 using System.Configuration;
 using PckStudio.Properties;
 
-namespace PckStudio.Internal
+namespace PckStudio.Internal.App
 {
     internal static class SettingsManager
     {

PCK-Studio/Internal/Misc/RichPresenceClient.cs

@@ -4,6 +4,7 @@ using DiscordRPC;
 using PckStudio.Internal;
 using PckStudio.Properties;
 using DiscordRPC.Logging;
+using PckStudio.Internal.App;
 
 namespace PckStudio.Internal.Misc
 {

PCK-Studio/MainForm.cs

@@ -35,6 +35,7 @@ using PckStudio.Internal.Json;
 using PckStudio.Internal.Deserializer;
 using PckStudio.Internal.Serializer;
 using OMI.Workers;
+using PckStudio.Internal.App;
 using PckStudio.Internal.Skin;
 
 namespace PckStudio

PCK-Studio/PckStudio.csproj

@@ -166,12 +166,12 @@
     <Compile Include="Internal\Json\Entities.cs" />
     <Compile Include="Internal\Json\EntityInfo.cs" />
     <Compile Include="Internal\ResourceCategory.cs" />
+    <Compile Include="Internal\App\CommitInfo.cs" />
     <Compile Include="External\Format\BlockBenchModel.cs" />
     <Compile Include="Internal\Skin\Skin.cs" />
     <Compile Include="Internal\Skin\SkinMetaData.cs" />
     <Compile Include="Internal\Skin\SkinModelInfo.cs" />
     <Compile Include="Internal\Skin\SkinPartOffset.cs" />
-    <Compile Include="Internal\CommitInfo.cs" />
     <Compile Include="Internal\ResourceLocation.cs" />
     <Compile Include="Internal\Serializer\ImageSerializer.cs" />
     <Compile Include="Internal\Skin\SkinAnimFlag.cs" />
@@ -249,7 +249,7 @@
     <Compile Include="Forms\AppSettingsForm.Designer.cs">
       <DependentUpon>AppSettingsForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Internal\ApplicationBuildInfo.cs" />
+    <Compile Include="Internal\App\ApplicationBuildInfo.cs" />
     <Compile Include="Forms\Editor\TextureAtlasEditor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -269,12 +269,12 @@
     <Compile Include="Internal\IO\PckAudio\PckAudioFileWriter.cs" />
     <Compile Include="Internal\Misc\FileCacher.cs" />
     <Compile Include="Internal\Misc\OpenFolderDialog.cs" />
-    <Compile Include="Internal\ApplicationScope.cs" />
+    <Compile Include="Internal\App\ApplicationScope.cs" />
     <Compile Include="Internal\Json\ColorEntry.cs" />
     <Compile Include="Internal\Json\TileInfo.cs" />
     <Compile Include="Internal\Json\Tiles.cs" />
-    <Compile Include="Internal\Profiler.cs" />
-    <Compile Include="Internal\SettingsManager.cs" />
+    <Compile Include="Internal\App\Profiler.cs" />
+    <Compile Include="Internal\App\SettingsManager.cs" />
     <Compile Include="Internal\Skin\SkinBOX.cs" />
     <Compile Include="Extensions\ImageExtensions.cs" />
     <Compile Include="Internal\Skin\SkinANIM.cs" />

PCK-Studio/Program.cs

@@ -7,6 +7,7 @@ using PckStudio.Internal.Misc;
 using PckStudio.Internal;
 using PckStudio.Properties;
 using PCKStudio_Updater;
+using PckStudio.Internal.App;
 
 
 namespace PckStudio

PCK-Studio/ToolboxItems/GithubUserPanel.cs

@@ -12,6 +12,7 @@ using System.IO;
 using System.Threading.Tasks;
 using PckStudio.Internal;
 using System.Drawing.Imaging;
+using PckStudio.Internal.App;
 
 namespace PckStudio.ToolboxItems
 {