Merge pull request #218 from Flow-Launcher/dev

Release 1.6.0 | Plugin 1.3.1
Flow-Launcher · Dec 31, 2020 · b3eb82a · b3eb82a
2 parents 8d6915a + 5f345e1
commit b3eb82a
Show file tree

Hide file tree

Showing 80 changed files with 1,358 additions and 1,308 deletions.
diff --git a/.gitignore b/.gitignore
@@ -300,4 +300,8 @@ migrateToAutomaticPackageRestore.ps1
 *.pyc
 *.diagsession
 Output-Performance.txt
-*.diff
+*.diff
+
+# vscode
+.vscode
+.history
diff --git a/Flow.Launcher.Core/Flow.Launcher.Core.csproj b/Flow.Launcher.Core/Flow.Launcher.Core.csproj
@@ -55,7 +55,6 @@
   <ItemGroup>
     <PackageReference Include="FSharp.Core" Version="4.7.1" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" />
-    <PackageReference Include="SharpZipLib" Version="1.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Flow.Launcher.Core/Plugin/PluginInstaller.cs b/Flow.Launcher.Core/Plugin/PluginInstaller.cs
diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -133,11 +133,6 @@ public static void InitializePlugins(IPublicAPI api)
             }
         }
 
-        public static void InstallPlugin(string path)
-        {
-            PluginInstaller.Install(path);
-        }
-
         public static List<PluginPair> ValidPluginsForQuery(Query query)
         {
             if (NonGlobalPlugins.ContainsKey(query.ActionKeyword))

diff --git a/Flow.Launcher.Core/Resource/Internationalization.cs b/Flow.Launcher.Core/Resource/Internationalization.cs
@@ -88,14 +88,14 @@ public void ChangeLanguage(Language language)
         {
             language = language.NonNull();
 
-            Settings.Language = language.LanguageCode;
 
             RemoveOldLanguageFiles();
             if (language != AvailableLanguages.English)
             {
                 LoadLanguage(language);
             }
             UpdatePluginMetadataTranslations();
+            Settings.Language = language.LanguageCode;
 
         }