Merge pull request #78 from lichie567/develop

revert throwaway values again
lichie567 · Aug 1, 2024 · 2e49ee0 · 2e49ee0
2 parents ce41701 + df5fb84
commit 2e49ee0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/LMeter/ACT/DataStructures/Combatant.cs b/LMeter/ACT/DataStructures/Combatant.cs
@@ -271,12 +271,4 @@ public static Combatant GetTestData()
             MaxHit = "Full Thrust-42069"
         };
     }
-
-// These have to be here because newtonsoft and overlayplugin suck
-#pragma warning disable 0169
-    [JsonProperty("ENCDPS")]
-    private readonly string? _encdps;
-    [JsonProperty("ENCHPS")]
-    private readonly string? _enchps;
-#pragma warning restore 0169
 }
diff --git a/LMeter/ACT/DataStructures/Encounter.cs b/LMeter/ACT/DataStructures/Encounter.cs
@@ -86,12 +86,4 @@ public static Encounter GetTestData()
             HealingTotal = new LazyFloat(healing)
         };
     }
-
-// These have to be here because newtonsoft and overlayplugin suck
-#pragma warning disable 0169
-    [JsonProperty("ENCDPS")]
-    private readonly string? _encdps;
-    [JsonProperty("ENCHPS")]
-    private readonly string? _enchps;
-#pragma warning restore 0169
 }
diff --git a/LMeter/LMeter.csproj b/LMeter/LMeter.csproj
@@ -10,9 +10,9 @@
     <!-- Assembly Configuration -->
     <PropertyGroup>
         <AssemblyName>LMeter</AssemblyName>
-        <AssemblyVersion>0.4.1.0</AssemblyVersion>
-        <FileVersion>0.4.1.0</FileVersion>
-        <InformationalVersion>0.4.1.0</InformationalVersion>
+        <AssemblyVersion>0.4.1.1</AssemblyVersion>
+        <FileVersion>0.4.1.1</FileVersion>
+        <InformationalVersion>0.4.1.1</InformationalVersion>
     </PropertyGroup>
 
     <!-- Build Configuration -->

diff --git a/LMeter/Plugin.cs b/LMeter/Plugin.cs
@@ -17,7 +17,7 @@ public class Plugin : IDalamudPlugin
     {
         public const string ConfigFileName = "LMeter.json";
 
-        public static string Version { get; private set; } = "0.4.1.0";
+        public static string Version { get; private set; } = "0.4.1.1";
         public static string ConfigFileDir { get; private set; } = "";
         public static string ConfigFilePath { get; private set; } = "";
         public static string AssemblyFileDir { get; private set; } = "";

diff --git a/LMeter/changelog.md b/LMeter/changelog.md
@@ -1,3 +1,6 @@
+# Version 0.4.1.1
+- Fix bug with [dps] tag not working for some users
+
 # Version 0.4.1.0
 - Add support for FFLogs DPS calculations
     - Five new TextTags added: RDPS, ADPS, NDPS, CDPS, RAWDPS

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.1.0")]
-[assembly: AssemblyFileVersion("0.4.1.0")]
+[assembly: AssemblyVersion("0.4.1.1")]
+[assembly: AssemblyFileVersion("0.4.1.1")]