Update for 2.18.0.0.141395

Author: ZingBallyhoo

DataTool/DataTool.csproj

@@ -4,7 +4,7 @@
         <OutputType>Exe</OutputType>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.17.1.0</Version>
+        <Version>2.18.0.0</Version>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
         <ApplicationIcon>Static\DataToolDebug.ico</ApplicationIcon>

DataTool/Static/GUIDNames.csv

@@ -620,6 +620,15 @@ FFB,078,Voicelines,1 ; 1.62
 1904,078,Voicelines,1 ; s16 - street fighter
 1905,078,Voicelines,1 ; s16 - street fighter
 1921,078,Voicelines,1 ; s17
+1923,078,Voicelines,1 ; s17 - gi joe
+1924,078,Voicelines,1 ; s17 - gi joe
+1925,078,Voicelines,1 ; s17 - gi joe
+1926,078,Voicelines,1 ; s17 - gi joe
+1927,078,Voicelines,1 ; s17 - gi joe
+1929,078,Voicelines,1 ; s17 - gi joe
+192A,078,Voicelines,1 ; s17 - gi joe
+192B,078,Voicelines,1 ; s17 - gi joe
+194F,078,Voicelines,1 ; s18
 ; Note: Weapon models are often two entities, one for 1P, one for 3P, if they have different animations
 ; Ana,Classic,47,
 1610,003,Teabag,0
@@ -691,6 +700,7 @@ E810,01C,Season14,1
 EC03,01C,Season15,1
 EC0F,01C,Season16,1
 EC11,01C,Season17,1
+EC12,01C,Season18,1
 ; Lobby map names,,,
 664,09F,Menu/Hanamura,1
 675,09F,Menu/Gibraltar,1
@@ -790,11 +800,15 @@ F4A,09F,Menu/Ilios (Junker Queen),1
 132F,09F,Menu/Juno OWCS,1
 1331,09F,Menu/LE SSERAFIM Collab Art 2,1
 1346,09F,Menu/Stadium Art 2,1
-1347,09F,Menu/Freja Art 2,1
+1347,09F,Menu/Freja Art,1
 1348,09F,Menu/Gundam Collab Art 2,1
 134A,09F,Menu/Mercy Merciful Magitech Mythic Weapon,1
 1378,09F,Menu/S17 Mythics Art,1
 1379,09F,Menu/GI Joe Collab Art,1
+1389,09F,Menu/Nerf Collab Art,1
+139D,09F,Menu/Wuyang Art,1
+139F,09F,Menu/S17 Mythics 3D,1
+13A2,09F,Menu/S17 Mythics Art,1
 ; Celebrations,,,
 2168,01C,Winter,1
 2498,01C,LunarNewYear,1

DataTool/Static/LocalizedNamesMapping.csv

@@ -24,6 +24,7 @@ A,75,widow
 231,75,kirikou
 291,75,liveweaver
 32A,75,freya
+3C3,75,aqua
 ; Normal Hero Localization Mapping,,
 ;deDE,,
 2,75,reaper
@@ -69,6 +70,7 @@ DD,75,mei
 32B,75,venture
 362,75,hazard
 365,75,juno
+3C3,75,wuyang
 ;enUS,,
 2,75,reaper
 3,75,tracer
@@ -113,6 +115,7 @@ DD,75,mei
 32B,75,venture
 362,75,hazard
 365,75,juno
+3C3,75,wuyang
 ;esES,,
 2,75,reaper
 3,75,tracer
@@ -157,6 +160,7 @@ DD,75,mei
 32B,75,venture
 362,75,hazard
 365,75,juno
+3C3,75,wuyang
 ;esMX,,
 2,75,reaper
 3,75,tracer
@@ -201,6 +205,7 @@ DD,75,mei
 32B,75,venture
 362,75,hazard
 365,75,juno
+3C3,75,wuyang
 ;frFR,,
 2,75,faucheur
 3,75,tracer
@@ -245,6 +250,7 @@ DD,75,mei
 32B,75,venture
 362,75,danger
 365,75,juno
+3C3,75,wuyang
 ;itIT,,
 2,75,reaper
 3,75,tracer
@@ -289,6 +295,7 @@ DD,75,mei
 32B,75,venture
 362,75,hazard
 365,75,juno
+3C3,75,wuyang
 ;jaJP,,
 2,75,リーパー
 3,75,トレーサー
@@ -333,6 +340,7 @@ DD,75,メイ
 32B,75,ベンチャー
 362,75,ハザード
 365,75,ジュノ
+3C3,75,ウーヤン
 ;koKR,,
 2,75,리퍼
 3,75,트레이서
@@ -377,6 +385,7 @@ DD,75,메이
 32B,75,벤처
 362,75,해저드
 365,75,주노
+3C3,75,우양
 ;plPL,,
 2,75,żniwiarz
 3,75,smuga
@@ -421,6 +430,7 @@ DD,75,mei
 32B,75,venture
 362,75,ryzyk
 365,75,juno
+3C3,75,wuyang
 ;ptBR,,
 2,75,reaper
 3,75,tracer
@@ -465,6 +475,7 @@ DD,75,mei
 32B,75,venture
 362,75,hazard
 365,75,juno
+3C3,75,wuyang
 ;ruRU,,
 2,75,жнец
 3,75,трейсер
@@ -509,6 +520,7 @@ DD,75,мэй
 32B,75,авентюра
 362,75,азарт
 365,75,юнона
+3C3,75,У Ян
 ;thTH,,
 2,75,รีปเปอร์
 3,75,เทรเซอร์
@@ -553,6 +565,7 @@ DD,75,เหมย
 32B,75,เวนเจอร์
 362,75,ฮาซาร์ด
 365,75,จูโน
+3C3,75,อู๋ย่าง
 ;trTR,,
 2,75,reaper
 3,75,tracer
@@ -618,6 +631,7 @@ DD,75,美
 32B,75,探奇
 362,75,骇灾
 365,75,朱诺
+3C3,75,无漾
 ;zhTW,,
 2,75,死神
 3,75,閃光
@@ -662,3 +676,4 @@ DD,75,小美
 32B,75,無畏
 362,75,災害
 365,75,朱諾
+3C3,75,無漾

TACTLib

@@ -259,3 +259,6 @@ D2723DE1A05423BE 0700629BDF3857382CE6791DDDBF465C 1 # [2.17.0] Season 17 G.I. Jo
 41DE799407E3A0D0 9C4F64AFD61FE9CAA36C860F21D1557A 1 # [2.17.0] Season 17 Nerf Collab Teaser
 B30D4C82EDE1D162 B35CDBE0499805FE77A540640CF9E57F 1 # [2.17.1] Season 17 Midseason
 D1A01808FA45CFEE 0162A3FEB6EA79F59D17B6A409750964 1 # [2.17.1] Season 17 Nerf Collab
+ABFDDBE30F3E9AA2 7EC4AB85C24FBABD59AC4A5FE4568E97 1 # [2.17.1] Wuyang
+BDCF410AEF29049D 0A8D2E283BFE3606242E9E455119ADD0 1 # [2.18.0] Season 18
+18BDE2B44104CF4B BAC153BF39D068005051F157313323DE 1 # [2.18.0] Season 18 - Luka Doncic Collab

TankLib/Overwatch.keyring

@@ -6,7 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <NoWarn>CA1416</NoWarn>
-    <Version>2.17.1.0</Version>
+    <Version>2.18.0.0</Version>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>