Merge branch 'master' into Add-previous-abilities

Author: Naramsim

.gitignore

@@ -4,10 +4,10 @@
 *build/*
 *.DS_STORE
 db.*
-venv*
+*venv*
 node_modules
 .vscode
 *.env
 Resources/nginx/ssl/*
 !Resources/nginx/ssl/*.sample.*
-.idea*
+.idea*

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) © 2013–2021 Paul Hallett and PokéAPI contributors (https://github.com/PokeAPI/pokeapi#contributing). Pokémon and Pokémon character names are trademarks of Nintendo.
+Copyright (c) © 2013–2023 Paul Hallett and PokéAPI contributors (https://github.com/PokeAPI/pokeapi#contributing). Pokémon and Pokémon character names are trademarks of Nintendo.
 
 All rights reserved.
 

README.md

@@ -45,17 +45,8 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 
 ### Database setup
 
-Start the Django shell by
-
 ```sh
-python manage.py shell --settings=config.local
-```
-
-Run the build script with
-
-```py
-from data.v2.build import build_all
-build_all()
+make build-db
 ```
 
 Visit [localhost:80/api/v2/](localhost:80/api/v2/) to see the running API!
@@ -156,7 +147,7 @@ This k8s setup creates all k8s resources inside the _Namespace_ `pokeapi`, run `
 
 ## Donations
 
-Help to keep PokéAPI running! If you're using PokéAPI as a teaching resource or for a project, consider sending us a $10 donation to help keep the service up. We get 60 million requests a month!
+Help to keep PokéAPI running! If you're using PokéAPI as a teaching resource or for a project, consider sending us a $10 donation to help keep the service up. We get 330 million requests a month!
 
 Thank you to all our backers! [Become a backer](https://opencollective.com/pokeapi#backer)
 

data/v2/csv/evolution_chains.csv

@@ -527,3 +527,5 @@ id,baby_trigger_item_id
 534,
 535,
 536,
+537,
+538,

data/v2/csv/move_names.csv

@@ -8519,10 +8519,10 @@ move_id,local_language_id,name
 891,4,悔念剑
 891,9,Bitter Blade
 891,11,むねんのつるぎ
-892,1,てんこうそうげき
+892,1,でんこうそうげき
 892,4,电光双击
 892,9,Double Shock
-892,11,てんこうそうげき
+892,11,でんこうそうげき
 893,1,デカハンマー
 893,4,巨力锤
 893,9,Gigaton Hammer

data/v2/csv/moves.csv

@@ -899,6 +899,8 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 898,noxious-torque,9,4,100,10,100,0,10,2,,,,,
 899,combat-torque,9,2,100,10,100,0,10,2,,,,,
 900,magical-torque,9,18,100,10,100,0,10,2,,,,,
+901,hydro-steam,9,11,80,15,100,0,10,3,,,,,
+902,psyblade,9,14,80,15,100,0,10,2,,,,,
 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
 10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
 10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,

data/v2/csv/pokedex_version_groups.csv

@@ -31,3 +31,5 @@ pokedex_id,version_group_id
 29,20
 30,24
 31,25
+32,26
+33,27

data/v2/csv/pokedexes.csv

@@ -29,3 +29,5 @@ id,region_id,identifier,is_main_series
 29,8,crown-tundra,1
 30,9,hisui,1
 31,10,paldea,1
+32,10,teal-mask,1
+33,10,indigo-disk,1

data/v2/csv/pokemon.csv

@@ -1007,6 +1007,8 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 1006,iron-valiant,1006,14,350,,993,1
 1007,koraidon,1007,25,3030,,998,1
 1008,miraidon,1008,35,2400,,999,1
+1009,walking-wake,1009,35,2800,,1093,1
+1010,iron-leaves,1010,15,1250,,1094,1
 10001,deoxys-attack,386,17,608,270,515,0
 10002,deoxys-defense,386,17,608,270,516,0
 10003,deoxys-speed,386,17,608,270,517,0

data/v2/csv/pokemon_abilities.csv

@@ -2407,6 +2407,10 @@ pokemon_id,ability_id,is_hidden,slot
 1007,288,1,3
 1008,289,0,1
 1008,289,1,3
+1009,281,0,1
+1009,281,1,3
+1010,282,0,1
+1010,282,1,3
 10001,46,0,1
 10002,46,0,1
 10003,46,0,1