Merge pull request #896 from dsiekiera/daniel

#815 #866 #847 #672 #845 #786 #694 #572 #741 #884 #763 #844 #851 #848…
mainIine · Apr 28, 2020 · 7ad603d · 7ad603d
2 parents 3806c98 + 6a3724a
commit 7ad603d
Show file tree

Hide file tree

Showing 3 changed files with 135 additions and 8 deletions.
diff --git a/changelog-1.md b/changelog-1.md
@@ -1,5 +1,68 @@
 ## Changelog - Extension
 
+##### 2.4.5
+
+**Neu**
+- Statistik:
+    - Langzeittracking der Belohungen für GEX, Gildengefechte, Himeji und Frachter
+    - Langzeit-Bestandstracking für eigenen Vorrat, Gildenkassen, eigene Armeen
+    - Langzeittracking für Gildengefechte
+    - Langzeittracking für GvG Güterausgaben [#812](https://github.com/dsiekiera/foe-helfer-extension/issues/812)
+    - verschiedene Darstellungen
+    - verschiedene Exportmöglichkeiten (CSV, XLS)
+    - verschieden Filter (Zeitspannen, Eras)
+
+- Armee-Blocker:
+    - [#866](https://github.com/dsiekiera/foe-helfer-extension/issues/866) sind in der zweiten Angriffswelle nur noch Agenten enthalten, legt sich ein Fenster über den "Angriff"-Button und verhindert die versehendliche Niederlage
+
+**Update**
+- Außenposten:
+    - [#847](https://github.com/dsiekiera/foe-helfer-extension/issues/847) auf Wunsch werden zwischensummen pro Zeile dargestellt
+    - [#672](https://github.com/dsiekiera/foe-helfer-extension/issues/672) zeigt nun die erforderliche Beute bei den Ägyptern an
+
+- Erntehelfer:
+    - [#845](https://github.com/dsiekiera/foe-helfer-extension/issues/845) geschätzer Angriffs- und Verteidigungswert wird angezeigt (Berechnung anhand der Gebäude)
+
+- Verhandlungsassisten:
+    - [#786](https://github.com/dsiekiera/foe-helfer-extension/issues/786) [#694](https://github.com/dsiekiera/foe-helfer-extension/issues/694) [#572](https://github.com/dsiekiera/foe-helfer-extension/issues/572) zwei neue Checkboxen erlauben eine andere Aufteilung der Güter ("Aktuelle Güter sparen", "Medaillen sparen")
+
+- Armeeübersicht:
+    - [#741](https://github.com/dsiekiera/foe-helfer-extension/issues/741) der vierte Tab der Alcaernte bleibt nun dauerhaft sichtbar
+
+**BugFix**
+- Produktionsübersicht:
+    - [#884](https://github.com/dsiekiera/foe-helfer-extension/issues/884) falsches Zeitformat geändert
+
+- PvP Übersicht:
+    - [#763](https://github.com/dsiekiera/foe-helfer-extension/issues/763) Darstellungsfehler im Stadtschild wenn Nachbar noch nicht bekannt, behoben
+
+- Erntehelfer:
+    - [#844](https://github.com/dsiekiera/foe-helfer-extension/issues/844) es wurde "Apfelsaft" statt "Gildenmacht" ausgegeben
+
+- Einstellungen:
+    - [#851](https://github.com/dsiekiera/foe-helfer-extension/issues/851) Übersetzung korrgiert
+
+- Außenposten:
+    - [#848](https://github.com/dsiekiera/foe-helfer-extension/issues/848) Rundungsfehler bei 4-Ernte gefixt
+    - [#843](https://github.com/dsiekiera/foe-helfer-extension/issues/843) Namen der Agyptischen Gebäude waren zu lang
+
+- PvP Übersicht:
+    - [#805](https://github.com/dsiekiera/foe-helfer-extension/issues/805) [#820](https://github.com/dsiekiera/foe-helfer-extension/issues/820) [#826](https://github.com/dsiekiera/foe-helfer-extension/issues/826) Kämpfen gegen Nachbarn wurden nicht alle erfasst
+
+- Changelog:
+    - [#807](https://github.com/dsiekiera/foe-helfer-extension/issues/807) Englische Darstellung gefixt
+
+- FP-Übersicht:
+    - [#798](https://github.com/dsiekiera/foe-helfer-extension/issues/798) FP-Balken wurde nicht hinzugerechnet
+
+ - Extension:
+    - [#772](https://github.com/dsiekiera/foe-helfer-extension/issues/772) Meldung beim öffnen des Gildenforums im neuen Fenster entfernt
+
+- Forschungskosten:
+    - [#769](https://github.com/dsiekiera/foe-helfer-extension/issues/769) nach dem Freischalten wurden die Werte nicht neu berechnet
+
+---
+
 ##### 2.4.4
 
 **Neu**
@@ -155,7 +218,7 @@
 - FP-Lager:
     - [#424](https://github.com/dsiekiera/foe-helfer-extension/issues/424) Kleiner Bug beim FP kaufen (Münzen Rechner)
 
-- Invobox:
+- Infobox:
     - [#451](https://github.com/dsiekiera/foe-helfer-extension/issues/451) Falsche Anzahl der FP beim Level-Up/Info Box
     - [#462](https://github.com/dsiekiera/foe-helfer-extension/issues/462) Infobox warf Exceptions
 

diff --git a/changelog-2.md b/changelog-2.md
@@ -1,15 +1,79 @@
 ## Changelog - Extension
 
+##### 2.4.5
+
+**New**
+
+- Statistics:
+    - Long-term tracking of rewards for GEX, guild battles, Himeji and freighters
+    - Long-term inventory tracking for own stock, guild registers, own armies
+    - Long-term tracking for guild battles
+    - Long-term tracking for GvG goods expenditure [#812](https://github.com/dsiekiera/foe-helfer-extension/issues/812)
+    - different representations
+    - various export options (CSV, XLS)
+    - different filters (time spans, eras)
+
+- Army blocker:
+    - [#866](https://github.com/dsiekiera/foe-helfer-extension/issues/866) are only agents included in the second wave of attacks, put a window over the "attack" button and prevent it accidental defeat
+
+**Update**
+- Outpost:
+    - [#847](https://github.com/dsiekiera/foe-helfer-extension/issues/847) on request, subtotals are displayed per line
+    - [#672](https://github.com/dsiekiera/foe-helfer-extension/issues/672) now shows the required loot from the Egyptians
+
+- Harvesters:
+    - [#845](https://github.com/dsiekiera/foe-helfer-extension/issues/845) estimated attack and defense value is displayed (calculation based on the buildings)
+
+- Negotiators:
+    - [#786](https://github.com/dsiekiera/foe-helfer-extension/issues/786) [#694](https://github.com/dsiekiera/foe-helfer-extension/issues/694) [#572](https://github.com/dsiekiera/foe-helfer-extension/issues/572) two new checkboxes allow a different division of the goods ("save current goods", "save medals")
+
+- Army overview:
+    - [#741](https://github.com/dsiekiera/foe-helfer-extension/issues/741) the fourth tab of the alpine harvest is now permanently visible
+
+**BugFix**
+- Production overview:
+    - [#884](https://github.com/dsiekiera/foe-helfer-extension/issues/884) wrong time format changed
+
+- PvP overview:
+    - [#763](https://github.com/dsiekiera/foe-helfer-extension/issues/763) display error in the city sign if neighbor not yet known, fixed
+
+- Harvesters:
+    - [#844](https://github.com/dsiekiera/foe-helfer-extension/issues/844) "Apple juice" was issued instead of "guild power"
+
+- Settings:
+    - [#851](https://github.com/dsiekiera/foe-helfer-extension/issues/851) translation corrected
+
+- Outpost:
+    - [#848](https://github.com/dsiekiera/foe-helfer-extension/issues/848) Fixed rounding errors in 4 crop
+    - [#843](https://github.com/dsiekiera/foe-helfer-extension/issues/843) The names of the Egyptian buildings were too long
+
+- PvP overview:
+    - [#805](https://github.com/dsiekiera/foe-helfer-extension/issues/805) [#820](https://github.com/dsiekiera/foe-helfer-extension/issues/820 ) [#826](https://github.com/dsiekiera/foe-helfer-extension/issues/826) Fights against neighbors were not all recorded
+
+- Changelog:
+    - [#807](https://github.com/dsiekiera/foe-helfer-extension/issues/807) English display fixed
+
+- FP overview:
+    - [#798](https://github.com/dsiekiera/foe-helfer-extension/issues/798) FP bar was not included
+
+- Extension:
+    - [#772](https://github.com/dsiekiera/foe-helfer-extension/issues/772) Message removed when opening the guild forum in a new window
+
+- Research costs:
+    - [#769](https://github.com/dsiekiera/foe-helfer-extension/issues/769) after activation, the values were not recalculated
+
+---
+
 ##### 2.4.4
 
 **New**
 - PvP overview:
-    - [#686](https://github.com/dsiekiera/foe-helfer-extension/issues/686) neighborhood loot database
-    - values of you and the neighbor of the attacking, defending armies are noted
-    - what type of fight you have carried out and whether you won, lost or given up
-    - all times when you attacked, looted or last visited him
-    - what you looted, from which building
-    - shows all active city signs in your neighborhood
+    - [#686](https://github.com/dsiekiera/foe-helfer-extension/issues/686) neighborhood loot database
+    - values of you and the neighbor of the attacking, defending armies are noted
+    - what type of fight you have carried out and whether you won, lost or given up
+    - all times when you attacked, looted or last visited him
+    - what you looted, from which building
+    - shows all active city signs in your neighborhood
 
 **Update**
 - Extension:

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
 	"name": "__MSG_appName__",
 	"description": "__MSG_appDesc__",
 	"default_locale": "en",
-	"version": "2.4.4",
+	"version": "2.4.5",
 
 	"manifest_version": 2,
 	"permissions": [