Merge branch 'main' into dev

src/core/blitz/resolveTankId.ts

@@ -1,5 +1,6 @@
 import { go } from 'fuzzysort';
 import { UserError } from '../../hooks/userError';
+import markdownEscape from 'markdown-escape';
 import {
   tankDefinitions,
   tanksDefinitionsArray,
@@ -15,9 +16,9 @@ export default async function resolveTankId(tank: string | number) {
     });
 
     if (searchResult.length === 0) {
-      throw new UserError('Tank not found', {
-        cause: `Could not find tank by the name "${tank}".`,
-      });
+      throw new UserError(
+        `# Tank not found\nCould not find tank by the name "${markdownEscape(`${tank}`)}".`,
+      );
     } else {
       return searchResult[0].obj.id;
     }
@@ -25,9 +26,9 @@ export default async function resolveTankId(tank: string | number) {
     if ((await tankDefinitions)[number]) {
       return number;
     } else {
-      throw new UserError('Tank not found', {
-        cause: `Could not find tank by the ID "${number}".`,
-      });
+      throw new UserError(
+        `# Tank not found\nCould not find tank by the ID "${number}". Try typing the name of the tank instead of a number.`,
+      );
     }
   }
 }