🔀 Merge pull request #263 from AssistantNMS/develop

🔖 2.26.1
AssistantNMS · Jul 24, 2024 · 17b94a2 · 17b94a2
2 parents f9747c2 + 3fb74a1
commit 17b94a2
Show file tree

Hide file tree

Showing 160 changed files with 44,889 additions and 19,460 deletions.
diff --git a/assets/data/meta.json b/assets/data/meta.json
@@ -1,5 +1,5 @@
 {
-  "GameVersion": "5.01",
-  "GameBuildNumber": 15088397,
-  "GeneratedDate": "2024-07-19"
+  "GameVersion": "5.01.1",
+  "GameBuildNumber": 15127129,
+  "GeneratedDate": "2024-07-24"
 }
diff --git a/assets/data/patronsBackup.json b/assets/data/patronsBackup.json
@@ -131,6 +131,12 @@
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7E4A8CDEB3F3702F32B1DCCD7BD11A1E.png",
     "url": "https://assistantapps.com"
   },
+  {
+    "name": "Jason Rich",
+    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/3EDB6BDFBDD09DD4DEB0DEB2CEC87C04.png",
+    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/3EDB6BDFBDD09DD4DEB0DEB2CEC87C04.png",
+    "url": "https://assistantapps.com"
+  },
   {
     "name": "Palis Airuta",
     "imageUrl": "https://cdn-usr.assistantapps.com/patreon/48F55AF63BF651EA9264F22310E716C5.png",
@@ -215,6 +221,12 @@
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/6C02FA269AC83C513CF6B141B42AFCD7.png",
     "url": "https://assistantapps.com"
   },
