LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-07-13 15:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 3dSkinRenderer

Browse Source
This commit is contained in:
miku-666
2024-05-20 16:51:26 +02:00
parent 713a51409e 9ef19cee34
commit bb3ac92691
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PCK-Studio/Forms/Editor/GameRuleFileEditor.cs
View File

@@ -21,7 +21,7 @@ using System.IO;
using System.Linq;
using System.Windows.Forms;
using PckStudio.Forms.Additional_Popups.Grf;
using PckStudio.Classes.Misc;
using PckStudio.Internal.Misc;
using OMI.Formats.GameRule;
using OMI.Workers.GameRule;
using System.Diagnostics;

2
PCK-Studio/Forms/Editor/LOCEditor.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Collections.Generic;
using System.Windows.Forms;
using MetroFramework.Forms;
using PckStudio.Classes.Misc;
using PckStudio.Internal.Misc;
using PckStudio.Forms.Additional_Popups.Loc;
using OMI.Formats.Languages;
using OMI.Workers.Language;

2
PCK-Studio/Forms/Features/CemuPanel.cs
View File

@@ -21,7 +21,7 @@ using System.IO;
using System.Linq;
using System.Windows.Forms;
using PckStudio.Extensions;
using PckStudio.Classes.Misc;
using PckStudio.Internal.Misc;
using System.Diagnostics;
namespace PckStudio.Forms.Features

2
PCK-Studio/Internal/ApplicationScope.cs
View File

@@ -2,11 +2,11 @@
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using PckStudio.Classes.Misc;
using PckStudio.Properties;
using PckStudio.Extensions;
using System.Globalization;
using PckStudio.Internal.Json;
using PckStudio.Internal.Misc;
namespace PckStudio.Internal
{

2
PCK-Studio/Classes/Misc/FileCacher.cs → PCK-Studio/Internal/Misc/FileCacher.cs
View File

@@ -18,7 +18,7 @@
using System;
using System.IO;
namespace PckStudio.Classes.Misc
namespace PckStudio.Internal.Misc
{
internal class FileCacher
{

2
PCK-Studio/Classes/Misc/OpenFolderDialog.cs → PCK-Studio/Internal/Misc/OpenFolderDialog.cs
View File

@@ -2,7 +2,7 @@
* Source by: Simon Mourier(https://stackoverflow.com/users/403671/simon-mourier)
*/
namespace PckStudio.Classes.Misc
namespace PckStudio.Internal.Misc
{
using System;
using System.Diagnostics;

2
PCK-Studio/Classes/Misc/RichPresenceClient.cs → PCK-Studio/Internal/Misc/RichPresenceClient.cs
View File

@@ -5,7 +5,7 @@ using PckStudio.Internal;
using PckStudio.Properties;
using DiscordRPC.Logging;
namespace PckStudio.Classes.Misc
namespace PckStudio.Internal.Misc
{
// https://github.com/BullyWiiPlaza/Minecraft-Wii-U-Mod-Injector/blob/main/Minecraft%20Wii%20U%20Mod%20Injector/Helpers/DiscordRpc.cs
static class RPC

2
PCK-Studio/MainForm.cs
View File

@@ -21,7 +21,7 @@ using PckStudio.Forms;
using PckStudio.Forms.Editor;
using PckStudio.Forms.Additional_Popups.Animation;
using PckStudio.Forms.Additional_Popups;
using PckStudio.Classes.Misc;
using PckStudio.Internal.Misc;
using PckStudio.Internal.IO.PckAudio;
using PckStudio.Internal.IO._3DST;
using PckStudio.Internal;

6
PCK-Studio/PckStudio.csproj
View File

@@ -150,6 +150,7 @@
<Compile Include="External\Format\BedrockModel.cs" />
<Compile Include="Internal\FileDialogFilter.cs" />
<Compile Include="Internal\Deserializer\ImageDeserializer.cs" />
<Compile Include="Internal\Misc\RichPresenceClient.cs" />
<Compile Include="Internal\ModelImporter.cs" />
<Compile Include="Internal\ModelPartSpecifics.cs" />
<Compile Include="Internal\Serializer\AnimationSerializer.cs" />
@@ -254,8 +255,8 @@
<Compile Include="Internal\IO\3DST\3DSTextureWriter.cs" />
<Compile Include="Internal\IO\PckAudio\PckAudioFileReader.cs" />
<Compile Include="Internal\IO\PckAudio\PckAudioFileWriter.cs" />
<Compile Include="Classes\Misc\FileCacher.cs" />
<Compile Include="Classes\Misc\OpenFolderDialog.cs" />
<Compile Include="Internal\Misc\FileCacher.cs" />
<Compile Include="Internal\Misc\OpenFolderDialog.cs" />
<Compile Include="Internal\ApplicationScope.cs" />
<Compile Include="Internal\Json\ColorEntry.cs" />
<Compile Include="Internal\Json\TileInfo.cs" />
@@ -265,7 +266,6 @@
<Compile Include="Internal\SkinBOX.cs" />
<Compile Include="Extensions\ImageExtensions.cs" />
<Compile Include="Internal\SkinANIM.cs" />
<Compile Include="Classes\Misc\RichPresenceClient.cs" />
<Compile Include="Forms\Features\CemuPanel.cs">
<SubType>UserControl</SubType>
</Compile>

2
PCK-Studio/Program.cs
View File

@@ -3,7 +3,7 @@ using System.Diagnostics;
using System.IO;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using PckStudio.Classes.Misc;
using PckStudio.Internal.Misc;
using PckStudio.Internal;
using PckStudio.Properties;
using PCKStudio_Updater;