diff --git a/Elite/Elite.csproj b/Elite/Elite.csproj index 7224244..b86b0e3 100644 --- a/Elite/Elite.csproj +++ b/Elite/Elite.csproj @@ -53,7 +53,7 @@ - ..\packages\CsvHelper.27.1.1\lib\net47\CsvHelper.dll + ..\packages\CsvHelper.27.2.1\lib\net47\CsvHelper.dll ..\packages\Hardcodet.NotifyIcon.Wpf.1.1.0\lib\net472\Hardcodet.NotifyIcon.Wpf.dll @@ -67,11 +67,11 @@ ..\packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll - - ..\packages\log4net.2.0.13\lib\net45\log4net.dll + + ..\packages\log4net.2.0.14\lib\net45\log4net.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll @@ -79,8 +79,8 @@ ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll - - ..\packages\MQTTnet.3.1.0\lib\net461\MQTTnet.dll + + ..\packages\MQTTnet.3.1.1\lib\net461\MQTTnet.dll ..\packages\NAudio.2.0.1\lib\netstandard2.0\NAudio.dll @@ -136,12 +136,12 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll + + ..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll diff --git a/Elite/Properties/AssemblyInfo.cs b/Elite/Properties/AssemblyInfo.cs index 7e61ab4..0280a3e 100644 --- a/Elite/Properties/AssemblyInfo.cs +++ b/Elite/Properties/AssemblyInfo.cs @@ -31,7 +31,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.8.0")] -[assembly: AssemblyFileVersion("1.8.8.0")] +[assembly: AssemblyVersion("1.8.9.0")] +[assembly: AssemblyFileVersion("1.8.9.0")] [assembly: log4net.Config.XmlConfigurator(Watch = true)] \ No newline at end of file diff --git a/Elite/Templates/navigation.cshtml b/Elite/Templates/navigation.cshtml index 427806b..a328095 100644 --- a/Elite/Templates/navigation.cshtml +++ b/Elite/Templates/navigation.cshtml @@ -409,7 +409,17 @@ @m.subType @(m.isScoopable == true ? ", Fuel Star":"") - @Html.Raw(m.isLandable == true ? ",  Landable ":"") + @if (m.isLandable == true) + { + if (m.surfacePressure > 0) + { + @Html.Raw(",  Landable ") + } + else + { + @Html.Raw(",  Landable ") + } + } diff --git a/Elite/Templates/styles.css b/Elite/Templates/styles.css index 6576fc4..54f2ee8 100644 --- a/Elite/Templates/styles.css +++ b/Elite/Templates/styles.css @@ -24,6 +24,11 @@ td.divider { color: white; } +.alarm2 { + background-color: yellow; + color: black; +} + div.main { font-family: 'Arial Unicode MS'; font-size: 15px; diff --git a/Elite/app.config b/Elite/app.config index d47a2ac..33247c7 100644 --- a/Elite/app.config +++ b/Elite/app.config @@ -42,16 +42,20 @@ - + - + + + + + diff --git a/Elite/packages.config b/Elite/packages.config index 6d49e75..24cc7ef 100644 --- a/Elite/packages.config +++ b/Elite/packages.config @@ -1,17 +1,17 @@  - + - + - + - + @@ -27,8 +27,8 @@ - - + + \ No newline at end of file diff --git a/ImportData/ImportData.csproj b/ImportData/ImportData.csproj index 71ba3c9..77b7f58 100644 --- a/ImportData/ImportData.csproj +++ b/ImportData/ImportData.csproj @@ -41,11 +41,11 @@ 4 - - ..\packages\HtmlAgilityPack.1.11.38\lib\Net45\HtmlAgilityPack.dll + + ..\packages\HtmlAgilityPack.1.11.40\lib\Net45\HtmlAgilityPack.dll - - ..\packages\log4net.2.0.13\lib\net45\log4net.dll + + ..\packages\log4net.2.0.14\lib\net45\log4net.dll ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/ImportData/Properties/AssemblyInfo.cs b/ImportData/Properties/AssemblyInfo.cs index ab6e4cd..621f888 100644 --- a/ImportData/Properties/AssemblyInfo.cs +++ b/ImportData/Properties/AssemblyInfo.cs @@ -31,7 +31,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.8.0")] -[assembly: AssemblyFileVersion("1.8.8.0")] +[assembly: AssemblyVersion("1.8.9.0")] +[assembly: AssemblyFileVersion("1.8.9.0")] [assembly: log4net.Config.XmlConfigurator(Watch = true)] diff --git a/ImportData/packages.config b/ImportData/packages.config index c77d4c4..8d1dc08 100644 --- a/ImportData/packages.config +++ b/ImportData/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file