diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogFilter.cs b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogFilter.cs index 0b1d59e1f..abcc894de 100644 --- a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogFilter.cs +++ b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogFilter.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using Grabacr07.KanColleViewer.Models; +using Grabacr07.KanColleViewer.Properties; using Grabacr07.KanColleWrapper; using Grabacr07.KanColleWrapper.Models; using Livet; @@ -594,7 +595,7 @@ public SallyAreaFilterChild(SallyArea area, ShipSallyAreaFilter owner) { this.model = area ?? SallyArea.Default; this.owner = owner; - this.Name = area?.Name ?? "出撃海域なし"; + this.Name = area?.Name ?? Resources.ShipCatalog_Operation_Neither; } public bool Predicate(Ship ship) diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml index f6ebd2abe..e0afabb06 100644 --- a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml +++ b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml @@ -407,7 +407,6 @@ - diff --git a/source/Plugins/Counter/Counter.csproj b/source/Plugins/Counter/Counter.csproj index 0772b258f..6aeb5b479 100644 --- a/source/Plugins/Counter/Counter.csproj +++ b/source/Plugins/Counter/Counter.csproj @@ -55,8 +55,8 @@ ..\..\packages\LivetCask.1.3.1.0\lib\net45\Microsoft.Expression.Interactions.dll True - - ..\..\packages\Nekoxy.1.3.1.16\lib\net45\Nekoxy.dll + + ..\..\packages\Nekoxy.1.5.1.19\lib\net45\Nekoxy.dll True @@ -95,7 +95,7 @@ 4.0 - ..\..\packages\Nekoxy.1.3.1.16\lib\net45\TrotiNet.dll + ..\..\packages\Nekoxy.1.5.1.19\lib\net45\TrotiNet.dll True diff --git a/source/Plugins/Counter/packages.config b/source/Plugins/Counter/packages.config index 5eed030cb..95836d016 100644 --- a/source/Plugins/Counter/packages.config +++ b/source/Plugins/Counter/packages.config @@ -2,7 +2,7 @@ - + diff --git a/source/Plugins/Logger/Logger.csproj b/source/Plugins/Logger/Logger.csproj index 2ca438473..79cc154ca 100644 --- a/source/Plugins/Logger/Logger.csproj +++ b/source/Plugins/Logger/Logger.csproj @@ -42,8 +42,8 @@ ..\..\packages\LivetExtensions.1.1.0.0\lib\net45\Livet.Extensions.dll True - - ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + ..\..\packages\log4net.2.0.4\lib\net45-full\log4net.dll True diff --git a/source/Plugins/Logger/app.config b/source/Plugins/Logger/app.config index 2c275e61a..c5a56129b 100644 --- a/source/Plugins/Logger/app.config +++ b/source/Plugins/Logger/app.config @@ -18,6 +18,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/Logger/packages.config b/source/Plugins/Logger/packages.config index 405e48670..5fea09da1 100644 --- a/source/Plugins/Logger/packages.config +++ b/source/Plugins/Logger/packages.config @@ -2,7 +2,7 @@ - +