diff --git a/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/linux_x64.pubxml.user b/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/linux_x64.pubxml.user index 447abfe..86e20bd 100644 --- a/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/linux_x64.pubxml.user +++ b/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/linux_x64.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2023-01-28T15:02:21.7075281Z; + True|2023-04-10T15:40:35.1800594Z;True|2023-01-28T16:02:21.7075281+01:00; \ No newline at end of file diff --git a/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/osx_x64.pubxml.user b/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/osx_x64.pubxml.user index 8634c6e..db303c2 100644 --- a/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/osx_x64.pubxml.user +++ b/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/osx_x64.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2023-01-28T15:02:13.7381611Z; + True|2023-04-10T15:37:41.8202016Z;True|2023-01-28T16:02:13.7381611+01:00; \ No newline at end of file diff --git a/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/windows_x64.pubxml b/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/windows_x64.pubxml index fcb9c0e..88d76bb 100644 --- a/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/windows_x64.pubxml +++ b/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/windows_x64.pubxml @@ -11,5 +11,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_TargetId>Folder net7.0 false + win-x64 \ No newline at end of file diff --git a/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/windows_x64.pubxml.user b/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/windows_x64.pubxml.user index 1e22445..db747f6 100644 --- a/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/windows_x64.pubxml.user +++ b/SwitchGiftDataManager.CommandLine/Properties/PublishProfiles/windows_x64.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2023-01-28T15:02:06.8383516Z; + True|2023-04-10T15:35:59.0886698Z;False|2023-04-10T17:35:45.4776987+02:00;True|2023-01-28T16:02:06.8383516+01:00; \ No newline at end of file diff --git a/SwitchGiftDataManager.CommandLine/SwitchGiftDataManager.CommandLine.csproj.user b/SwitchGiftDataManager.CommandLine/SwitchGiftDataManager.CommandLine.csproj.user index 61927cb..f1d004e 100644 --- a/SwitchGiftDataManager.CommandLine/SwitchGiftDataManager.CommandLine.csproj.user +++ b/SwitchGiftDataManager.CommandLine/SwitchGiftDataManager.CommandLine.csproj.user @@ -5,6 +5,6 @@ SwitchGiftDataManager.CommandLine - <_LastSelectedProfileId>D:\Projects\SwitchGiftDataManager\SwitchGiftDataManager.CommandLine\Properties\PublishProfiles\windows_x64.pubxml + <_LastSelectedProfileId>D:\Projects\SwitchGiftDataManager\SwitchGiftDataManager.CommandLine\Properties\PublishProfiles\linux_x64.pubxml \ No newline at end of file diff --git a/SwitchGiftDataManager.Core/Classes/BCATManager/BCATManager.cs b/SwitchGiftDataManager.Core/Classes/BCATManager/BCATManager.cs index 15d2980..454a29c 100644 --- a/SwitchGiftDataManager.Core/Classes/BCATManager/BCATManager.cs +++ b/SwitchGiftDataManager.Core/Classes/BCATManager/BCATManager.cs @@ -7,7 +7,7 @@ namespace SwitchGiftDataManager.Core { public class BCATManager { - public const string Version = "1.3.0"; + public const string Version = "1.3.1"; private const int FileNameOffset = 0x00; private const int UnkOffset = 0x20; diff --git a/SwitchGiftDataManager.Core/Classes/WCManager/GiftData/OtherGift.cs b/SwitchGiftDataManager.Core/Classes/WCManager/GiftData/OtherGift.cs index ed63dca..dfb57d8 100644 --- a/SwitchGiftDataManager.Core/Classes/WCManager/GiftData/OtherGift.cs +++ b/SwitchGiftDataManager.Core/Classes/WCManager/GiftData/OtherGift.cs @@ -92,9 +92,7 @@ namespace SwitchGiftDataManager.Core var category = (ClothingType9)id; var description = category switch { - ClothingType9.Uniform => Properties.Resources.SCVIClothingBags.Split(new String[] { "\n" }, StringSplitOptions.None)[opt], - ClothingType9.Bags => Properties.Resources.SCVIClothingBags.Split(new String[] { "\n" }, StringSplitOptions.None)[opt], - _ => "", + _ => Properties.Resources.SCVIClothingBags.Split(new String[] { "\n" }, StringSplitOptions.None)[opt], }; if (string.IsNullOrWhiteSpace(description)) description = $"{opt:X4}"; diff --git a/SwitchGiftDataManager.Core/Classes/WCManager/Wondercard.cs b/SwitchGiftDataManager.Core/Classes/WCManager/Wondercard.cs index 4df89d1..160b10c 100644 --- a/SwitchGiftDataManager.Core/Classes/WCManager/Wondercard.cs +++ b/SwitchGiftDataManager.Core/Classes/WCManager/Wondercard.cs @@ -35,12 +35,14 @@ namespace SwitchGiftDataManager.Core if (Content is null) return false; +#if DEBUG + if (!IsChecksumValid()) + UpdateChecksum(); +#endif + if (!IsChecksumValid()) return false; - //if (!IsChecksumValid()) - //UpdateChecksum(); - return true; } diff --git a/SwitchGiftDataManager.Core/Resources/SCVIClothingBags.txt b/SwitchGiftDataManager.Core/Resources/SCVIClothingBags.txt index dd17a46..b173e7a 100644 --- a/SwitchGiftDataManager.Core/Resources/SCVIClothingBags.txt +++ b/SwitchGiftDataManager.Core/Resources/SCVIClothingBags.txt @@ -3045,7 +3045,9 @@ None -Canvas Backpack +[Bags] Canvas Backpack (Poké Ball) +[Bags] Canvas Backpack (Mega Ball) +[Bags] Canvas Backpack (Ultra Ball) @@ -3073,4 +3075,4 @@ Canvas Backpack -Floral-print Sports Backpack \ No newline at end of file +[Bags] Floral-print Sports Backpack \ No newline at end of file diff --git a/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/Windowsx86.pubxml b/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/Windowsx86.pubxml new file mode 100644 index 0000000..4ac817b --- /dev/null +++ b/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/Windowsx86.pubxml @@ -0,0 +1,16 @@ + + + + + Release + Any CPU + bin\Release\net7.0-windows\publish\win-x86\ + FileSystem + <_TargetId>Folder + net7.0-windows + win-x86 + false + + \ No newline at end of file diff --git a/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/Windowsx86.pubxml.user b/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/Windowsx86.pubxml.user new file mode 100644 index 0000000..205abd2 --- /dev/null +++ b/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/Windowsx86.pubxml.user @@ -0,0 +1,10 @@ + + + + + True|2023-04-10T15:45:17.0563608Z;False|2023-04-10T17:45:05.3801595+02:00;True|2023-04-10T17:44:52.3050457+02:00;False|2023-04-10T17:43:42.2422643+02:00;False|2023-04-10T17:42:40.9947818+02:00; + + + \ No newline at end of file diff --git a/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/windows.pubxml b/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/windows.pubxml index f02811b..1d3005f 100644 --- a/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/windows.pubxml +++ b/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/windows.pubxml @@ -11,5 +11,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_TargetId>Folder net7.0-windows false + win-x64 \ No newline at end of file diff --git a/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/windows.pubxml.user b/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/windows.pubxml.user index 8b5bf89..d4f3a9f 100644 --- a/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/windows.pubxml.user +++ b/SwitchGiftDataManager.WinForm/Properties/PublishProfiles/windows.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2023-01-28T15:01:40.5830936Z; + True|2023-04-10T15:33:26.3077827Z;False|2023-04-10T17:32:43.9169969+02:00;True|2023-01-28T16:01:40.5830936+01:00; \ No newline at end of file diff --git a/SwitchGiftDataManager.WinForm/SwitchGiftDataManager.WinForm.csproj.user b/SwitchGiftDataManager.WinForm/SwitchGiftDataManager.WinForm.csproj.user index 6d13b16..e7cfbf6 100644 --- a/SwitchGiftDataManager.WinForm/SwitchGiftDataManager.WinForm.csproj.user +++ b/SwitchGiftDataManager.WinForm/SwitchGiftDataManager.WinForm.csproj.user @@ -1,7 +1,7 @@  - <_LastSelectedProfileId>D:\Projects\SwitchGiftDataManager\SwitchGiftDataManager.WinForm\Properties\PublishProfiles\windows.pubxml + <_LastSelectedProfileId>D:\Projects\SwitchGiftDataManager\SwitchGiftDataManager.WinForm\Properties\PublishProfiles\Windowsx86.pubxml