Merge branch develop v10.0.2-211206.1345

anoyetta · Dec 6, 2021 · 203e7b6 · 203e7b6
2 parents ed18666 + 2998232
commit 203e7b6
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 6 deletions.
diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt
@@ -1 +1 @@
-v10.0.1
+v10.0.2
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.0.0.1")]
-[assembly: AssemblyFileVersion("10.0.0.1")]
+[assembly: AssemblyVersion("10.0.0.2")]
+[assembly: AssemblyFileVersion("10.0.0.2")]
diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/ACT.SpecialSpellTimer.Core.csproj b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/ACT.SpecialSpellTimer.Core.csproj
@@ -432,9 +432,6 @@
     <Content Include="resources\icon\Job\ARC.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="resources\icon\Job\arcanist.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="resources\icon\Job\ARC_Solid.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -606,6 +603,12 @@
     <Content Include="resources\icon\Job\ROG_Solid.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="resources\icon\Job\RPR.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="resources\icon\Job\RPR_Solid.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="resources\icon\Job\SAM.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -618,6 +621,12 @@
     <Content Include="resources\icon\Job\SCH_Solid.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="resources\icon\Job\SGE.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="resources\icon\Job\SGE_Solid.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="resources\icon\Job\SMN.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/icon/Job/RPR.png b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/icon/Job/RPR.png
diff --git a/...T.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/icon/Job/RPR_Solid.png b/...T.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/icon/Job/RPR_Solid.png
diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/icon/Job/SGE.png b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/icon/Job/SGE.png
diff --git a/...T.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/icon/Job/SGE_Solid.png b/...T.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/icon/Job/SGE_Solid.png
diff --git a/...CT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/icon/Job/arcanist.png b/...CT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/icon/Job/arcanist.png