+  {
+    "name": "Thomas Goltz",
+    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/EF5817D1DE102DA2DC753B85D0EF1ED6.png",
+    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/EF5817D1DE102DA2DC753B85D0EF1ED6.png",
+    "url": "https://assistantapps.com"
+  },
   {
     "name": "Drew Robison",
     "imageUrl": "https://cdn-usr.assistantapps.com/patreon/D98A2915E66F9DBF7CB53631FB278D9B.png",

diff --git a/assets/data/quicksilverStore.json b/assets/data/quicksilverStore.json
@@ -1026,6 +1026,8 @@
   },
   {
     "MissionId": 90,
+    "Icon": "special/liquidator.png",
+    "Name": "Liquidator",
     "Items": [
       {
         "Tier": 2,

diff --git a/assets/data/twitchDrops.json b/assets/data/twitchDrops.json
@@ -1221,8 +1221,8 @@
   },
   {
     "Id": 8,
-    "StartDate": "2023-02-15T00:00:00",
-    "EndDate": "2023-02-20T00:00:00",
+    "StartDate": "2024-02-15T00:00:00",
+    "EndDate": "2024-02-20T00:00:00",
     "Days": [
       {
         "DayNumber": 1,

diff --git a/assets/images/milestonePatches/PATCH.AIRBORNE1.png b/assets/images/milestonePatches/PATCH.AIRBORNE1.png
diff --git a/assets/images/milestonePatches/PATCH.AMMO.png b/assets/images/milestonePatches/PATCH.AMMO.png
diff --git a/assets/images/milestonePatches/PATCH.BIGFISH.png b/assets/images/milestonePatches/PATCH.BIGFISH.png
diff --git a/assets/images/milestonePatches/PATCH.BUG1.png b/assets/images/milestonePatches/PATCH.BUG1.png
diff --git a/assets/images/milestonePatches/PATCH.BUG2.png b/assets/images/milestonePatches/PATCH.BUG2.png
diff --git a/assets/images/milestonePatches/PATCH.BUG3.png b/assets/images/milestonePatches/PATCH.BUG3.png
diff --git a/assets/images/milestonePatches/PATCH.BUG4.png b/assets/images/milestonePatches/PATCH.BUG4.png
diff --git a/assets/images/milestonePatches/PATCH.BUG5.png b/assets/images/milestonePatches/PATCH.BUG5.png
diff --git a/assets/images/milestonePatches/PATCH.BUGGRUB.png b/assets/images/milestonePatches/PATCH.BUGGRUB.png
diff --git a/assets/images/milestonePatches/PATCH.BUGPET.png b/assets/images/milestonePatches/PATCH.BUGPET.png
diff --git a/assets/images/milestonePatches/PATCH.BUILDING1.png b/assets/images/milestonePatches/PATCH.BUILDING1.png
diff --git a/assets/images/milestonePatches/PATCH.COOKEW2.png b/assets/images/milestonePatches/PATCH.COOKEW2.png
diff --git a/assets/images/milestonePatches/PATCH.EGGS.png b/assets/images/milestonePatches/PATCH.EGGS.png
diff --git a/assets/images/milestonePatches/PATCH.EXPEDITION.14.png b/assets/images/milestonePatches/PATCH.EXPEDITION.14.png
diff --git a/assets/images/milestonePatches/PATCH.GRENADE.png b/assets/images/milestonePatches/PATCH.GRENADE.png
diff --git a/assets/images/milestonePatches/PATCH.HARVEST.png b/assets/images/milestonePatches/PATCH.HARVEST.png
diff --git a/assets/images/milestonePatches/PATCH.KILLFIRE1.png b/assets/images/milestonePatches/PATCH.KILLFIRE1.png
diff --git a/assets/images/milestonePatches/PATCH.KILLFIRE2.png b/assets/images/milestonePatches/PATCH.KILLFIRE2.png
diff --git a/assets/images/milestonePatches/PATCH.KILLFIRE3.png b/assets/images/milestonePatches/PATCH.KILLFIRE3.png
diff --git a/assets/images/milestonePatches/PATCH.KILLFIRE4.png b/assets/images/milestonePatches/PATCH.KILLFIRE4.png
diff --git a/assets/images/milestonePatches/PATCH.KILLFIRE5.png b/assets/images/milestonePatches/PATCH.KILLFIRE5.png
diff --git a/assets/images/milestonePatches/PATCH.MECH1.png b/assets/images/milestonePatches/PATCH.MECH1.png
diff --git a/assets/images/milestonePatches/PATCH.STORM.png b/assets/images/milestonePatches/PATCH.STORM.png
diff --git a/assets/images/special/expedition-seas-10.jpg b/assets/images/special/expedition-seas-10.jpg
diff --git a/assets/images/special/expedition-seas-101.jpg b/assets/images/special/expedition-seas-101.jpg
diff --git a/assets/images/special/expedition-seas-11.jpg b/assets/images/special/expedition-seas-11.jpg
diff --git a/assets/images/special/expedition-seas-12.jpg b/assets/images/special/expedition-seas-12.jpg
diff --git a/assets/images/special/expedition-seas-13.jpg b/assets/images/special/expedition-seas-13.jpg
diff --git a/assets/images/special/expedition-seas-14.jpg b/assets/images/special/expedition-seas-14.jpg
diff --git a/assets/images/special/expedition-seas-2.jpg b/assets/images/special/expedition-seas-2.jpg
diff --git a/assets/images/special/expedition-seas-3.jpg b/assets/images/special/expedition-seas-3.jpg
diff --git a/assets/images/special/expedition-seas-4.jpg b/assets/images/special/expedition-seas-4.jpg
diff --git a/assets/images/special/expedition-seas-6.jpg b/assets/images/special/expedition-seas-6.jpg
diff --git a/assets/images/special/expedition-seas-7.jpg b/assets/images/special/expedition-seas-7.jpg
diff --git a/assets/images/special/expedition-seas-8.jpg b/assets/images/special/expedition-seas-8.jpg
diff --git a/assets/images/special/expedition-seas-9.jpg b/assets/images/special/expedition-seas-9.jpg
diff --git a/assets/images/special/liquidator.png b/assets/images/special/liquidator.png
diff --git a/assets/images/special/nmsfm.png b/assets/images/special/nmsfm.png
diff --git a/assets/images/special/valentinesCard1.jpg b/assets/images/special/valentinesCard1.jpg
diff --git a/assets/images/special/valentinesCard2.jpg b/assets/images/special/valentinesCard2.jpg
diff --git a/assets/images/special/valentinesCard3.jpg b/assets/images/special/valentinesCard3.jpg
diff --git a/assets/json/de/Buildings.lang.json b/assets/json/de/Buildings.lang.json
@@ -24216,7 +24216,8 @@
     "Colour": "C7C10F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsExpeditionSeason14Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -24242,7 +24243,8 @@
     "Colour": "C7C10F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsExpeditionSeason14Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -24268,7 +24270,8 @@
     "Colour": "C7C10F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsExpeditionSeason14Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -24294,7 +24297,8 @@
     "Colour": "C7C10F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsExpeditionSeason14Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -24320,7 +24324,8 @@
     "Colour": "C7C10F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsExpeditionSeason14Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -24346,7 +24351,8 @@
     "Colour": "C7C10F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsExpeditionSeason14Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -24372,7 +24378,8 @@
     "Colour": "C7C10F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsExpeditionSeason14Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -24398,7 +24405,8 @@
     "Colour": "C7C10F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsExpeditionSeason14Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -24424,7 +24432,8 @@
     "Colour": "2C7C9F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsExpeditionSeason14Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",