🔀 Merge pull request #239 from AssistantNMS/develop

🔖 2.21.0
AssistantNMS · Jan 3, 2024 · 038739f · 038739f
2 parents 18a2aab + a7f28d8
commit 038739f
Show file tree

Hide file tree

Showing 186 changed files with 220,460 additions and 168,381 deletions.
diff --git a/.github/workflows/flutterWindows.yml b/.github/workflows/flutterWindows.yml
@@ -34,6 +34,9 @@ jobs:
         run: |
           $Env:ENV_DART | Out-File ./lib/env.dart
 
+      - name: Set platform override
+        run: dart scripts\platform_type_on.dart
+
       - name: Build Windows release version
         run: flutter build windows --release
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.9.21'
     repositories {
         google()
         jcenter()

diff --git a/assets/data/meta.json b/assets/data/meta.json
@@ -1,5 +1,5 @@
 {
   "GameVersion": "4.47",
   "GameBuildNumber": 12971329,
-  "GeneratedDate": "2023-12-18"
+  "GeneratedDate": "2024-01-02"
 }
diff --git a/assets/data/patronsBackup.json b/assets/data/patronsBackup.json
@@ -77,22 +77,16 @@
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/AD2DB07A3A0A976AAC85AA5B0FF4E898.png",
     "url": "https://assistantapps.com"
   },
-  {
-    "name": "nyxsis",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/D5D8C41865D8A28075F8BFD30E93BFA2.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D5D8C41865D8A28075F8BFD30E93BFA2.png",
-    "url": "https://assistantapps.com"
-  },
   {
     "name": "Red Goat",
     "imageUrl": "https://cdn-usr.assistantapps.com/patreon/1965C7A4B88091DE50A9CB8E29A531C8.png",
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/1965C7A4B88091DE50A9CB8E29A531C8.png",
     "url": "https://assistantapps.com"
   },
   {
-    "name": "Alistair",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/48CFDD47C31B9CA61068EAF6762E9932.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/48CFDD47C31B9CA61068EAF6762E9932.png",
+    "name": "nyxsis",
+    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/D5D8C41865D8A28075F8BFD30E93BFA2.png",
+    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D5D8C41865D8A28075F8BFD30E93BFA2.png",
     "url": "https://assistantapps.com"
   },
   {
@@ -102,9 +96,9 @@
     "url": "https://assistantapps.com"
   },
   {
-    "name": "Casey Brownell",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/FE4ACF19CFB2B7229E394F9F30C45860.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/FE4ACF19CFB2B7229E394F9F30C45860.png",
+    "name": "Alistair",
+    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/48CFDD47C31B9CA61068EAF6762E9932.png",
+    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/48CFDD47C31B9CA61068EAF6762E9932.png",
     "url": "https://assistantapps.com"
   },
   {
@@ -155,24 +149,6 @@
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/BCD210FF084C2EA92DA567C0E2D3C08C.png",
     "url": "https://assistantapps.com"
   },
-  {
-    "name": "Arshad Omari",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.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": "Dion Young",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/B9CCF5AB9D710ACD53A4D39B0D5AEE3B.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/B9CCF5AB9D710ACD53A4D39B0D5AEE3B.png",
-    "url": "https://assistantapps.com"
-  },
   {
     "name": "hedge",
     "imageUrl": "https://cdn-usr.assistantapps.com/patreon/AAA55602849BBC341939275ED809BC4A.png",
@@ -191,12 +167,6 @@
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/5761F92FC7129B588133D31BD74BEAC8.png",
     "url": "https://assistantapps.com"
   },
-  {
-    "name": "Gregory F. Hogg",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png",
-    "url": "https://assistantapps.com"
-  },
   {
     "name": "Stephanie Parsons",
     "imageUrl": "https://cdn-usr.assistantapps.com/patreon/B4C1E8292B23811594B9F7D50B43C10A.png",
@@ -209,40 +179,28 @@
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/74B8D5A6AC9A72876BFAF89489E3CACB.png",
     "url": "https://assistantapps.com"
   },
