Merge branch 'master' of https://github.com/Zharay/KanColleViewer

yuyuvn · Mar 30, 2014 · b4c3911 · b4c3911
2 parents 206586d + 347ea0e
commit b4c3911
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -2,6 +2,9 @@
 	KCV Change Log
 ========================
 
+v2.4.0 r390 - 3/29/2014 "Why do I not test these things more?"
+	* Speed up the new stat generation by 3x. 
+
 v2.4.0 r381 - 3/29/2014
 	* Minor change of "44 Base:26" to "44 (26)" in the ship catalogue.
 

diff --git a/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
@@ -51,4 +51,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.381")]
+[assembly: AssemblyVersion("2.4.0.390")]
diff --git a/resources/Version.xml b/resources/Version.xml
@@ -2,8 +2,8 @@
 <Versions>
 	<Item>
 		<Name>App</Name>
-		<Version>2.4.0.381</Version>
-		<URL>https://github.com/yuyuvn/KanColleViewer/releases/tag/v2.4.0r381</URL>
+		<Version>2.4.0.390</Version>
+		<URL>https://github.com/yuyuvn/KanColleViewer/releases/tag/v2.4.0r390</URL>
 	</Item>
 	<Item>
 		<Name>Equipment</Name>
@@ -27,7 +27,7 @@
 	</Item>
 	<Item>
 		<Name>ShipTypes</Name>
-		<Version>1.0.1</Version>
+		<Version>1.0.2</Version>
 		<URL>https://raw.github.com/Zharay/KanColleViewer/master/resources/translations/ShipTypes.xml</URL>
 	</Item>
 </Versions>
diff --git a/resources/Version.xml.orig b/resources/Version.xml.orig
@@ -3,12 +3,12 @@
 	<Item>
 		<Name>App</Name>
 <<<<<<< HEAD
-		<Version>2.4.0.370</Version>
-		<URL>https://github.com/yuyuvn/KanColleViewer/releases/tag/v2.4.0r370</URL>
-=======
 		<Version>2.4.0.381</Version>
-		<URL>https://github.com/Zharay/KanColleViewer/releases/tag/v2.4.0r381</URL>
->>>>>>> 1b1ae132f60581e0d5c80b5ef181730c84e84767
+		<URL>https://github.com/yuyuvn/KanColleViewer/releases/tag/v2.4.0r381</URL>
+=======
+		<Version>2.4.0.390</Version>
+		<URL>https://github.com/Zharay/KanColleViewer/releases/tag/v2.4.0r390</URL>
+>>>>>>> 347ea0e07fdb93cc8c62b5d4a0e72803f3414185
 	</Item>
 	<Item>
 		<Name>Equipment</Name>
@@ -32,7 +32,7 @@
 	</Item>
 	<Item>
 		<Name>ShipTypes</Name>
-		<Version>1.0.1</Version>
+		<Version>1.0.2</Version>
 		<URL>https://raw.github.com/Zharay/KanColleViewer/master/resources/translations/ShipTypes.xml</URL>
 	</Item>
 </Versions>
diff --git a/resources/translations/ShipTypes.xml b/resources/translations/ShipTypes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ShipTypes Version="1.0.1">
+<ShipTypes Version="1.0.2">
   <Type>
     <ID>1</ID>
     <JP-Name>海防艦</JP-Name>
@@ -43,7 +43,7 @@
   <Type>
     <ID>8</ID>
     <JP-Name>戦艦</JP-Name>
-    <TR-Name>CC</TR-Name>
+    <TR-Name>Fast BB</TR-Name>
   </Type>
   <Type>
     <ID>10</ID>