Merge pull request #791 from Kvan7/dev

v0.13.7

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -59,6 +59,7 @@ body:
       label: Version
       description: What version of EE2 are you running? You can see this in Settings -> About
       options:
+        - 0.13.7
         - 0.13.6
         - 0.13.5
         - 0.13.4
@@ -70,7 +71,7 @@ body:
         - 0.11.x
         - 0.10.x
         - Change me
-      default: 10
+      default: 11
     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.13.6.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.13.7.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.13.6',
+    appVersion: '0.13.7',
     github: {
       releasesUrl: 'https://github.com/Kvan7/Exiled-Exchange-2/releases'
     },

main/package-lock.json

@@ -1,14 +1,14 @@
 {
   "name": "exiled-exchange-2",
-  "version": "0.13.6",
+  "version": "0.13.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "exiled-exchange-2",
-      "version": "0.13.6",
+      "version": "0.13.7",
       "dependencies": {
-        "electron-overlay-window": "4.0.1",
+        "electron-overlay-window": "4.0.2",
         "uiohook-napi": "1.5.x"
       },
       "devDependencies": {
@@ -3572,9 +3572,9 @@
       }
     },
     "node_modules/electron-overlay-window": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/electron-overlay-window/-/electron-overlay-window-4.0.1.tgz",
-      "integrity": "sha512-N+xihP19QaydNHPBz2T+Uv70sj8WUp1xdP/M+4mbjSkZyCsMrLG6r6gIJzS13Ic6eCdyaQE7MFL69z3JwtlF5g==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/electron-overlay-window/-/electron-overlay-window-4.0.2.tgz",
+      "integrity": "sha512-HFN/t6k+8/+2QIUQq5bkczEudGAxpsR5GmUbZXbHvHtCZhqHZOMDqPikeP8ZIXQe8wpjTzWo/KUq3eE2hFQwMQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