-  {
-    "name": "Bob Hicks",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/DD1C7D1D53DF36A2EE6BEE497DFA5F59.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DD1C7D1D53DF36A2EE6BEE497DFA5F59.png",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "WicketG0DSs",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
-    "url": "https://assistantapps.com"
-  },
   {
     "name": "AdventureswithDread",
     "imageUrl": "https://cdn-usr.assistantapps.com/patreon/56D3A9ED7D93F8119E978D7C45D0EA12.png",
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/56D3A9ED7D93F8119E978D7C45D0EA12.png",
     "url": "https://assistantapps.com"
   },
   {
-    "name": "HeavyCreamerScoop",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/7DE7E9FF63CDF91BC5E0E323B2CECA17.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7DE7E9FF63CDF91BC5E0E323B2CECA17.png",
+    "name": "Gregory F. Hogg",
+    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png",
+    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png",
     "url": "https://assistantapps.com"
   },
   {
-    "name": "MEOGI",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/931F9C05676AC1EAA21F3B68FEE879F9.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/931F9C05676AC1EAA21F3B68FEE879F9.png",
+    "name": "Bob Hicks",
+    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/DD1C7D1D53DF36A2EE6BEE497DFA5F59.png",
+    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DD1C7D1D53DF36A2EE6BEE497DFA5F59.png",
     "url": "https://assistantapps.com"
   },
   {
-    "name": "MightyChicken",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/F5340B555E6426381124C31489E7A1E5.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F5340B555E6426381124C31489E7A1E5.png",
+    "name": "WicketG0DSs",
+    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
+    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
     "url": "https://assistantapps.com"
   },
   {
@@ -263,6 +221,12 @@
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/8F4BECB7F5BAEA128B8D284DC28EB4EF.png",
     "url": "https://assistantapps.com"
   },
+  {
+    "name": "UberLeetGlitch",
+    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/9CF50630ADBF46DD1F8C3BC5874B518F.png",
+    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9CF50630ADBF46DD1F8C3BC5874B518F.png",
+    "url": "https://assistantapps.com"
+  },
   {
     "name": "Arcadie",
     "imageUrl": "https://cdn-usr.assistantapps.com/patreon/7B48FDA94614713E7E91CB53CCAF1552.png",
@@ -275,12 +239,6 @@
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/4422CEA6F012C8F338994799459CF3A8.png",
     "url": "https://assistantapps.com"
   },
-  {
-    "name": "UberLeetGlitch",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/9CF50630ADBF46DD1F8C3BC5874B518F.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9CF50630ADBF46DD1F8C3BC5874B518F.png",
-    "url": "https://assistantapps.com"
-  },
   {
     "name": "Jdia Plum",
     "imageUrl": "https://cdn-usr.assistantapps.com/patreon/97A74E429C4BDDDE7FA1A82AF690CB64.png",
@@ -293,6 +251,12 @@
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9D055DEC18EDF3FC779761BC38B25260.png",
     "url": "https://assistantapps.com"
   },
+  {
+    "name": "griff2877",
+    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/64547E8411DE881D1602DE08B4410E94.png",
+    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/64547E8411DE881D1602DE08B4410E94.png",
+    "url": "https://assistantapps.com"
+  },
   {
     "name": "Nick",
     "imageUrl": "https://cdn-usr.assistantapps.com/patreon/1290AD2AC8E1EB7EF8A40B17D0561DC3.png",
@@ -310,71 +274,5 @@
     "imageUrl": "https://cdn-usr.assistantapps.com/patreon/2B939F8876F617A2ED8EBA18E7748EAC.png",
     "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/2B939F8876F617A2ED8EBA18E7748EAC.png",
     "url": "https://assistantapps.com"
-  },
-  {
-    "name": "griff2877",
-    "imageUrl": "https://cdn-usr.assistantapps.com/patreon/64547E8411DE881D1602DE08B4410E94.png",
-    "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/64547E8411DE881D1602DE08B4410E94.png",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "jaciel alexy",
-    "imageUrl": "https://ui-avatars.com/api/?size=128&name=jaciel a",
-    "thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=jaciel a",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "William Scales",
-    "imageUrl": "https://ui-avatars.com/api/?size=128&name=William ",
-    "thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=William ",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "Freddy Go",
-    "imageUrl": "https://ui-avatars.com/api/?size=128&name=Freddy G",
-    "thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Freddy G",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "Alex",
-    "imageUrl": "https://ui-avatars.com/api/?size=128&name=Alex",
-    "thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Alex",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "Robko",
-    "imageUrl": "https://ui-avatars.com/api/?size=128&name=Robko",
-    "thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Robko",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "Mattihri Lolgamer",
-    "imageUrl": "https://ui-avatars.com/api/?size=128&name=Mattihri",
-    "thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Mattihri",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "Euphraties",
-    "imageUrl": "https://ui-avatars.com/api/?size=128&name=Euphrati",
-    "thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Euphrati",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "Ovet Rivera",
-    "imageUrl": "https://ui-avatars.com/api/?size=128&name=Ovet Riv",
-    "thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Ovet Riv",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "Fanofnms",
-    "imageUrl": "https://ui-avatars.com/api/?size=128&name=Fanofnms",
-    "thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Fanofnms",
-    "url": "https://assistantapps.com"
-  },
-  {
-    "name": "Randell Ripley",
-    "imageUrl": "https://ui-avatars.com/api/?size=128&name=Randell ",
-    "thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Randell ",
-    "url": "https://assistantapps.com"
   }
 ]
