🔀 Merge pull request #209 from AssistantNMS/develop

🔖 2.14.0
AssistantNMS · Jun 7, 2023 · da5a514 · da5a514
2 parents 9099101 + cf51518
commit da5a514
Show file tree

Hide file tree

Showing 293 changed files with 49,884 additions and 7,456 deletions.
diff --git a/assets/data/Recharge.json b/assets/data/Recharge.json
@@ -323,6 +323,36 @@
       }
     ]
   },
+  {
+    "Id": "tech243",
+    "TotalChargeAmount": 19,
+    "ChargeBy": [
+      {
+        "Id": "raw72",
+        "Value": 1
+      }
+    ]
+  },
+  {
+    "Id": "tech244",
+    "TotalChargeAmount": 19,
+    "ChargeBy": [
+      {
+        "Id": "raw72",
+        "Value": 1
+      }
+    ]
+  },
+  {
+    "Id": "tech245",
+    "TotalChargeAmount": 19,
+    "ChargeBy": [
+      {
+        "Id": "raw72",
+        "Value": 1
+      }
+    ]
+  },
   {
     "Id": "tech25",
     "TotalChargeAmount": 200,

diff --git a/assets/data/controllerLookup.json b/assets/data/controllerLookup.json
@@ -30,7 +30,7 @@
     },
     {
       "Key": "DECONSTRUCT",
-      "Icon": "MOUSE/KEY.MOUSEWHEEL.png"
+      "Icon": "KEYBOARD/KEY.T.png"
     },
     {
       "Key": "EXOBOOST",
@@ -66,7 +66,7 @@
     },
     {
       "Key": "PLAYER_DECONSTRUCT",
-      "Icon": "MOUSE/KEY.MOUSEWHEEL.png"
+      "Icon": "KEYBOARD/KEY.T.png"
     },
     {
       "Key": "PLAYER_JUMP",
@@ -274,10 +274,6 @@
       "Key": "SHIP_SCAN",
       "Icon": "DS4/PS64.WHITE.L3.png"
     },
-    {
-      "Key": "SHIP_THRUST",
-      "Icon": ""
-    },
     {
       "Key": "SHIPCYCLEWEAPON",
       "Icon": "DS4/PS.WHITE.TRIANGLE.png"