Merge pull request #427 from wbonbon/feature

version up
anoyetta · Nov 16, 2024 · 78d1378 · 78d1378
2 parents 0a28d30 + 2ab1be3
commit 78d1378
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt
@@ -1 +1 @@
-v10.3.9
+v10.4.0
diff --git a/source/ACT.Hojoring.Common/Version.cs b/source/ACT.Hojoring.Common/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.3.0.9")]
-[assembly: AssemblyFileVersion("10.3.0.9")]
+[assembly: AssemblyVersion("10.4.0.0")]
+[assembly: AssemblyFileVersion("10.4.0.0")]
diff --git a/source/FFXIV.Framework/FFXIV.Framework/Common/CSVParser.cs b/source/FFXIV.Framework/FFXIV.Framework/Common/CSVParser.cs
@@ -124,7 +124,7 @@ private static List<List<string>> Parse(string data, Delimiter delimiter)
                     {
                         insideQuoteCell = true;
                     }
-                    else
+                    else if (character != '\r')
                     {
                         cell.Append(character);
                     }

diff --git a/source/FFXIV.Framework/FFXIV.Framework/XIVHelper/Zone.cs b/source/FFXIV.Framework/FFXIV.Framework/XIVHelper/Zone.cs
@@ -50,7 +50,7 @@ public static int ToRank(
             var rank = 0;
 
             // レイド
-            if (intendedUse == (int)TerritoryIntendedUse.Raid8)
+            if (intendedUse == (int)TerritoryIntendedUse.Raid8 || intendedUse == (int)TerritoryIntendedUse.Raid8Easy)
             {
                 if (name.Contains("絶") ||
                     name.Contains("Ultimate") ||
@@ -128,6 +128,7 @@ public enum TerritoryIntendedUse
         ADungeon = 57,
         ADungeonS = 58,
         Raid24 = 8,
+        Raid8Easy = 16,
         Raid8 = 17,
         Trial = 10,
         PvP1 = 18,
-Original file line number
+Diff line change
@@ Expand Up @@
                         {
                             insideQuoteCell = true;
                         }
-                        else
+                        else if (character != '\r')
                         {
                             cell.Append(character);
                         }
@@ Expand Down @@