diff --git a/assets/data/quicksilverStore.json b/assets/data/quicksilverStore.json
@@ -948,7 +948,7 @@
   },
   {
     "MissionId": 84,
-    "Icon": "Unknown.png",
+    "Icon": "unknown.png",
     "Name": "Community Mission Research",
     "Items": []
   },

diff --git a/assets/data/unusedMilestonePatches.json b/assets/data/unusedMilestonePatches.json
@@ -9,20 +9,16 @@
   "milestonePatches/PATCH.BUILDINGINDUSTRIAL.png",
   "milestonePatches/PATCH.COLLECT.png",
   "milestonePatches/PATCH.COOK.1.png",
-  "milestonePatches/PATCH.CREATUREMILK.png",
-  "milestonePatches/PATCH.CREATUREPLANET.1.png",
   "milestonePatches/PATCH.CREATURESPHOTO.png",
   "milestonePatches/PATCH.DISCOVERPLANET.1.png",
   "milestonePatches/PATCH.DISCOVERPLANT.1.png",
   "milestonePatches/PATCH.DOSIMETER.1(OLD).png",
   "milestonePatches/PATCH.EXOCRAFT(OLD).png",
   "milestonePatches/PATCH.EXOCRAFT2.png",
-  "milestonePatches/PATCH.EXPEDITION.11.png",
   "milestonePatches/PATCH.EXPEDITION.2A.png",
   "milestonePatches/PATCH.FIRSTPLANET1.png",
   "milestonePatches/PATCH.FIRSTPLANET3.png",
   "milestonePatches/PATCH.FRIGATES.png",
-  "milestonePatches/PATCH.GETCUBES.png",
   "milestonePatches/PATCH.GETEXOCRAFT.png",
   "milestonePatches/PATCH.GETHUD.PEARL.png",
   "milestonePatches/PATCH.GETMINE.png",
@@ -32,13 +28,9 @@
   "milestonePatches/PATCH.KILL.PIRATES.1.png",
   "milestonePatches/PATCH.KILL.SENTINELS.1.png",
   "milestonePatches/PATCH.KILL.WALKERS.png",
-  "milestonePatches/PATCH.LEARN.2.png",
   "milestonePatches/PATCH.LIBRARY.png",
-  "milestonePatches/PATCH.MOUNTAIN2.png",
   "milestonePatches/PATCH.NEXUSMISSION.1.png",
   "milestonePatches/PATCH.PARTYPEOPLE.png",
-  "milestonePatches/PATCH.PEARL.png",
-  "milestonePatches/PATCH.PORTAL.png",
   "milestonePatches/PATCH.RAISEGEK.1.png",
   "milestonePatches/PATCH.RAISEKORVAX.1.png",
   "milestonePatches/PATCH.RAISEMERCENARIES.1.png",
@@ -55,7 +47,6 @@
   "milestonePatches/PATCH.TOOLCLASSC.png",
   "milestonePatches/PATCH.TOOLCLASSS.png",
   "milestonePatches/PATCH.TOTHESTARS.png",
-  "milestonePatches/PATCH.TREASURECHEST.png",
   "milestonePatches/PATCH.UNDERWATERCRASH.png",
   "milestonePatches/PATCH.UPGRADECLASSA.png",
   "milestonePatches/PATCH.UPGRADECLASSB.png",