Commit graph

555 commits

Author SHA1 Message Date
Alessandro Pezzè
56931b967d data: add order 2020-12-11 17:07:35 +01:00
Alessandro Pezzè
63ee471a14 feat: update submodule [ci skip] 2020-12-05 14:48:17 +01:00
Alessandro Pezzè
5893aded20
Merge pull request #541 from maleclercq/empty_lines 2020-12-04 11:46:25 +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è
ce0013efc7
Merge pull request #543 from PokeAPI/staging
Fix abilities
2020-12-03 09:36:46 +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è
832c4d10e3
Merge pull request #540 from PokeAPI/staging
Sync data
2020-11-30 22:39:37 +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è
44dbfab905
Merge pull request #539 from PokeAPI/staging 2020-11-24 21:44:56 +01:00
Alessandro Pezzè
bc9d5b1ebf chore: bump black 2020-11-23 22:11:23 +01:00
Alessandro Pezzè
464aeea4af fix: run black 2020-11-23 22:05:49 +01:00
Alessandro Pezzè
71d75c3540 feat: extend pokemon_name to 60 char 2020-11-23 21:57:30 +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è
fb1c28c194 fix: don't post status updates when in a cron job 2020-11-16 19:16:18 +01:00
Alessandro Pezzè
e91e567811
Update config.yml
[skip ci]
2020-10-24 18:40:22 +02:00
Alessandro Pezzè
fc662bdb12
Rename feature_request.yml to feature_request.md 2020-10-12 09:44:30 +02:00
Alessandro Pezzè
e77f43bdb8
Rename bug_report.yml to bug_report.md 2020-10-12 09:44:02 +02:00
Alessandro Pezzè
8a8e31980e
Merge pull request #529 from PokeAPI/staging 2020-10-08 11:18:21 +02:00
Alessandro Pezzè
5b3b2f7465
Merge branch 'master' into staging 2020-10-08 11:04:32 +02:00
Alessandro Pezzè
988e4562c1
Merge pull request #530 from PokeAPI/Naramsim-patch-1 2020-10-08 11:03:45 +02:00
Alessandro Pezzè
69dda8b183
chore: cron deploy staging 2020-10-04 16:14:34 +02:00
Alessandro Pezzè
5e803da514 fix: update ability description 2020-10-03 18:43:49 +02:00
Alessandro Pezzè
894a8bc737 feat: use 2.4 manifest 2020-10-03 18:43:34 +02:00
Alessandro Pezzè
6d4a1a9846
Merge pull request #527 from Purukitto/patch-1
Fix License badge's link
2020-09-19 10:51:45 +02:00
Pulkit Sambhavi Singh
57c3369302
Fix License badge's link 2020-09-19 11:31:28 +05:30
Alessandro Pezzè
4a51836454
Merge pull request #526 from PokeAPI/staging 2020-09-07 10:59:13 +02:00
Alessandro Pezzè
841cb964ff
Merge pull request #524 from AndreArrebola/lgpe-movenames 2020-09-07 10:57:29 +02:00
Alessandro Pezzè
6b33ed2bc6 play: allow null values 2020-09-02 19:57:00 +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è
a78257e032
Merge pull request #525 from PokeAPI/staging 2020-09-01 10:45:08 +02: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
Alessandro Pezzè
c09b04951f
Merge pull request #522 from Crash2490/master 2020-08-24 17:21:03 +02:00
Alessandro Pezzè
9cf9541942
Merge branch 'master' into master 2020-08-24 11:37:22 +02:00
Alessandro Pezzè
02ce96cb42
Merge pull request #523 from C-Garza/add-icons 2020-08-24 11:34:14 +02:00
Christian Garza
4e8b0da539 Extend pokemon sprites to include gen-vii and gen-viii icons 2020-08-23 20:05:22 -07:00