diff --git a/Artemis/Artemis.Installer/HeatGeneratedFileList.wxs b/Artemis/Artemis.Installer/HeatGeneratedFileList.wxs index 1269c787e..1148775d8 100644 --- a/Artemis/Artemis.Installer/HeatGeneratedFileList.wxs +++ b/Artemis/Artemis.Installer/HeatGeneratedFileList.wxs @@ -2,9 +2,6 @@ - - - @@ -213,7 +210,6 @@ - diff --git a/Artemis/Artemis.Installer/Product.wxs b/Artemis/Artemis.Installer/Product.wxs index 1bbee5ed5..c9936c458 100644 --- a/Artemis/Artemis.Installer/Product.wxs +++ b/Artemis/Artemis.Installer/Product.wxs @@ -2,7 +2,7 @@ - + diff --git a/Artemis/Artemis/DeviceProviders/Logitech/LogitechKeyboard.cs b/Artemis/Artemis/DeviceProviders/Logitech/LogitechKeyboard.cs index e9445dd36..55ddc0f1f 100644 --- a/Artemis/Artemis/DeviceProviders/Logitech/LogitechKeyboard.cs +++ b/Artemis/Artemis/DeviceProviders/Logitech/LogitechKeyboard.cs @@ -21,11 +21,18 @@ namespace Artemis.DeviceProviders.Logitech CantEnableText = "Couldn't connect to your Logitech keyboard.\n" + "Please check your cables and updating the Logitech Gaming Software\n" + - $"A minimum version of 8.81.15 is required (detected {majorNum}.{minorNum}.{buildNum}).\n\n" + + $"A minimum version of 9.0.42 is required (detected {majorNum}.{minorNum}.{buildNum}).\n\n" + "If the detected version differs from the version LGS is reporting, reinstall LGS or see the FAQ.\n\n" + "If needed, you can select a different keyboard in Artemis under settings."; - return majorNum >= 9; + // Anything below 9 is a no go + if (majorNum < 9) + return false; + // If on 9.0 require 9.0.42 or higher + if (majorNum == 9 && minorNum == 0) + return buildNum >= 42; + // If higher then 9.0 just wing it ¯\_(ツ)_/¯ + return true; } public override void Enable() diff --git a/Artemis/Artemis/Properties/AssemblyInfo.cs b/Artemis/Artemis/Properties/AssemblyInfo.cs index 9125ad076..8b3d67509 100644 --- a/Artemis/Artemis/Properties/AssemblyInfo.cs +++ b/Artemis/Artemis/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Windows; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("SpoinkyNL")] [assembly: AssemblyProduct("Artemis")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -53,6 +53,6 @@ using System.Windows; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.11.2.0")] -[assembly: AssemblyFileVersion("1.11.2.0")] +[assembly: AssemblyVersion("1.11.3.0")] +[assembly: AssemblyFileVersion("1.11.3.0")] [assembly: InternalsVisibleTo("Artemis.Explorables")]