Fix issues caused by Adept→Proficiency change

Yuubari · Aug 8, 2016 · fa8a74c · fa8a74c
1 parent b5705e8
commit fa8a74c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
@@ -21,4 +21,4 @@
 	ResourceDictionaryLocation.None,
 	ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: AssemblyVersion("4.2.7.0")]
+[assembly: AssemblyVersion("4.2.7.1")]
diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
@@ -957,7 +957,7 @@
 																<MultiBinding Converter="{StaticResource NameWithLevelConverter}">
 																	<Binding Path="Item.Info.Name" Mode="OneWay" />
 																	<Binding Path="Item.Level" Mode="OneWay" />
-																	<Binding Path="Item.Adept" Mode="OneWay" />
+																	<Binding Path="Item.Proficiency" Mode="OneWay" />
 																</MultiBinding>
 															</Border.ToolTip>
 															<Viewbox>
@@ -986,7 +986,7 @@
 														<MultiBinding Converter="{StaticResource NameWithLevelConverter}">
 															<Binding Path="Ship.ExSlot.Item.Info.Name" Mode="OneWay" />
 															<Binding Path="Ship.ExSlot.Item.Level" Mode="OneWay" />
-															<Binding Path="Ship.ExSlot.Item.Adept" Mode="OneWay" />
+															<Binding Path="Ship.ExSlot.Item.Proficiency" Mode="OneWay" />
 														</MultiBinding>
 													</Border.ToolTip>
 													<Viewbox>

diff --git a/source/Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml b/source/Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml
@@ -272,7 +272,7 @@
 															<MultiBinding Converter="{StaticResource NameWithLevelConverter}">
 																<Binding Path="Item.Info.Name" Mode="OneWay" />
 																<Binding Path="Item.Level" Mode="OneWay" />
-																<Binding Path="Item.Adept" Mode="OneWay" />
+																<Binding Path="Item.Proficiency" Mode="OneWay" />
 															</MultiBinding>
 														</Border.ToolTip>
 													<kcvc:SlotItemIcon Type="{Binding Item.Info.IconType}"
@@ -303,7 +303,7 @@
 												<MultiBinding Converter="{StaticResource NameWithLevelConverter}">
 													<Binding Path="Ship.ExSlot.Item.Info.Name" Mode="OneWay" />
 													<Binding Path="Ship.ExSlot.Item.Level" Mode="OneWay" />
-													<Binding Path="Ship.ExSlot.Item.Adept" Mode="OneWay" />
+													<Binding Path="Ship.ExSlot.Item.Proficiency" Mode="OneWay" />
 												</MultiBinding>
 											</kcvc:SlotItemIcon.ToolTip>
 										</kcvc:SlotItemIcon>

diff --git a/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml b/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml
@@ -404,7 +404,7 @@
 													</Run>-->
 											</TextBlock>
 												<Viewbox Height="12pt">
-													<kcvc:AircraftProficiencyIcon Level="{Binding Path=Item.Adept, Mode=OneWay}" />
+													<kcvc:AircraftProficiencyIcon Level="{Binding Path=Item.Proficiency, Mode=OneWay}" />
 												</Viewbox>
 											</StackPanel>
 										</Grid>

diff --git a/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj b/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj
@@ -50,16 +50,16 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Livet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b0b1d3f711ef38cb, processorArchitecture=MSIL">
-      <HintPath>..\packages\LivetCask.1.1.0.0\lib\net45\Livet.dll</HintPath>
+    <Reference Include="Livet, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b0b1d3f711ef38cb, processorArchitecture=MSIL">
+      <HintPath>..\packages\LivetCask.1.3.1.0\lib\net45\Livet.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\LivetCask.1.1.0.0\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
+      <HintPath>..\packages\LivetCask.1.3.1.0\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Nekoxy, Version=1.5.2.20, Culture=neutral, processorArchitecture=MSIL">
@@ -93,7 +93,7 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\LivetCask.1.1.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\packages\LivetCask.1.3.1.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xaml" />

diff --git a/source/Grabacr07.KanColleWrapper/Models/Quest.cs b/source/Grabacr07.KanColleWrapper/Models/Quest.cs
@@ -41,7 +41,7 @@ public class Quest : RawDataWrapper<kcsapi_quest>, IIdentifiable
 		/// <summary>
 		/// 任務の詳細を取得します。
 		/// </summary>
-		public string Detail => KanColleClient.Current.Translations.Lookup(TranslationType.QuestDetail, this.RawData.Replace("<br>", Environment.NewLine)) ?? this.RawData.api_detail.Replace("<br>", Environment.NewLine);
+		public string Detail => KanColleClient.Current.Translations.Lookup(TranslationType.QuestDetail, this.RawData) ?? this.RawData.api_detail.Replace("<br>", Environment.NewLine);
 
 
 		public Quest(kcsapi_quest rawData) : base(rawData)

diff --git a/source/Grabacr07.KanColleWrapper/packages.config b/source/Grabacr07.KanColleWrapper/packages.config
@@ -5,7 +5,7 @@
   <package id="ElementalAnnotations-Dark" version="1.0.1" targetFramework="net45" />
   <package id="ElementalAnnotations-Dualism" version="1.0.1" targetFramework="net45" />
   <package id="ElementalAnnotations-Light" version="1.0.1" targetFramework="net45" />
-  <package id="LivetCask" version="1.1.0.0" targetFramework="net45" />
+  <package id="LivetCask" version="1.3.1.0" targetFramework="net46" />
   <package id="log4net" version="2.0.3" targetFramework="net45" />
   <package id="Nekoxy" version="1.5.2.20" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />

diff --git a/source/Plugins/AudibleNotifications/app.config b/source/Plugins/AudibleNotifications/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Livet" publicKeyToken="b0b1d3f711ef38cb" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0"/>
+        <assemblyIdentity name="Livet" publicKeyToken="b0b1d3f711ef38cb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>