Merge branch 'master' into dev/patcher-core

.eslintignore

@@ -8,4 +8,4 @@ webui/dist
 *.plugin.js
 *Plugin.js
 packaging/livesplit-node-client/build
-webstorm.config.js
+tests/testData/scripts

.github/pull_request_template.md

@@ -0,0 +1,20 @@
+<!-- Thanks for contributing to Peacock! Here's a bit of a template to help make sure everything relevant is covered. -->
+
+## Scope
+
+<!-- List any relevant changes you have made here. Be sure to link any issues fixed, or that are relevant to these changes. -->
+
+## Test Plan
+
+<!-- List how you have verified these changes work as intended. -->
+
+## Checklist
+
+<!--
+Just a few reminders to make sure everything is perfect. You can place an "X" in the boxes to tick them off.
+If you have not completed one of the steps below, you can create the pull request as a draft, and then check off the items as you go.
+When you have completed the checklist, press the "Ready for review" button.
+-->
+
+-   [ ] I have run Prettier to reformat any changed files
+-   [ ] I have verified my changes work

.github/workflows/locale-mod.yml

@@ -0,0 +1,87 @@
+name: Update Localisation Mod
+
+on:
+  push:
+    tags: ["v*"]
+  workflow_dispatch:
+
+jobs:
+  update-mod:
+    name: Update Mod
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout Peacock
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.PEACOCKBOT_TOKEN }}
+          path: "./Peacock"
+
+      - name: Checkout Peacock Strings
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.PEACOCKBOT_TOKEN }}
+          repository: thepeacockproject/peacock-strings
+          path: "./PeacockStrings"
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: "./Peacock/.nvmrc"
+          cache: "yarn"
+          cache-dependency-path: "./Peacock/yarn.lock"
+
+      - name: Install Packages
+        run: |
+          cd Peacock
+          yarn install --immutable
+
+      #- name: Download ResourceLib
+      #  uses: robinraju/[email protected]
+      #  with:
+      #    repository: "OrfeasZ/ZHMTools"
+      #    latest: true
+      #    fileName: "ResourceLib-win-x64.zip"
+      #    out-file-path: "Peacock/resources"
+
+      - name: Download RPKG-CLI
+        id: rpkgcli
+        uses: robinraju/[email protected]
+        with:
+          repository: "glacier-modding/RPKG-Tool"
+          latest: true
+          fileName: "rpkg_*-cli.zip"
+          out-file-path: "Peacock/resources"
+
+      - name: Download HMLanguageTools
+        id: hmlt
+        uses: robinraju/[email protected]
+        with:
+          repository: "AnthonyFuller/TonyTools"
+          latest: true
+          fileName: "TonyTools.zip"
+          out-file-path: "Peacock/resources"
+
+      - name: Unzip dependencies
+        run: |
+          cd Peacock/resources
+          7z x ${{ fromJson(steps.rpkgcli.outputs.downloaded_files)[0] }}
+          7z x ${{ fromJson(steps.hmlt.outputs.downloaded_files)[0] }}
+
+      - name: Rebuild Locale Packages
+        run: |
+          cd Peacock
+          yarn rebuild-locale
+
+      - name: Copy peacockstrings.locr.json
+        run: |
+          copy ./Peacock/resources/peacockstrings.locr.json ./PeacockStrings/content/chunk0/peacockstrings.locr.json
+
+      - name: Push updated Peacock LOCR
+        uses: EndBug/add-and-commit@v9
+        with:
+          cwd: "./PeacockStrings"
+          add: content/chunk0/peacockstrings.locr.json
+          author_name: PeacockBot
+          author_email: [email protected]
+          message: "enhancement: update strings"

.github/workflows/locale.yml

@@ -2,7 +2,7 @@ name: Localisation
 
 on:
   push:
-    branches: ["v*"]
+    branches: ["master"]
     paths: ["resources/locale.json", ".github/workflows/locale.yml"]
   workflow_dispatch:
 
@@ -18,13 +18,6 @@ jobs:
           token: ${{ secrets.PEACOCKBOT_TOKEN }}
           path: "./Peacock"
 
-      - name: Checkout Peacock Strings
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.PEACOCKBOT_TOKEN }}
-          repository: thepeacockproject/peacock-strings
-          path: "./PeacockStrings"
-
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
@@ -47,7 +40,7 @@ jobs:
 
       - name: Download RPKG-CLI
         id: rpkgcli
-        uses: robinraju/release-downloader@v1.9
+        uses: robinraju/release-downloader@v1.10
         with:
           repository: "glacier-modding/RPKG-Tool"
           latest: true
@@ -56,7 +49,7 @@ jobs:
 
       - name: Download HMLanguageTools
         id: hmlt
-        uses: robinraju/release-downloader@v1.9
+        uses: robinraju/release-downloader@v1.10
         with:
           repository: "AnthonyFuller/TonyTools"
           latest: true
@@ -84,16 +77,3 @@ jobs:
           author_name: PeacockBot
           author_email: [email protected]
           message: "[skip ci] Update locale packages"
-
-      - name: Copy peacockstrings.locr.json
-        run: |
-          copy ./Peacock/resources/peacockstrings.locr.json ./PeacockStrings/content/chunk0/peacockstrings.locr.json
-
-      - name: Push updated Peacock LOCR
-        uses: EndBug/add-and-commit@v9
-        with:
-          cwd: "./PeacockStrings"
-          add: content/chunk0/peacockstrings.locr.json
-          author_name: PeacockBot
-          author_email: [email protected]
-          message: "enhancement: update strings"

.gitignore

@@ -20,6 +20,7 @@ resources/**/*.*
 !resources/locale.json
 !resources/dynamic_resources_*/*.meta
 !resources/dynamic_resources_*.rpkg
+!resources/dynamic_resources_*/*.JSON
 !resources/rebuildLocale.cjs
 
 components/contracts.json
@@ -58,4 +59,5 @@ overrides
 DEBUG_PROFILE.zip
 
 packaging/add_itemsize/*
-!packaging/add_itemsize/add_itemsize.js
+!packaging/add_itemsize/add_itemsize.js
+/.idea/AIAssistantCustomInstructionsStorage.xml

.nvmrc

@@ -1 +1 @@
-v20.10.0
+v20.12.2

.vscode/launch.json

@@ -4,6 +4,18 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Dev Tools (run-dev tools)",
+            "skipFiles": ["<node_internals>/**"],
+            "env": {
+                "NODE_TLS_REJECT_UNAUTHORIZED": "0"
+            },
+            "runtimeExecutable": "yarn",
+            "runtimeArgs": ["run-dev", "tools"],
+            "console": "integratedTerminal"
+        },
         {
             "type": "node",
             "request": "launch",

.vscode/settings.json

@@ -1,10 +1,9 @@
 {
     "editor.codeActionsOnSave": {
-        "source.organizeImports": false
+        "source.organizeImports": "never"
     },
     "typescript.enablePromptUseWorkspaceTsdk": true,
     "npm.packageManager": "yarn",
-    "eslint.packageManager": "yarn",
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "eslint.format.enable": true,
     "search.exclude": {
@@ -14,5 +13,8 @@
         "yarn.lock": true,
         "**/.yarn": true
     },
-    "omnisharp.useModernNet": false
+    "omnisharp.useModernNet": false,
+    "[json]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    }
 }