Skip to content

Commit

Permalink
Merge branch develop v10.0.1-211204.0157
Browse files Browse the repository at this point in the history
  • Loading branch information
anoyetta committed Dec 3, 2021
2 parents 0c41d03 + 7aeb6e5 commit 45b941a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion source/@MasterVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v10.0.0
v10.0.1
4 changes: 2 additions & 2 deletions source/ACT.Hojoring.Common/Version.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;

[assembly: AssemblyVersion("10.0.0.0")]
[assembly: AssemblyFileVersion("10.0.0.0")]
[assembly: AssemblyVersion("10.0.0.1")]
[assembly: AssemblyFileVersion("10.0.0.1")]
6 changes: 3 additions & 3 deletions source/FFXIV.Framework/FFXIV.Framework/XIVHelper/Jobs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public enum JobIDs : int
BLU = 36,
GNB = 37,
DNC = 38,
SGE = 39,
RPR = 40
RPR = 39,
SGE = 40
}

public enum Roles
Expand Down Expand Up @@ -200,8 +200,8 @@ public class Jobs
new Job() {ID = JobIDs.BLU, Role = Roles.MagicDPS, NameEN = "Blue Mage", NameJA = "青魔道士", NameFR = "Mage Bleu", NameDE = "Blaumagier" , NameCN = "青魔法师", NameKO = "청마도사", IsPopular = true},
new Job() {ID = JobIDs.GNB, Role = Roles.Tank, NameEN = "Gunbreaker", NameJA = "ガンブレイカー", NameFR = "Pistosabreur", NameDE = "Revolverklinge" , NameCN = "绝枪战士", NameKO = "Gunbreaker", IsPopular = true},
new Job() {ID = JobIDs.DNC, Role = Roles.RangeDPS, NameEN = "Dancer", NameJA = "踊り子", NameFR = "Danseur", NameDE = "Tänzer" , NameCN = "舞者", NameKO = "Dancer", IsPopular = true},
new Job() {ID = JobIDs.SGE, Role = Roles.Healer, NameEN = "Sage", NameJA = "賢者", NameFR = "Sage", NameDE = "Weiser" , NameCN = "賢者", NameKO = "Sage", IsPopular = true},
new Job() {ID = JobIDs.RPR, Role = Roles.MeleeDPS, NameEN = "Reaper", NameJA = "リーパー", NameFR = "Faucheur", NameDE = "Schnitter" , NameCN = "Reaper", NameKO = "Reaper", IsPopular = true},
new Job() {ID = JobIDs.SGE, Role = Roles.Healer, NameEN = "Sage", NameJA = "賢者", NameFR = "Sage", NameDE = "Weiser" , NameCN = "賢者", NameKO = "Sage", IsPopular = true},
};

public static IEnumerable<JobIDs> PopularJobIDs =>
Expand Down

0 comments on commit 45b941a

Please # to comment.