From 0dc6a7caa6fd73c1af6ffd1af8ac6cc7e4e7f712 Mon Sep 17 00:00:00 2001
From: zingballyhoo <zingballyhoo@live.co.uk>
Date: Mon, 15 Jul 2024 01:21:58 +0100
Subject: [PATCH] Update for 2.11.1.0.127168

---
 DataTool/DataTool.csproj      | 2 +-
 DataTool/Static/GUIDNames.csv | 5 +++++
 TACTLib                       | 2 +-
 TankLib/Overwatch.keyring     | 5 ++++-
 TankView/TankView.csproj      | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/DataTool/DataTool.csproj b/DataTool/DataTool.csproj
index 9e2b265f..f18df07f 100644
--- a/DataTool/DataTool.csproj
+++ b/DataTool/DataTool.csproj
@@ -4,7 +4,7 @@
         <OutputType>Exe</OutputType>
         <LangVersion>preview</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.11.0.0</Version>
+        <Version>2.11.1.0</Version>
         <Configurations>Debug;Release;ReleasePublish;DebugPublish</Configurations>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'DebugPublish' ">
diff --git a/DataTool/Static/GUIDNames.csv b/DataTool/Static/GUIDNames.csv
index 45a1f903..c28db3c4 100644
--- a/DataTool/Static/GUIDNames.csv
+++ b/DataTool/Static/GUIDNames.csv
@@ -619,6 +619,7 @@ C0CC,01C,Season7,1
 CD75,01C,Season8,1
 CEC0,01C,Season9,1
 D740,01C,Season10,1
+D745,01C,Season11,1
 ; Lobby map names,,,
 664,09F,Menu/Hanamura,1
 675,09F,Menu/Gibraltar,1
@@ -645,6 +646,7 @@ D6C,09F,Menu/Toronto,1
 862,09F,Menu/OWL,1
 864,09F,Menu/OWL,1
 8B4,09F,Menu/Rialto (Archives),1
+8BA,09F,Menu/Pink Mercy,1
 8BE,09F,Menu/Rialto,1
 A13,09F,Menu/OWL,1
 A5A,09F,Menu/Chateau (Halloween),1
@@ -696,6 +698,9 @@ F4A,09F,Menu/Ilios (Junker Queen),1
 121A,09F,Menu/Venture,1
 121E,09F,Menu/Mirrorwatch A,1
 123F,09F,Menu/Ultrawatch Art A,1
+1243,09F,Menu/Transformers Art,1
+1249,09F,Menu/Lifeguard Art,1
+124A,09F,Menu/Bound Demon,1
 ; Celebrations,,,
 2168,01C,Christmas,1
 2498,01C,LunarNewYear,1
diff --git a/TACTLib b/TACTLib
index ba004ea4..ca77c46b 160000
--- a/TACTLib
+++ b/TACTLib
@@ -1 +1 @@
-Subproject commit ba004ea42d3f73e6121e1c7687dc6d03d08f0dae
+Subproject commit ca77c46bb01d2337d308e708ee6077c3ba9b407f
diff --git a/TankLib/Overwatch.keyring b/TankLib/Overwatch.keyring
index aaf206e0..7946a158 100644
--- a/TankLib/Overwatch.keyring
+++ b/TankLib/Overwatch.keyring
@@ -229,4 +229,7 @@ B9F0C3C2F4D66840 B62F0492283B535726351BB4902DF7C2 1 # [2.08.0] Season 8
 82FF0D3EB63274CB E8E195473F44326FDD6D50A376C91C9C 1 # [2.10.0] Season 10
 102D87DE57728894 07951EB0F6336BB941E4AF29C9FEF8C6 1 # [2.10.1] Season 10 Midseason
 B483361BF0B5201B 89223267886B9E20A469FD61879D6837 1 # [2.10.1] Season 10 Porsche Collab
-795B3DD7E5596777 03910E709F76D04914A693149378D791 1 # [2.11.0] Season 11
\ No newline at end of file
+795B3DD7E5596777 03910E709F76D04914A693149378D791 1 # [2.11.0] Season 11
+5D1A9C14073E8454 BCB347B3BA0904EFB3A484F45D7EA292 1 # [2.11.1] Season 11 Midseason
+FB019B3EC0836F37 77D29257630ADA7030CB0E7453A4F1FF 1 # [2.11.1] Transformers Collab
+48BE810C52ACDFF8 E9872ADA0F3CE66ECEA60CD37D077E44 1 # [2.11.1] Bound Demon Mythic Weapon Skin
\ No newline at end of file
diff --git a/TankView/TankView.csproj b/TankView/TankView.csproj
index d84b5f40..547c5f83 100644
--- a/TankView/TankView.csproj
+++ b/TankView/TankView.csproj
@@ -6,7 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <NoWarn>CA1416</NoWarn>
-    <Version>2.11.0.0</Version>
+    <Version>2.11.1.0</Version>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' OR '$(Configuration)' == 'ReleasePublish' ">