V2.6.2

szefo09 · Nov 17, 2018 · 03ced6d · 03ced6d
1 parent 9f3780d
commit 03ced6d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/YgoProPatcher/Form1.cs b/YgoProPatcher/Form1.cs
@@ -342,7 +342,7 @@ private async Task<List<string>> DownloadCDBSFromGithub(string destinationFolder
 
             List<string> listOfCDBs = GitAccess.GetAllFilesWithExtensionFromYGOPRO("/", ".cdb");
             string cdbFolder = Path.Combine(destinationFolder, "cdb");
-            if(!await FileDownload("cards.cdb", cdbFolder, "https://github.com/szefo09/cdb/raw/master/", true))
+            if(!await FileDownload("cards.cdb", cdbFolder, "https://github.com/purerosefallen/ygopro-database/raw/master/locales/en-US/", true))
             {
                 await FileDownload("cards.cdb", cdbFolder, "https://github.com/shadowfox87/ygopro2/raw/master/cdb/", true);
             }
@@ -353,8 +353,10 @@ private async Task<List<string>> DownloadCDBSFromGithub(string destinationFolder
                 listOfDownloadedCDBS.Add(Path.Combine(cdbFolder, "prerelease-nfw.cdb"));
             }
             List<Task> downloadList = new List<Task>();
+            listOfCDBs.RemoveAll(item => item.Contains("fit"));//Remove unnecessary fit* cdb
             foreach (string cdb in listOfCDBs)
             {
+
                 FileDownload(cdb, cdbFolder, "https://github.com/Ygoproco/Live2017Links/raw/master/", true);
                 listOfDownloadedCDBS.Add(Path.Combine(cdbFolder, cdb));
                 progressBar.Invoke(new Action(() => progressBar.Increment(1)));
@@ -455,9 +457,12 @@ private async Task GitHubDownload(string destinationFolder)
             List<string> CDBS = new List<string>();
 
             CDBS = await DownloadCDBSFromGithub(destinationFolder);
+            await FileDownload("lflist.conf", Path.Combine(YgoPro2Path.Text, "config"), "https://raw.githubusercontent.com/Ygoproco/Live2017Links/master/", true);
+            await FileDownload("strings.conf", Path.Combine(YgoPro2Path.Text, "config"), Data.GetStringsWebsite(), true);
             progressBar.Invoke(new Action(() => { progressBar.Value = progressBar.Maximum; }));
+
             DownloadUsingCDB(CDBS, destinationFolder);
-            await FileDownload("lflist.conf", Path.Combine(YgoPro2Path.Text, "config"), "https://raw.githubusercontent.com/Ygoproco/Live2017Links/master/", true);
+
         }
 
         private void GitHubDownloadCheckbox_CheckedChanged(object sender, EventArgs e)

diff --git a/YgoProPatcher/Properties/AssemblyInfo.cs b/YgoProPatcher/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("2.6.37.0")]
+[assembly: AssemblyFileVersion("2.6.86.0")]