From 63792a1d84541e49676d71b95180703a01db2e48 Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Sun, 14 Jul 2024 16:55:13 -0400 Subject: [PATCH 1/2] Disclaimer/ver bump/lib --- FFXIV_TexTools/FFXIV_TexTools.csproj | 6 +++--- .../Views/Controls/DawnTrailUpgradeDisclaimer.xaml | 2 +- FFXIV_TexTools/Views/ModListView.xaml.cs | 9 ++++++++- lib/xivModdingFramework | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj index 83e8938b..d1d580f8 100644 --- a/FFXIV_TexTools/FFXIV_TexTools.csproj +++ b/FFXIV_TexTools/FFXIV_TexTools.csproj @@ -23,9 +23,9 @@ FFXIV_TexTools Copyright © 2024 - 3.0.6.0 - 3.0.6.0 - 3.0.5.6 + 3.0.6.1 + 3.0.6.1 + 3.0.6.1 9.0 true diff --git a/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml b/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml index 7ec88003..b080e08f 100644 --- a/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml +++ b/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml @@ -115,7 +115,7 @@ - + diff --git a/FFXIV_TexTools/Views/ModListView.xaml.cs b/FFXIV_TexTools/Views/ModListView.xaml.cs index 2ebd7fe5..2a939492 100644 --- a/FFXIV_TexTools/Views/ModListView.xaml.cs +++ b/FFXIV_TexTools/Views/ModListView.xaml.cs @@ -342,7 +342,14 @@ private void CopyPath_Click(object sender, RoutedEventArgs e) if (ml == null) return; - System.Windows.Clipboard.SetText(ml.FilePath); + try + { + System.Windows.Clipboard.SetText(ml.FilePath); + } + catch + { + // No-Op + } } diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework index bbd213b1..88aa944d 160000 --- a/lib/xivModdingFramework +++ b/lib/xivModdingFramework @@ -1 +1 @@ -Subproject commit bbd213b1228c1cc20224c7d1e5c637b64f629153 +Subproject commit 88aa944ddc801d81a936503873db3a247d60d122 From 6338ab6201d4bdff1d6c5f74d3a9231fd55d92ee Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Sun, 14 Jul 2024 16:55:59 -0400 Subject: [PATCH 2/2] Update Framework Reference to Update v3.0.6.1 --- lib/xivModdingFramework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework index 88aa944d..3df03dbc 160000 --- a/lib/xivModdingFramework +++ b/lib/xivModdingFramework @@ -1 +1 @@ -Subproject commit 88aa944ddc801d81a936503873db3a247d60d122 +Subproject commit 3df03dbc0a05ebc34f721055f52227cfa4d01c4f