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

…o master-horizontal

Changelog.txt

@@ -2,6 +2,40 @@
 	KCV Change Log
 ========================
 
+v2.3.0 r350 - 3/17/2014 M-M-Monster Update
+The following is all new things only available to this fork of KCV (for now).
+	* *NEW* Equipment Info - Mousing over equipment and in the equipment page
+		will now show extended equipment info such as firepower and more.
+	* *NEW* Tools Menu - Contains a reworked rankings and calculator page.
+	* *NEW* Calculator - Found under the Tools menu. Select a ship or type in
+		a base level, set the target level, set the map and any other params
+		and it will calculate the total number of times you must run a map to
+		get there.
+	* *NEW* Option to notify you when a ship hits critical condition. Found in
+		the Behaviour tab in settings.
+	* *NEW* Option to change the window accent color when a ship hits critical
+		condition. The color will only revert back when the ship is healed, removed,
+		or sunk.
+	* *NEW* Updater - Check for updates online for both the app and the translations.
+		Download new translations at a click of a button.
+	* *NEW* Check for updates to the program on startup.
+	* *NEW* Automatically download the latest translations on startup.
+	* *NEW* Horizontal - Horizontal tab menu and reworked Overview page. Now it is even 
+		tighter!
+	* Ship List - It will now correctly sort by ship name rather than Card Number.
+	* Fixed bug with non-updating fleet total level text.
+	* Updated to newest ships, items, and quests (3/13 update)
+Notes:
+	* All your options will reset with this update. Please re-do anything that needs doing.
+	* Updater will only obtain translations for your currently selected UI language.
+	* As of right now, there is no way to quickly revert the window color when a ship is
+		in critical condition other than to go to options and turn it off and on.
+	* Calculator is built to correct your mistake of choosing a target level lower than 
+		your current level.
+	* Calculator can take your ship's current exp count to do calculations by default
+	* Updater will not write over your current translations until it can determine if the 
+		file is error free.
+
 v2.3.0 r328 - 3/9/2014 **Minor Update**
 	* In fleet view we now have both total fleet level and and the average.
 	* Vertical - Tightened middle column to by 20px.

Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs

@@ -8,10 +8,10 @@
 // アセンブリに関連付けられている情報を変更するには、
 // これらの属性値を変更してください。
 [assembly: AssemblyTitle("KanColleViewer!")]
-[assembly: AssemblyDescription("KanColleViewer! r328")]
+[assembly: AssemblyDescription("KanColleViewer! r350")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("grabacr.net")]
-[assembly: AssemblyProduct("KanColleViewer! r328")]
+[assembly: AssemblyProduct("KanColleViewer! r350")]
 [assembly: AssemblyCopyright("Copyright © 2013 Grabacr07")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -51,4 +51,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.0.328")]
+[assembly: AssemblyVersion("2.3.0.350")]

README.md

@@ -42,11 +42,14 @@ You need to have [.NET Framework 4.5](http://www.microsoft.com/en-us/download/de
 Easiest way is to just delete the text file corrisponding to the things you don't wish to be translated. You are also encouraged to use the [original version of KCV](http://grabacr.net/kancolleviewer) as it has an english UI now.
 
 #### What is the difference between this and the original?
-* Horizontal version is unique (for now) to this project. 
+* Horizontal version is unique to this project. 
 * The translation of all equipment, ships, and quests
+* Detailed equipment information (for now)
 * Logging features (for now)
-* Regional cookie setting.
 * Ranking information (for now)
+* Calculator (for now)
+* Auto updating and version checking.
+* Regional cookie setting.
 
 Other than the above, this version is the same with just some minor tweaks to make it fit for an English translation. The plan is to hopefully add some features into the main project for all to enjoy.
 

resources/Version.xml

@@ -2,8 +2,8 @@
 <Versions>
 	<Item>
 		<Name>App</Name>
-		<Version>2.3.0.320</Version>
-		<URL>https://github.com/Zharay/KanColleViewer/releases/tag/v2.3.0r328</URL>
+		<Version>2.3.0.350</Version>
+		<URL>https://github.com/Zharay/KanColleViewer/releases/tag/v2.3.0r350</URL>
 	</Item>
 	<Item>
 		<Name>Equipment</Name>

resources/translations/Quests.xml

@@ -773,22 +773,36 @@
   <Quest>
     <ID>409</ID>
     <JP-Name>潜水艦派遣による海外艦との接触作戦</JP-Name>
-    <TR-Name>潜水艦派遣による海外艦との接触作戦</TR-Name>
+    <TR-Name>Strategy Meeting with Overseas Submarine Dispatch!</TR-Name>
     <JP-Detail>有力な潜水艦隊派遣による海外艦との接触作戦を成功させよ！</JP-Detail>
-    <TR-Detail>有力な潜水艦隊派遣による海外艦との接触作戦を成功させよ！</TR-Detail>
+    <TR-Detail>Complete expedition 31 and receive foreign destroyer Z1!</TR-Detail>
   </Quest>
   <Quest>
     <ID>410</ID>
     <JP-Name>南方への輸送作戦を成功させよ！</JP-Name>
-    <TR-Name>南方への輸送作戦を成功させよ！</TR-Name>
+    <TR-Name>Weekly Expedition 2</TR-Name>
     <JP-Detail>激戦海域である南方海域への「東京急行」系遠征を敢行、これを成功させよ！</JP-Detail>
-    <TR-Detail>激戦海域である南方海域への「東京急行」系遠征を敢行、これを成功させよ！ [Complete 37]</TR-Detail>
+    <TR-Detail>Complete expedition 37 or 38</TR-Detail>
   </Quest>
   <Quest>
     <ID>411</ID>
     <JP-Name>南方への鼠輸送を継続実施せよ！</JP-Name>
-    <TR-Name>南方への鼠輸送を継続実施せよ！</TR-Name>
+    <TR-Name>Weekly Expedition 3</TR-Name>
     <JP-Detail>今週中に「東京急行」系遠征を継続的に実施、同種作戦を7回成功せさよう！</JP-Detail>
-    <TR-Detail>今週中に「東京急行」系遠征を継続的に実施、同種作戦を7回成功せさよう！</TR-Detail>
+    <TR-Detail>Complete expedition 37 or 38 a total of 7 times in a week</TR-Detail>
+  </Quest>
+  <Quest>
+    <ID>D12</ID>
+    <JP-Name>(続)航空火力艦の運用を強化せよ！</JP-Name>
+    <TR-Name>Strengthen the Operation of the BBV (Cont.)</TR-Name>
+    <JP-Detail>「航空戦艦運用演習」を継続実施し、航空火力艦の運用の強化に引き続き努めよ！</JP-Detail>
+    <TR-Detail>Complete expedition 23 four more times.</TR-Detail>
+  </Quest>
+  <Quest>
+    <ID>B22</ID>
+    <JP-Name>「第三十駆逐隊（第一次）」出撃せよ！</JP-Name>
+    <TR-Name>Deploy the 13th Destroyer Fleet</TR-Name>
+    <JP-Detail>「第三十駆逐隊(第一次)」を含む艦隊で出撃しキス島沖の主力艦隊と交戦せよ！</JP-Detail>
+    <TR-Detail>Deploy a fleet that consists of Mutsuki (睦月), Kisaragi (如月), Yayoi (弥生), Mochizuki (望月) and up to 2 additional DDs to world 3-2 and encounter the boss.</TR-Detail>
   </Quest>
 </Quests>