mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git
synced 2026-06-24 23:37:48 +00:00
Merge branch 'main' into 3dSkinRenderer
This commit is contained in:
@@ -21,9 +21,9 @@ namespace PckStudio.Internal
|
||||
|
||||
public int Compare(object x, object y)
|
||||
{
|
||||
TreeNode tx = x as TreeNode;
|
||||
TreeNode ty = y as TreeNode;
|
||||
return Compare(tx, ty);
|
||||
if (x is TreeNode tx && y is TreeNode ty)
|
||||
return Compare(tx, ty);
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int Compare(TreeNode x, TreeNode y)
|
||||
|
||||
@@ -136,7 +136,7 @@ namespace PckStudio
|
||||
catch (OverflowException ex)
|
||||
{
|
||||
MessageBox.Show(this, "Failed to open pck\n" +
|
||||
"Try checking the 'Open/Save as Switch/Vita/PS4 pck' checkbox in the upper right corner.",
|
||||
"Try checking the 'Open/Save as Switch/Vita/PS4/Xbox One pck' checkbox in the upper right corner.",
|
||||
"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
Debug.WriteLine(ex.Message);
|
||||
}
|
||||
@@ -292,7 +292,7 @@ namespace PckStudio
|
||||
catch (OverflowException ex)
|
||||
{
|
||||
MessageBox.Show(this, "Failed to open pck\n" +
|
||||
$"Try {(LittleEndianCheckBox.Checked ? "unchecking" : "checking")} the 'Open/Save as Switch/Vita/PS4 pck' check box in the upper right corner.",
|
||||
$"Try {(LittleEndianCheckBox.Checked ? "unchecking" : "checking")} the 'Open/Save as Switch/Vita/PS4/Xbox One pck' check box in the upper right corner.",
|
||||
"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
Debug.WriteLine(ex.Message);
|
||||
}
|
||||
|
||||
@@ -5000,7 +5000,7 @@
|
||||
<value>21</value>
|
||||
</data>
|
||||
<data name="LittleEndianCheckBox.Text" xml:space="preserve">
|
||||
<value>Open/Save as Switch/Vita/PS4 PCK</value>
|
||||
<value>Open/Save as Switch/Vita/PS4/Xbox One PCK</value>
|
||||
</data>
|
||||
<data name=">>LittleEndianCheckBox.Name" xml:space="preserve">
|
||||
<value>LittleEndianCheckBox</value>
|
||||
|
||||
Reference in New Issue
Block a user