Merge branch 'Map-A-Droid:master' into fix-gym-weather

Map-A-Droid · Mar 2, 2022 · b9fbe14 · b9fbe14
2 parents 4910f42 + 9876100
commit b9fbe14
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 15 deletions.
diff --git a/locale/de/types.json b/locale/de/types.json
@@ -143,10 +143,6 @@
     "prototext": "QUEST_BUDDY_YATTA",
     "text": ""
   },
-  "43": {
-    "prototext": "QUEST_MEGA_EVOLVE",
-    "text": "Mega Entwickle {0} Pokemon"
-  },
   "39": {
     "prototext": "QUEST_USE_INCENSE",
     "text": "Verwende einen Rauch"
@@ -155,12 +151,20 @@
     "prototext": "QUEST_WALK_BUDDY",
     "text": "Laufe {0} km mit deinem Kumpel"
   },
+  "43": {
+    "prototext": "QUEST_MEGA_EVOLVE",
+    "text": "Mega Entwickle {0} Pokemon"
+  },
   "46": {
     "prototext": "GEOTARGETED_AR_SCAN",
     "text": "Pok\u00e9stop scannen"
   },
   "57": {
     "prototext": "QUEST_TAKE_WILD_SNAPSHOT",
     "text": "Mache {0} Schnappschüsse von wilden Pokémon"
+  },
+  "59": {
+    "prototext": "QUEST_OPEN_GIFT",
+    "text": "Öffne {0} Geschenke"
   }
 }
diff --git a/locale/en/types.json b/locale/en/types.json
@@ -160,11 +160,15 @@
     "text": "Scan pokestop"
   },
   "56": {
-    "prototext": "QUEST_EARN_FORT_POWER_UP_POINTS ",
+    "prototext": "QUEST_EARN_FORT_POWER_UP_POINTS",
     "text": "Earn {0} points powering up a Pokéstop or Gym"
   },
   "57": {
-    "prototext": "QUEST_TAKE_WILD_SNAPSHOT ",
+    "prototext": "QUEST_TAKE_WILD_SNAPSHOT",
     "text": "Take {0} snapshots of wild pokemon"
+  },
+  "59": {
+    "prototext": "QUEST_OPEN_GIFT",
+    "text": "Open {0} gifts"
   }
 }
diff --git a/locale/fr/types.json b/locale/fr/types.json
@@ -147,12 +147,24 @@
     "prototext": "QUEST_USE_INCENSE",
     "text": "Utilise un Encens"
   },
+  "42": {
+    "prototext": "QUEST_WALK_BUDDY",
+    "text": "Marche {0} km avec ton copain"
+  },
   "43": {
     "prototext": "QUEST_MEGA_EVOLVE",
     "text": "Fais Mega évoluer {0} Pokémon"
   },
   "46": {
     "protoext": "GEOTARGETED_AR_SCAN",
     "text": "Scanner le Pok\u00e9Stop"
+  },
+  "57": {
+    "prototext": "QUEST_TAKE_WILD_SNAPSHOT",
+    "text": "Prends {0} photos de Pokémon sauvages"
+  },
+  "59": {
+    "prototext": "QUEST_OPEN_GIFT",
+    "text": "Ouvre {0} Cadeaux"
   }
 }
diff --git a/requirements.txt b/requirements.txt
@@ -1,25 +1,26 @@
+apkmirror-search
+apkutils==0.8.3
+bitstring~=3.1
+cachetools
 ConfigArgParse~=0.14
+dataclasses>=0.6
 Flask~=1.1.4
 Flask-Caching~=1.8.0
-ImageHash~=4.0
-bitstring~=3.1
-dataclasses>=0.6
 geopy~=1.20
 gevent==1.4.0
 gpxdata~=1.2
+greenlet<0.4.17
+ImageHash~=4.0
 imutils~=0.5
 loguru~=0.4.0
+markupsafe==2.0.1
 matplotlib~=3.1
-mysql-connector~=2.2
 mysqlclient~=1.4
+mysql-connector~=2.2
+numpy~=1.18.0
 opencv-python>=4.1,<4.3
 psutil~=5.6
 pytesseract~=0.3
 requests~=2.22
 s2sphere~=0.2
 websockets>=7
-numpy~=1.18.0
-apkutils==0.8.3
-greenlet<0.4.17
-apkmirror-search
-cachetools