Merge pull request #627 from Kvan7:dev

v0.11.6

Author: Kvan7

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -21,7 +21,7 @@ body:
       label: Common Bugs
       description: Selection for bugs that are known to occur frequently with game updates
       options:
-        - An error occurred while parsing the item 
+        - An error occurred while parsing the item
         - Not Recognized Modifier
         - No modifiers found
         - Other
@@ -43,6 +43,7 @@ body:
       label: Version
       description: What version of EE2 are you running? You can see this in Settings -> About
       options:
+        - 0.11.6
         - 0.11.5
         - 0.11.4
         - 0.11.3
@@ -58,12 +59,11 @@ body:
     id: item
     attributes:
       label: Item Copy text
-      description: If your bug relates in ANY way to an item, copy the item's text and paste it here. You can do so with `ctrl + alt + c` when hovering over the item. 
+      description: If your bug relates in ANY way to an item, copy the item's text and paste it here. You can do so with `ctrl + alt + c` when hovering over the item.
       render: shell
   - type: textarea
     id: logs
     attributes:
       label: Relevant log output
       description: If able, please go to Settings -> Debug, and copy and paste what is in that text box. (No need for backticks)
       render: shell
-

.github/workflows/main.yml

@@ -34,7 +34,7 @@ jobs:
     needs: renderer
     strategy:
       matrix:
-        os: [windows-2022, ubuntu-22.04, macos-14]
+        os: [windows-2025, ubuntu-22.04, macos-14]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -59,4 +59,4 @@ jobs:
       run: cat ./main/dist/latest-linux.yml
     - name: Hash
       if: ${{ startsWith(matrix.os, 'macos') }}
-      run: cat ./main/dist/latest-mac.yml
+      run: cat ./main/dist/latest-mac.yml

.pre-commit-config.yaml

@@ -0,0 +1,43 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+-   repo: local
+    hooks:
+    -   id: check-version-consistency
+        name: Check Version Consistency
+        entry: python ./versionCheck.py
+        language: python
+        files: \.(js|md|yml|json)$
+
+    -   id: lint-fix-main
+        name: Lint Fix Main Project
+        entry: npm run fix --prefix ./main
+        language: system
+        pass_filenames: false
+        files: ^main/.*\.(ts|js|jsx|tsx)$
+
+    -   id: lint-fix-renderer
+        name: Lint Fix Renderer Project
+        entry: npm run lint-fix --prefix ./renderer
+        language: system
+        pass_filenames: false
+        files: ^renderer/.*\.(ts|js|jsx|tsx|vue)$
+
+    -   id: format-main
+        name: Format Main Project
+        entry: npm run format --prefix ./main
+        language: system
+        pass_filenames: false
+        files: ^main/.*\.(ts|js|jsx|tsx|vue|json|md)$
+
+    -   id: format-renderer
+        name: Format Renderer Project
+        entry: npm run format --prefix ./renderer
+        language: system
+        pass_filenames: false
+        files: ^renderer/.*\.(ts|js|jsx|tsx|vue|json|md)$

README.md

@@ -1,6 +1,6 @@
 # ![Perfect Jewelers Orb](./renderer/public/images/jeweler.png) Exiled Exchange 2
 
-![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/kvan7/exiled-exchange-2/latest/Exiled-Exchange-2-Setup-0.11.5.exe?style=plastic&link=https%3A%2F%2Ftooomm.github.io%2Fgithub-release-stats%2F%3Fusername%3Dkvan7%26repository%3DExiled-Exchange-2)
+![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/kvan7/exiled-exchange-2/latest/Exiled-Exchange-2-Setup-0.11.6.exe?style=plastic&link=https%3A%2F%2Ftooomm.github.io%2Fgithub-release-stats%2F%3Fusername%3Dkvan7%26repository%3DExiled-Exchange-2)
 ![GitHub Tag](https://img.shields.io/github/v/tag/kvan7/exiled-exchange-2?style=plastic&label=latest%20version)
 ![GitHub commits since latest release (branch)](https://img.shields.io/github/commits-since/kvan7/exiled-exchange-2/latest/dev?style=plastic)
 

docs/.vitepress/config.js

@@ -20,7 +20,7 @@ export default defineConfig({
   },
   themeConfig: {
     // logo: 'TODO', https://github.com/vuejs/vitepress/issues/1401
-    appVersion: '0.11.5',
+    appVersion: '0.11.6',
     github: {
       releasesUrl: 'https://github.com/Kvan7/Exiled-Exchange-2/releases'
     },

exiled-exchange-2.code-workspace

@@ -56,6 +56,7 @@
       "Synthesised",
       "uniquefoil",
       "uniquejewel",
+      "vitepress",
       "Warstaff",
       "WAYSTONE",
       "xchg",
@@ -86,4 +87,4 @@
     },
     "peacock.color": "#215732"
   }
-}
+}