Merge pull request #184 from Kyusung4698/develop

0.5.12 (2020-02-03)
Kyusung4698 · Feb 3, 2020 · 1940845 · 1940845
2 parents 7125e60 + f4b8b52
commit 1940845
Show file tree

Hide file tree

Showing 22 changed files with 11,889 additions and 46,988 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.5.12 (2020-02-03)
+
+* add kakao client support (#181)
+* add essence support (#180)
+* add [project wiki](https://github.com/Kyusung4698/PoE-Overlay/wiki) to faq
+* increase keyboard delay (#177)
+* remove `restore focus` (#177)
+* fix `herald of thunder` wrong item category (#176)
+* fix atps instead of crit (#183)
+
 ## 0.5.11 (2020-01-30)
 
 * add option based stat support (#110)

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# PoE Overlay 0.5.11
+# PoE Overlay 0.5.12
 
 An Overlay for Path of Exile. The ***core aspect*** is to blend in with the game. Built with Electron and Angular. 
 
@@ -79,9 +79,9 @@ These instructions will set you up to run and enjoy the overlay.
 
 1. Head over to [Releases](https://github.com/Kyusung4698/PoE-Overlay/releases) and download the latest zip
 2. Extract zip
-3. Run `poe-overlay 0.5.11.exe`
+3. Run `poe-overlay 0.5.12.exe`
 4. Start Path of Exile
-5. Wait until you can see `POE Overlay 0.5.11` in the bottom left corner
+5. Wait until you can see `POE Overlay 0.5.12` in the bottom left corner
 6. Hit `f7` and set `Language` and `League` to meet your game settings
 
 #### Shortcuts

diff --git a/main.ts b/main.ts
@@ -1,4 +1,4 @@
-import { app, BrowserWindow, ipcMain, Menu, Tray } from 'electron';
+import { app, BrowserWindow, ipcMain, Menu, MenuItemConstructorOptions, Tray } from 'electron';
 import * as hotkeys from 'hotkeys';
 import * as path from 'path';
 import * as robot from 'robotjs';
@@ -170,23 +170,22 @@ function createTray(): Tray {
         ? new Tray(path.join(__dirname, 'src/favicon.ico'))
         : new Tray(path.join(__dirname, 'dist/favicon.ico'));
 
-    const menu = Menu.buildFromTemplate([
-        {
-            label: 'Open Settings',
-            type: 'normal',
-            click: () => win.webContents.send('show-user-settings'),
-        },
-        {
-            label: 'Restore Focus',
-            type: 'normal',
+    const items: MenuItemConstructorOptions[] = [{
+        label: 'Settings', type: 'normal',
+        click: () => win.webContents.send('show-user-settings'),
+    }, {
+        label: 'Exit', type: 'normal',
+        click: () => app.quit()
+    }];
+
+    if (serve) {
+        items.splice(1, 0, {
+            label: 'Ignore Mouse Events', type: 'normal',
             click: () => win.setIgnoreMouseEvents(true),
-        },
-        {
-            label: 'Exit',
-            type: 'normal',
-            click: () => app.quit()
-        }
-    ]);
+        });
+    };
+
+    const menu = Menu.buildFromTemplate(items);
     tray.setToolTip(`PoE-Overlay: ${version}`);
     tray.setContextMenu(menu);
     return tray;

diff --git a/overlay.babel b/overlay.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.6.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.6.1">
     <!--
 
     BabelEdit project file
@@ -2303,6 +2303,88 @@
                             </translation>
                         </translations>
                     </concept_node>
+                    <concept_node>
+                        <name>wiki</name>
+                        <definition_loaded>false</definition_loaded>
+                        <description></description>
+                        <comment></comment>
+                        <default_text></default_text>
+                        <translations>
+                            <translation>
+                                <language>de-DE</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>en-US</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>es-ES</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>fr-FR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ko-KR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pt-BR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ru-RU</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>th-TH</language>
+                                <approved>false</approved>
+                            </translation>
+                        </translations>
+                    </concept_node>
+                    <concept_node>
+                        <name>wiki-title</name>
+                        <definition_loaded>false</definition_loaded>
+                        <description></description>
+                        <comment></comment>
+                        <default_text></default_text>
+                        <translations>
+                            <translation>
+                                <language>de-DE</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>en-US</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>es-ES</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>fr-FR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ko-KR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pt-BR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ru-RU</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>th-TH</language>
+                                <approved>false</approved>
+                            </translation>
+                        </translations>
+                    </concept_node>
                 </children>
             </folder_node>
             <folder_node>