Merge branch 'master' into compose

README.md

@@ -18,7 +18,7 @@
 
 A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 
-> Beta GraphQL support is rolling out! Check out the [GraphQL paragraph](#graphql) for more info.
+> Beta GraphQL support is rolling out! Check out the [GraphQL paragraph](#graphql--) for more info.
 
 ## Setup   [![pyVersion37](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/download/releases/3.7/)
 

SECURITY.md

@@ -0,0 +1,18 @@
+# Security Policy
+
+## Supported Versions
+
+The following versions of PokeAPI are currently being supported with security updates.
+
+| Version | Supported |
+| --- | --- |
+| `master` | :white_check_mark: |
+| any other version/release/tag  | :x: |
+
+## Reporting a Vulnerability
+
+If you find a security issue, please act responsibly and do NOT report it in the public issue tracker.
+
+Instead, send an email to the following email addresses: pokeapi.co@gmail.com, igougi.ui@gmail.com(@Naramsim)
+
+If you don't receive a prompt answer, open a ticket here: https://github.com/PokeAPI/pokeapi/issues/new/choose

data/v2/build.py

@@ -1381,6 +1381,7 @@ def _build_pokemons():
     def csv_record_to_objects(info):
         poke_sprites = "pokemon/"
         dream_world = "other/dream-world/"
+        home = "other/home/"
         official_art = "other/official-artwork/"
         gen_i = "versions/generation-i/"
         gen_ii = "versions/generation-ii/"
@@ -1412,6 +1413,18 @@ def _build_pokemons():
                         poke_sprites + dream_world + "female/", info, "svg"
                     ),
                 },
+                "home": {
+                    "front_default": try_image_names(poke_sprites + home, info, "png"),
+                    "front_female": try_image_names(
+                        poke_sprites + home + "female/", info, "png"
+                    ),
+                    "front_shiny": try_image_names(
+                        poke_sprites + home + "shiny/", info, "png"
+                    ),
+                    "front_shiny_female": try_image_names(
+                        poke_sprites + home + "shiny/female/", info, "png"
+                    ),
+                },
                 "official-artwork": {
                     "front_default": try_image_names(
                         poke_sprites + official_art, info, "png"

data/v2/csv/pokemon_species_flavor_text.csv

@@ -63802,8 +63802,8 @@ water, so it will disappear if it starts raining."
 不知什么时候就会消失。"
 186,4,9,"If POLIWAG and
 POLIWHIRL hear its
-echoing cry, theyrespond by gather­
+echoing cry, theyrespond by gather­ing
-ing from far and
+from far and
 wide."
 186,5,9,"Whenever three or
 more of these get
@@ -75609,8 +75609,8 @@ Smeargle fanatics will pay big money for them."
 235,30,12,"会用尾巴前端渗出的体液画下标记。
 对于有些标记，爱好者会以高价买卖。"
 236,4,9,"It is always
-bursting with en­
+bursting with energy. 
-ergy. To make it­self stronger, it
+To make it­self stronger, it
 keeps on fighting
 even if it loses."
 236,5,9,"Even though it is