Merge branch 'master' into patch-1

goatcorp · Jul 18, 2024 · e531e85 · e531e85
2 parents 08a253f + d310d3e
commit e531e85
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/UIRes/bannedplugin.json b/UIRes/bannedplugin.json
@@ -172,7 +172,7 @@
   },
   {
     "Name": "DailyDuty",
-    "AssemblyVersion": "5.0.0.0"
+    "AssemblyVersion": "5.0.0.2"
   },
   {
     "Name": "XIVCombo",
@@ -289,8 +289,8 @@
   },
   {
     "Name": "JobBars",
-    "AssemblyVersion": "1.2.3.7",
-    "Reason": "Crashes with Patch 6.45 under certain scenarios"
+    "AssemblyVersion": "1.3.1.2",
+    "Reason": "Crashes with Patch 7.01 under certain scenarios"
   },
   {
     "Name": "ChatTwo",
@@ -433,6 +433,14 @@
     "AssemblyVersion": "3.3.2407.221",
     "Reason": "Crashes on battletalk"
   },
+  {
+    "Name": "NoTankYou",
+    "AssemblyVersion": "7.0.0.3"
+  },
+  {
+    "Name": "CurrencyAlert",
+    "AssemblyVersion": "2.0.0.2"
+  },
   {
     "Name": "ezWondrousTails",
     "AssemblyVersion": "3.0.0.0",

diff --git a/UIRes/pdb/.ver b/UIRes/pdb/.ver
@@ -1 +1 @@
-2024.07.06.0000.0000
+2024.07.10.0001.0000
diff --git a/UIRes/pdb/ffxiv_dx11.pdb b/UIRes/pdb/ffxiv_dx11.pdb
diff --git a/asset.json b/asset.json
@@ -1,5 +1,5 @@
 {
-  "Version": 271,
+  "Version": 274,
   "Assets": [
     {
       "Url": "https://raw.githubusercontent.com/goatcorp/DalamudAssets/master/UIRes/serveropcode.json",

diff --git a/package.zip b/package.zip