Merge pull request #689 from Kvan7:dev

v0.12.3

Author: Kvan7

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -59,13 +59,14 @@ body:
       label: Version
       description: What version of EE2 are you running? You can see this in Settings -> About
       options:
+        - 0.12.3
         - 0.12.2
         - 0.12.1
         - 0.12.0
         - 0.11.x
         - 0.10.x
         - Change me
-      default: 5
+      default: 6
     validations:
       required: true
   - type: textarea

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.12.2.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.12.3.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.12.2',
+    appVersion: '0.12.3',
     github: {
       releasesUrl: 'https://github.com/Kvan7/Exiled-Exchange-2/releases'
     },

exiled-exchange-2.code-workspace

@@ -39,21 +39,44 @@
       "Update to 2"
     ],
     "cSpell.words": [
+      "activegem",
       "Atzoatl",
+      "azmeri",
+      "Basetype",
       "corruptionjewel",
       "Defences",
       "DIVCARD",
       "divinable",
       "edps",
+      "exiledexchange",
+      "heistequipment",
+      "heistmission",
+      "heistreward",
+      "heisttool",
+      "heistutility",
+      "heistweapon",
       "ilvl",
+      "Invictus",
       "Kalandra",
+      "keybind",
       "keybinds",
       "Knockback",
+      "metagem",
+      "Morior",
       "nonunique",
+      "oneaxe",
+      "onemace",
+      "onesword",
       "onlineleague",
       "pdps",
+      "Poeninja",
+      "runedagger",
       "stormcloud's",
+      "supportgem",
       "Synthesised",
+      "twoaxe",
+      "twomace",
+      "twosword",
       "uniquefoil",
       "uniquejewel",
       "vitepress",

main/electron-builder.yml

@@ -12,7 +12,8 @@ files:
 extraMetadata:
   main: "main.js"
 nsis:
-  oneClick: true
+  oneClick: false
+  allowToChangeInstallationDirectory: true
 win:
   target:
     - "nsis"

main/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "exiled-exchange-2",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "private": true,
   "scripts": {
     "dev": "node build/script.mjs",

main/package.json

@@ -33,7 +33,7 @@ export class OverlayWindow {
 
     if (process.argv.includes("--no-overlay")) return;
 
-    this.window = new BrowserWindow({
+    const windowOpts: Electron.BrowserWindowConstructorOptions = {
       icon: path.join(__dirname, process.env.STATIC!, "icon.png"),
       ...OVERLAY_WINDOW_OPTS,
       width: 800,
@@ -43,7 +43,16 @@ export class OverlayWindow {
         webviewTag: true,
         spellcheck: false,
       },
-    });
+    };
+
+    // Linux/X11: Special window configuration
+    if (process.platform === "linux") {
+      windowOpts.skipTaskbar = true;
+      windowOpts.focusable = true;
+      windowOpts.type = "notification"; // Best balance of focus handling and stability
+    }
+
+    this.window = new BrowserWindow(windowOpts);
 
     this.window.setMenu(
       Menu.buildFromTemplate([
@@ -63,6 +72,12 @@ export class OverlayWindow {
 
     this.window.webContents.setWindowOpenHandler((details) => {
       shell.openExternal(details.url);
+      // Linux: Return focus to game after external link
+      if (process.platform === "linux") {
+        setTimeout(() => {
+          OverlayController.focusTarget();
+        }, 100);
+      }
       return { action: "deny" };
     });
   }
@@ -87,6 +102,11 @@ export class OverlayWindow {
   assertOverlayActive = () => {
     if (!this.isInteractable) {
       this.isInteractable = true;
+      // Linux needs explicit focus management
+      if (process.platform === "linux" && this.window) {
+        this.window.setFocusable(true);
+        this.window.focus();
+      }
       OverlayController.activateOverlay();
       this.poeWindow.isActive = false;
     }
@@ -95,6 +115,10 @@ export class OverlayWindow {
   assertGameActive = () => {
     if (this.isInteractable) {
       this.isInteractable = false;
+      // Linux needs to release focus explicitly
+      if (process.platform === "linux" && this.window) {
+        this.window.setFocusable(false);
+      }
       OverlayController.focusTarget();
       this.poeWindow.isActive = true;
     }

main/src/windowing/OverlayWindow.ts

@@ -145,7 +145,8 @@
     "weapon_crossbow": "十字弓",
     "weapon_spear": "長鋒",
     "weapon_flail": "鏈錘",
-    "armour_buckler": "輕盾"
+    "armour_buckler": "輕盾",
+    "map_tablet": "Tablet"
   },
   "filters": {
     "selected_some": "已選擇：{0}/{1}，屬性",
@@ -306,6 +307,7 @@
     "matched": "匹配：{0}",
     "trade": "交易",
     "price": "價格",
+    "normalized": "N-Price",
     "bulk": "批量",
     "stock": "庫存",
     "fulfill": "組數",

renderer/public/data/cmn-Hant/app_i18n.json

@@ -64,7 +64,7 @@ export default {
   HEIST_BLUEPRINT_GEMS: '不尋常寶石',
   HEIST_BLUEPRINT_REPLICAS: '贗品或實驗性物品',
   MIRRORED: '已複製',
-  MODIFIER_LINE: /^(?<type>[^"]+)(?:\s+"(?<name>[^"]+)")?(?:\s*\(階層：(?<tier>\d+)\))?(?:\s*\(階級：(?<rank>\d+)\))?$/,
+  MODIFIER_LINE: /^(?<type>[^"]+)(?:\s+"(?<name>[^"]*)")?(?:\s*\(階層：(?<tier>\d+)\))?(?:\s*\(階級：(?<rank>\d+)\))?$/,
   PREFIX_MODIFIER: '前綴',
   SUFFIX_MODIFIER: '後綴',
   CRAFTED_PREFIX: '大師工藝前綴',
@@ -126,5 +126,6 @@ export default {
   GRANTS_SKILL: '賦予技能: ',
   RELOAD_SPEED: '重新裝填時間: ',
   FRACTURED_ITEM: '破裂之物',
-  SANCTIFIED: '聖化的'
+  SANCTIFIED: '聖化的',
+  HYPHEN: '到'
 }