Fix package version merge conflicts

Author: kpp16

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: Deploy Vite App to GitHub Pages
 
 on:
   push:
-    branches: ['main']
+    branches: ['tmp_working']
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

move_unused_files.sh

@@ -0,0 +1,4 @@
+move changebabylon.glTFFileLoader.js unused/
+move src/temp.html unused/
+move vite.config.ts.timestamp-1687982688799.mjs unused/
+move public/json/script.sh unused/

package-lock.json

@@ -16,8 +16,7 @@
     "cross-env": "latest",
     "handlebars": "latest",
     "howler": "^2.2.4",
-    "lil-gui": "^0.20.0",
-    "pepjs": "latest"
+    "pepjs": "^0.5.3"
   },
   "devDependencies": {
     "@babylonjs/inspector": "^7.0.0",

package.json

@@ -53,5 +53,10 @@
         "desktop": "Drag around the door's handle to open it",
         "mobile":  "Drag around the door's handle to open it",
         "xr":  "Drag around the door's handle to open it."
+    },
+    "GAME_STATE_PICK_FIREEXTINGUISHER_NO_FIRE": {
+        "desktop": "You probably shouldn't play with emergency equipment unless you really need it!",
+        "mobile":  "You probably shouldn't play with emergency equipment unless you really need it!",
+        "xr":  "You probably shouldn't play with emergency equipment unless you really need it!."        
     }
 }