Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-23 11:53:03 +00:00
Code Issues Projects Releases Packages Wiki Activity
851 commits 12 branches 8 tags 53 MiB
Commit graph

106 commits

Author SHA1 Message Date
Julian Lawrance
a159550aed Merge remote-tracking branch 'upstream/master' into feature/pokemon-form-types 2021-02-13 18:51:47 +00:00
Julian L
c273a42f98
Merge branch 'master' into past-pokemon-types 2021-02-06 21:56:50 +00:00
Julian Lawrance
6ce7ca413d Merge branch 'master' into past-pokemon-types 2021-02-06 21:29:40 +00:00
Alessandro Pezzè
1ce88ff23d sync: https://github.com/PokeAPI/pokedex/pull/28 2021-01-25 21:51:14 +01:00
Alessandro Pezzè
9b1bb9593d sync(data): https://github.com/PokeAPI/pokedex/pull/23 2021-01-11 19:46:03 +01:00
zacbullard
5c6aac10d9 Added missing type data for toxtricity-low-key-gmax (10220) 2020-12-28 17:10:34 -05:00
Alessandro Pezzè
56931b967d data: add order 2020-12-11 17:07:35 +01:00
matthieu
b96bf59964 Merge branch 'empty_lines' of https://github.com/maleclercq/pokeapi into empty_lines 2020-12-03 23:59:01 +01:00
matthieu
33f708a149 update leafeon and glaceon 2020-12-03 23:58:30 +01:00
maleclercq
31d6c1add5
Merge branch 'master' into empty_lines 2020-12-03 09:56:36 +01:00
Alessandro Pezzè
da9c4c5b99 data: fix abilities as per https://github.com/PokeAPI/api-data/pull/62#issuecomment-736749492 2020-12-01 21:24:10 +01:00
matthieu
10b20624f0 Remove 4 empty lines (when trigger evolution was the location) 2020-12-01 08:57:25 +01:00
Alessandro Pezzè
b9844c8c1b sync: data 
Contains data from @myoKun345 (https://github.com/PokeAPI/pokedex/pull/18) and @tomi-912 (https://github.com/PokeAPI/pokedex/pull/19)
 2020-11-30 20:44:37 +01:00
Alessandro Pezzè
fa4c09675a bug: increment order 2020-11-23 21:22:04 +01:00
Alessandro Pezzè
d6a5568280 fix: 1 2020-11-23 21:04:19 +01:00
Alessandro Pezzè
4b346086da fix: add evolution trigger 2020-11-23 20:37:44 +01:00
Alessandro Pezzè
8f5b45b96b fix: add rain info 2020-11-23 19:57:33 +01:00
Alessandro Pezzè
d3f87bdfd7 feat: sync data 
most of it is from @myoKun345 (https://github.com/PokeAPI/pokedex/pull/17) plus some leftovers I forgot
 2020-11-23 19:37:38 +01:00
Alessandro Pezzè
5e803da514 fix: update ability description 2020-10-03 18:43:49 +02:00
Alessandro Pezzè
f6512caa72 feat: add missing commas 2020-09-02 19:42:48 +02:00
Alessandro Pezzè
e76b278774
Merge branch 'master' into lgpe-movenames 2020-09-02 15:35:30 +02:00
André Sousa
e1644f7d31 Add generated move data 2020-09-01 12:02:37 -03:00
Alessandro Pezzè
955fb8c209 feat: sync data 2020-08-31 18:58:23 +02:00
André Sousa
a7191d0f72 Adding info about the new attacks 2020-08-25 15:12:43 -03:00
Alessandro Pezzè
ca97f3528a
Merge branch 'master' into lgpe-movenames 2020-08-25 17:25:58 +02:00
Alessandro Pezzè
cec70507e3 fix: add is_baby 2020-08-25 00:20:05 +02:00
André Sousa
6da10edb15 Add move names for LGPE 2020-08-24 18:49:59 -03:00
Alessandro Pezzè
d3b5d6e0dc fix: remove 0 2020-08-24 19:06:26 +02:00
Alessandro Pezzè
7a09776475 data: add 808 809 and legendary/mythical 2020-08-24 19:03:43 +02:00
Ashley Craddock
1ce9fa35c5 chore(data): added some gen 8 data. 2020-08-19 10:51:01 -07:00
Alessandro Pezzè
41f6c39682 Merge branch 'master' into gen-8 2020-08-11 19:28:20 +02:00
Alessandro Pezzè
d36408c14b feat: add pokemon stats 2020-08-10 20:06:11 +02:00
Alessandro Pezzè
a0a4701b2c feat: add 3 pokemons 2020-08-10 20:06:01 +02:00
Alessandro Pezzè
f91b6b6b1a feat: add latest Veekun data 2020-08-05 22:33:31 +02:00
Alessandro Pezzè
047575ff41 play: add some pokemon 2020-08-01 12:00:09 +02:00
Alessandro Pezzè
1c67ac45a4 feat: allow null values in pokemon.csv 2020-07-25 21:18:10 +02:00
Alessandro Pezzè
be946f27b9 feat: remove pokemon not ready 2020-07-25 20:34:07 +02:00
Alessandro Pezzè
87cf85babb fix: assign to regieleki an id 2020-07-25 20:25:56 +02:00
Alessandro Pezzè
c698ee33d9 feat: update pokemon.csv 2020-07-25 20:16:49 +02:00
Julian Lawrance
0180a15092 Add type data for Arceus and Silvally forms 2020-04-25 14:58:30 +01:00
Julian Lawrance
5ce6547f74 Create CSV data for Pokemon form types 2020-04-25 14:10:42 +01:00
Alessandro Pezzè
122f2519d7 feat: update CSVs 2019-12-17 12:38:39 +01:00
Julian Lawrance
c923d8844a Create data for past type efficacy 2019-12-01 12:32:49 +00:00
Julian Lawrance
734d69d9d6 Add past type entries for Rotom forms 
They were all Electric-Ghost type prior to Generation V
 2019-11-30 23:03:00 +00:00
Julian Lawrance
eb5b0968eb Create data for past Pokemon types 2019-11-30 20:42:34 +00:00
Alessandro Pezzè
46134774fc feat: add updated data from Veekun 2018-10-29 23:29:45 +01:00
Alessandro Pezzè
9203a0d286 Sun and moon data (#305) 
* badges

* Added CSV from Veekun

* added sprites from Veekun website

* quick fixes for an Exception

* bumped dependencies version

* add comment on how to upgrade to Django 1.11

* added some reminds to caching, our official wrappers and the true cost of the server

* remove index.html from sprites

* update to conform django-rest-framework 3.3.0 guidelines

* lint
 2017-10-21 13:21:23 +00:00
Peter Jeschke
4803d224ed Fix wrong heights (#219) 
See here: b5e4038f2d
Original commit by AxeBane
 2016-06-28 11:27:28 +01:00
Zane Adickes
d0909e1cc3 updated data with all of latest veekun updates 2015-12-28 00:00:14 -05:00
Adickes
6d7fd53ece little more work on pokemon evolution chains 2015-10-02 23:40:21 -04:00
Zane Adickes
bd508937ae Additional Data 
Filling out remaining data so Models have complete associations.
Data and models added for:
Pokemon
Moves
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
 2015-04-20 23:38:33 -04:00
Zane Adickes
5ad1cb0ea5 Revert "Pokemon/Move Models" 
This reverts commit 1882c47f90.
 2015-04-20 21:46:34 -04:00
Zane Adickes
5e9296f948 Revert "Added Remaining Data and Models" 
This reverts commit b069ee991b.
 2015-04-20 21:43:55 -04:00
Zane Adickes
b069ee991b Added Remaining Data and Models 
Data and models added for:
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
 2015-04-19 22:24:14 -04:00
Zane Adickes
1882c47f90 Pokemon/Move Models 
-Added models for Pokemon, Moves, and all other remaining models.

-Added new models to build script

-Build script will now clean and reset auto-incrementers for each table
in pokeapi_co_db

-Build script now runs against both postgres and sqlite (dev)

-Some v2 cvs files had no data in them. Pulled in the data from veekun
where necessary.

-Added all models to admin site registry

-Added instructions for building out db in README
 2015-04-12 22:29:36 -04:00
phalt
21a1d4bf46 initial commit 2014-12-04 11:11:46 +00:00