From 2ab1be3626758c65800c6b075311cd70c70a27c1 Mon Sep 17 00:00:00 2001 From: bonbon Date: Sat, 16 Nov 2024 20:03:17 +0900 Subject: [PATCH] version up --- source/@MasterVersion.txt | 2 +- source/ACT.Hojoring.Common/Version.cs | 4 ++-- source/FFXIV.Framework/FFXIV.Framework/Common/CSVParser.cs | 2 +- source/FFXIV.Framework/FFXIV.Framework/XIVHelper/Zone.cs | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt index 457562cfb..66f10227d 100644 --- 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 index b13c6d843..2187c12d8 100644 --- 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 index d365edc53..b8e2dee9c 100644 --- 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> 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 index ae197b15f..ff8f9faea 100644 --- 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,