main/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exiled-exchange-2",
-  "version": "0.13.6",
+  "version": "0.13.7",
   "private": true,
   "scripts": {
     "dev": "node build/script.mjs",
@@ -20,7 +20,7 @@
   },
   "main": "dist/main.js",
   "dependencies": {
-    "electron-overlay-window": "4.0.1",
+    "electron-overlay-window": "4.0.2",
     "uiohook-napi": "1.5.x"
   },
   "devDependencies": {

main/src/shortcuts/text-box.ts

@@ -63,8 +63,6 @@ export function stashSearch(
     overlay.assertGameActive();
     clipboard.writeText(text);
     uIOhook.keyTap(Key.F, [Key.Ctrl]);
-    // HACK: While https://www.pathofexile.com/forum/view-thread/3854775
-    uIOhook.keyTap(Key.Backspace);
 
     uIOhook.keyTap(Key.V, [
       process.platform === "darwin" ? Key.Meta : Key.Ctrl,

main/src/windowing/OverlayWindow.ts

@@ -33,7 +33,7 @@ export class OverlayWindow {
 
     if (process.argv.includes("--no-overlay")) return;
 
-    const windowOpts: Electron.BrowserWindowConstructorOptions = {
+    this.window = new BrowserWindow({
       icon: path.join(__dirname, process.env.STATIC!, "icon.png"),
       ...OVERLAY_WINDOW_OPTS,
       width: 800,
@@ -43,9 +43,7 @@ export class OverlayWindow {
         webviewTag: true,
         spellcheck: false,
       },
-    };
-
-    this.window = new BrowserWindow(windowOpts);
+    });
 
     this.window.setMenu(
       Menu.buildFromTemplate([
@@ -65,7 +63,6 @@ export class OverlayWindow {
 
     this.window.webContents.setWindowOpenHandler((details) => {
       shell.openExternal(details.url);
-
       return { action: "deny" };
     });
   }
@@ -90,10 +87,6 @@ export class OverlayWindow {
   assertOverlayActive = () => {
     if (!this.isInteractable) {
       this.isInteractable = true;
-      // Linux needs explicit focus management
-      if (process.platform === "linux" && this.window) {
-        this.window.focus();
-      }
       OverlayController.activateOverlay();
       this.poeWindow.isActive = false;
     }
@@ -102,10 +95,6 @@ export class OverlayWindow {
   assertGameActive = () => {
     if (this.isInteractable) {
       this.isInteractable = false;
-      // Linux needs to release focus explicitly
-      if (process.platform === "linux" && this.window) {
-        this.window.blur();
-      }
       OverlayController.focusTarget();
       this.poeWindow.isActive = true;
     }
@@ -164,11 +153,11 @@ export class OverlayWindow {
   private handleOverlayAttached = (hasAccess?: boolean) => {
     if (hasAccess === false) {
       this.logger.write(
-        "error [Overlay] PoE is running with administrator rights",
+        "error [Overlay] PoE2 is running with administrator rights",
       );
 
       dialog.showErrorBox(
-        "PoE window - No access",
+        "PoE2 window - No access",
         // ----------------------
         "Path of Exile 2 is running with administrator rights.\n" +
           "\n" +

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

@@ -90,6 +90,7 @@
     "mod_explicit": "隨機詞墜",
     "mod_crafted": "工藝",
     "mod_scourge": "災厄",
+    "mod_rune": "Augment",
     "unidentified": "未鑑定",
     "veiled": "隱匿",
     "foil_unique": "貼模傳奇",

renderer/public/data/de/app_i18n.json

@@ -90,6 +90,7 @@
     "mod_explicit": "Explizit",
     "mod_crafted": "Hergestellt",
     "mod_scourge": "Plage",
+    "mod_rune": "Augmentations",
     "unidentified": "Nicht identifiziert",
     "veiled": "Verschleiert",
     "foil_unique": "Foil Unique",
@@ -207,8 +208,8 @@
     "tag_explicit_delve": "Delve",
     "tag_explicit_veiled": "Verschleiert",
     "tag_explicit_incursion": "Incursion",
-    "tag_rune": "Rune",
-    "tag_added_rune": "Rune",
+    "tag_rune": "Augmentations",
+    "tag_added_rune": "Augmentations",
     "tag_sanctum": "Sanctum",
     "tag_desecrated": "Entweihtes",
     "tag_skill": "Skill",

renderer/public/data/en/app_i18n.json

@@ -91,6 +91,7 @@
     "mod_explicit": "Explicit",
     "mod_crafted": "Crafted",
     "mod_scourge": "Scourge",
+    "mod_rune": "Augment",
     "unidentified": "Unidentified",
     "veiled": "Veiled",
     "foil_unique": "Foil Unique",
@@ -208,8 +209,8 @@
     "tag_explicit_delve": "Delve",
     "tag_explicit_veiled": "Veiled",
     "tag_explicit_incursion": "Incursion",
-    "tag_rune": "Rune",
-    "tag_added_rune": "Rune",
+    "tag_rune": "Augment",
+    "tag_added_rune": "Augment",
     "tag_sanctum": "Sanctum",
     "tag_desecrated": "Desecrated",
     "tag_skill": "Skill",

renderer/public/data/es/app_i18n.json

@@ -90,6 +90,7 @@
     "mod_explicit": "Explícito",
     "mod_crafted": "Fabricado",
     "mod_scourge": "Calamidad",
+    "mod_rune": "mejora",
     "unidentified": "No identificado",
     "veiled": "Velado",
     "foil_unique": "Único Brillante",
@@ -207,8 +208,8 @@
     "tag_explicit_delve": "Excursión",
     "tag_explicit_veiled": "Velado",
     "tag_explicit_incursion": "Incursión",
-    "tag_rune": "Runa",
-    "tag_added_rune": "Runa",
+    "tag_rune": "mejora",
+    "tag_added_rune": "mejora",
     "tag_sanctum": "Sanctum",
     "tag_desecrated": "profanado",
     "tag_skill": "Skill",

renderer/public/data/item-drop.json

@@ -462,6 +462,30 @@
     ],
     "items": []
   },
+  {
+    "query": [
+      "ITEM::Regal Shard"
+    ],
+    "items": [
+      "ITEM::Regal Orb"
+    ]
+  },
+  {
+    "query": [
+      "ITEM::Artificer's Shard"
+    ],
+    "items": [
+      "ITEM::Artificer's Orb"
+    ]
+  },
+  {
+    "query": [
+      "ITEM::Chance Shard"
+    ],
+    "items": [
+      "ITEM::Orb of Chance"
+    ]
+  },
   {
     "query": [
       "ITEM::Inscribed Ultimatum"

renderer/public/data/item-drop.jsonc

@@ -468,6 +468,30 @@
     ],
     "items": []
   },
+  {
+    "query": [
+      "ITEM::Regal Shard"
+    ],
+    "items": [
+      "ITEM::Regal Orb"
+    ]
+  },
+  {
+    "query": [
+      "ITEM::Artificer's Shard"
+    ],
+    "items": [
+      "ITEM::Artificer's Orb"
+    ]
+  },
+  {
+    "query": [
+      "ITEM::Chance Shard"
+    ],
+    "items": [
+      "ITEM::Orb of Chance"
+    ]
+  },
   // Trials
   {
     "query": [

renderer/public/data/ja/app_i18n.json

@@ -90,6 +90,7 @@
     "mod_explicit": "明示",
     "mod_crafted": "クラフト",
     "mod_scourge": "スカージ",
+    "mod_rune": "オーグメント",
     "unidentified": "未鑑定",
     "veiled": "ヴェール",
     "foil_unique": "フォイルユニーク",
@@ -203,8 +204,8 @@
     "tag_explicit_delve": "デルヴ",
     "tag_explicit_veiled": "ヴェール",
     "tag_explicit_incursion": "インカージョン",
-    "tag_rune": "ルーン",
-    "tag_added_rune": "ルーン",
+    "tag_rune": "オーグメント",
+    "tag_added_rune": "オーグメント",
     "tag_sanctum": "Sanctum",
     "tag_desecrated": "冒涜",
     "tag_skill": "Skill",

renderer/public/data/ko/app_i18n.json

@@ -87,6 +87,7 @@
     "mod_explicit": "부여된 속성",
     "mod_crafted": "제작된 속성",
     "mod_scourge": "스컬지",
+    "mod_rune": "증강물",
     "unidentified": "미확인",
     "veiled": "장막 속성",
     "foil_unique": "반짝이",
@@ -200,8 +201,8 @@
     "tag_explicit_delve": "탐광",
     "tag_explicit_veiled": "장막",
     "tag_explicit_incursion": "기습",
-    "tag_rune": "룬",
-    "tag_added_rune": "룬",
+    "tag_rune": "증강물",
+    "tag_added_rune": "증강물",
     "tag_sanctum": "성역",
     "tag_desecrated": "훼손된",
     "tag_skill": "Skill",

renderer/public/data/pt/app_i18n.json

@@ -89,6 +89,7 @@
     "mod_explicit": "Explícito",
     "mod_crafted": "Fabricado",
     "mod_scourge": "Flagelo",
+    "mod_rune": "aprimoramento",
     "unidentified": "Não identificado",
     "veiled": "Velado",
     "foil_unique": "Único Brilhante",
@@ -201,7 +202,7 @@
     "tag_explicit_delve": "Exploração",
     "tag_explicit_veiled": "Velado",
     "tag_explicit_incursion": "Incursão",
-    "tag_rune": "Runa",
+    "tag_rune": "aprimoramento",
     "tag_desecrated": "Profanado"
   },
   "online_filter": {

renderer/public/data/ru/app_i18n.json

@@ -106,6 +106,7 @@
     "mod_explicit": "Свойство",
     "mod_crafted": "Мастерский",
     "mod_scourge": "Преображённое",
+    "mod_rune": "усилителей",
     "unidentified": "Неопознанный",
     "veiled": "Завуалирован",
     "foil_unique": "Реликвия",
@@ -219,8 +220,8 @@
     "tag_explicit_delve": "Спуск",
     "tag_explicit_veiled": "Завуалирован",
     "tag_explicit_incursion": "Вмешательство",
-    "tag_rune": "Руна",
-    "tag_added_rune": "Руна",
+    "tag_rune": "усилителей",
+    "tag_added_rune": "усилителей",
     "tag_sanctum": "Святилище",
     "tag_desecrated": "Очернённый",
     "tag_skill": "Skill",

renderer/src/web/price-check/filters/create-item-filters.ts

@@ -302,8 +302,8 @@ export function createFilters(
 
   if (
     !item.isUnmodifiable &&
-    // Ignore tablet since only corrupted are rares, and we want to compare to them
-    item.category !== ItemCategory.Tablet &&
+    // Ignore waystones now(prev tablets) since if  there is one that is corrupted with right mods buyer wont care
+    item.category !== ItemCategory.Map &&
     (item.rarity === ItemRarity.Normal ||
       item.rarity === ItemRarity.Magic ||
       item.rarity === ItemRarity.Rare ||

renderer/src/web/price-check/trade/Cache.ts

@@ -25,7 +25,6 @@ export class Cache {
     if (!currency || this.currency === currency) return;
     this.currency = currency;
     this.cached.clear();
-    console.log("Purged cache");
   }
 
   static deriveTtl(...limits: RateLimiter[]): number {