From 755b8d74f2dc952ff949cb7cb7b6d40304703481 Mon Sep 17 00:00:00 2001
From: Rob Jones <delphi.actual@gmail.com>
Date: Wed, 29 Nov 2023 08:39:58 -0700
Subject: [PATCH] more merge conflict fixes

---
 package.json | 1 +
 src/main.ts  | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 525daf16..fc2b2a9b 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "generate-data-main": "dotenv node built/src/main.js",
     "generate-data-font": "dotenv node built/src/main.js generate-font-glyph-enums generate-symbols",
     "generate-font": "run-s build generate-data-font",
+    "generate-data": "run-s build generate-data-main"
   },
   "husky": {
     "hooks": {
diff --git a/src/main.ts b/src/main.ts
index 4291791f..aff082ec 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -21,12 +21,7 @@ const prioritizedScripts = ['enums', 'season-info', 'source-info', 'watermark-in
 const toCompileOutputs = ['generated-enums.ts', 'd2-font-glyphs.ts', 'seasons_unfiltered.json'];
 const outputDirectories = ['data', 'output'];
 // These files should be copied verbatim from data/ to output/
-const copyDataToOutput = [
-  'legacy-triumphs.json',
-  'stat-effects.ts',
-  'd2-font-glyphs.ts',
-  'generated-enums.ts',
-];
+const copyDataToOutput = ['legacy-triumphs.json', 'd2-font-glyphs.ts', 'generated-enums.ts'];
 
 // Read all `generate-` files
 const scriptsDir = dirname(fileURLToPath(import.meta.url));