Skip to content

Commit 90730fc

Browse files
authored
Merge pull request #3260
beta
2 parents 8dc233f + 3ea0d03 commit 90730fc

7 files changed

Lines changed: 52 additions & 30 deletions

File tree

changelog-de.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
## Changelog - Extension
22

3+
##### 3.11.5.0
4+
5+
**Update**
6+
- Manifest Datei korrigiert
7+
8+
- Gildenkasse
9+
- Schreibfehler behoben
10+
11+
---
12+
313
##### 3.11.4.0
414

515
**Update**

changelog-en.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
## Changelog - Extension
22

3+
##### 3.11.5.0
4+
5+
**Update**
6+
- Manifest file corrected
7+
8+
- Guild treasury
9+
- Spelling mistake fixed
10+
11+
---
12+
313
##### 3.11.4.0
414

515
**Update**

js/web/_i18n/ru.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,8 +1059,8 @@
10591059
"Menu.Citymap.Desc": "Обзор города с высоты птичьего полета",
10601060
"Menu.Citymap.Title": "Обзор города",
10611061
"Menu.Dropdown": "Выпадающим списком",
1062-
"Menu.GexStat.Desc": "Отображает результаты ПБГ вашей гильдии.",
1063-
"Menu.GexStat.Title": "Результаты ПБГ",
1062+
"Menu.GexStat.Desc": "Отображает результаты Экспедиции вашей гильдии.",
1063+
"Menu.GexStat.Title": "Результаты Экспедиции",
10641064
"Menu.Gildfight.Desc": "Показывает текущие и предстоящие сражения на ПБГ",
10651065
"Menu.Gildfight.Title": "Поля гильдий (ПБГ)",
10661066
"Menu.Gildfight.Warning": "<em id='selectorCalc-Btn-closed' class='tooltip-error'>Отключено: Нужно сначала зайти на Поля</em> ",

js/web/guildmemberstat/js/guildmemberstat.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ FoEproxy.addHandler('ClanService', 'getTreasury', (data, postData) => {
4747
}
4848
});
4949
FoEproxy.addHandler('ClanService', 'getTreasuryBag', (data, postData) => {
50-
if (data.responseData?.type?.value && data.responseData?.type?.value != 'ClanMain') return; // for now ignore all other source types
50+
if (data.responseData?.type?.value && data.responseData?.type?.value !== 'ClanMain') return; // for now ignore all other source types
5151
let requestMethod = postData[0]['requestMethod'];
52-
if (requestMethod === 'getTreasury')
52+
if (requestMethod === 'getTreasuryBag')
5353
{
5454
let Goods = data.responseData.resources.resources;
5555

manifest.json

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,25 @@
22
"name": "__MSG_appName__",
33
"description": "__MSG_appDesc__",
44
"default_locale": "en",
5-
"version": "3.11.4.0",
6-
7-
"manifest_version": 2,
5+
"version": "3.11.5.0",
6+
7+
"manifest_version": 3,
88
"permissions": [
99
"alarms",
1010
"storage",
1111
"tabs",
12-
"notifications",
13-
"clipboardWrite",
12+
"notifications",
13+
"clipboardWrite"
14+
],
15+
16+
"host_permissions": [
1417
"https://*.forgeofempires.com/*",
1518
"https://foe-helper.com/*",
1619
"https://*.foe-helper.com/*",
1720
"https://*.foe-rechner.de/*"
1821
],
1922

20-
"browser_action": {
23+
"action": {
2124
"default_icon": "images/app16.png",
2225
"default_popup": "content/popup.html",
2326
"default_title": "__MSG_appName__"
@@ -30,18 +33,17 @@
3033
},
3134

3235
"web_accessible_resources": [
33-
"css/web/*.css",
34-
"vendor/*.js",
35-
"vendor/sounds/*.mp3",
36-
"js/web/*.*",
37-
"images/*.*",
38-
"css/images/*.*",
39-
"content/*.html",
40-
"js/vendor.json",
41-
"js/internal.json",
42-
"js/foeproxy.js"
36+
{
37+
"resources": [
38+
"js/*",
39+
"vendor/*",
40+
"css/*",
41+
"content/*"
42+
],
43+
"matches": [ "https://*/*" ]
44+
}
4345
],
44-
46+
4547
"content_scripts": [
4648
{
4749
"matches": ["https://*.forgeofempires.com/*"],
@@ -55,12 +57,12 @@
5557
}
5658
],
5759

60+
"externally_connectable" : {
61+
"matches": ["https://*.forgeofempires.com/*"],
62+
"ids": ["*"]
63+
},
64+
5865
"background": {
59-
"scripts": [
60-
"vendor/browser-polyfill/browser-polyfill.min.js",
61-
"vendor/dexie/dexie.min.js",
62-
"background.js"
63-
],
64-
"persistent": true
66+
"service_worker": "background.js"
6567
}
66-
}
68+
}

manifests/chromium/manifest_.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "__MSG_appName__",
33
"description": "__MSG_appDesc__",
44
"default_locale": "en",
5-
"version": "3.11.4.0",
5+
"version": "3.11.5.0",
66

77
"manifest_version": 3,
88
"permissions": [

manifests/firefox/manifest_.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "__MSG_appName__",
33
"description": "__MSG_appDesc__",
44
"default_locale": "en",
5-
"version": "3.11.4.0",
5+
"version": "3.11.5.0",
66

77
"manifest_version": 2,
88
"permissions": [

0 commit comments

Comments
 (0)