Commit graph

1560 commits

Author SHA1 Message Date
Dalton
bbb00fa4ed Renamed Gen 7 locations to align with newly added Gen 7 location areas 2024-01-20 14:17:19 -06:00
Dalton
0107ba6018 Removed overlap between locations and location areas 2024-01-20 13:27:36 -06:00
Alessandro Pezzè
49f7ecb0c8
Merge pull request #1011 from lati111/fix-hisuian-forms
Fixed form orders for new hisuian mons
2024-01-21 02:19:15 +09:00
lati111
6e555e1224 Fixed form orders for new hisuian mons
Enamorus, basculin and basculegion
2024-01-20 17:15:22 +01:00
Alessandro Pezzè
5868914691
docs: change Slack link
[ci skip]
2024-01-15 21:03:04 +01:00
Alessandro Pezzè
5993979122
Merge pull request #1009 from DaltonSW/adding-location-areas
Adding giants cap location, and gen 8 and hisui location areas
2024-01-16 03:58:43 +09:00
Alessandro Pezzè
e4b554486f
Merge pull request #1007 from penelopeysm/1006-dlc2-learnset-again
Add remaining DLC2 movesets (legendaries, Exeggcute, Duraludon)
2024-01-16 03:50:13 +09:00
Dalton
4d4a2233db Adding giants cap location, and gen 8 and hisui location areas 2024-01-15 10:23:43 -06:00
Penelope Yong
724cd4ed28
Add remaining DLC2 movesets (legendaries, Exeggcute, Duraludon)
Closes #1006
2024-01-15 03:26:28 +00:00
Alessandro Pezzè
8d94aa31a7
Merge pull request #1004 from Deleca7755/master
Fix Piplup's line and Shiftry's past Abilities
2024-01-15 00:10:43 +09:00
Alessandro Pezzè
4a0a91dc6d
Merge pull request #1003 from DaltonSW/assign-IDs-to-missing-locations
Assign IDs to missing locations
2024-01-14 20:41:35 +09:00
Deleca
16160c8f17
Fix Shiftry 2024-01-14 00:39:28 -05:00
Deleca
29089482d4
Piplup line past abil Is defiant not competitive aaaa 2024-01-14 00:30:52 -05:00
Dalton
260fe893f6 Hisui locations 2024-01-13 21:31:26 -06:00
Dalton
d4b384e3a9 Added gen 8 locations 2024-01-13 21:20:22 -06:00
Alessandro Pezzè
c269549ef7
Merge pull request #1001 from PokeAPI/django3.2
deps: ipdate django to 3.2
2024-01-14 02:19:39 +09:00
Naramsim
dc951e5aec refactor: lint 2024-01-13 18:00:27 +01:00
Naramsim
ccb60d5b24 deps: ipdate django to 3.2 2024-01-13 17:57:47 +01:00
Alessandro Pezzè
e969d62454
Merge pull request #999 from penelopeysm/987-dlc2-learnset
Add DLC2 learnsets
2024-01-14 01:18:30 +09:00
Penelope Yong
a87c37cff6
Merge remote-tracking branch 'upstream/master' into 987-dlc2-learnset 2024-01-13 14:48:07 +00:00
Penelope Yong
fd8a4d6df6
Add new paradoxes 2024-01-13 14:43:49 +00:00
Alessandro Pezzè
e1da3bf7f6
Merge pull request #992 from giginet/poltchageist-form-names
Add form names for Poltchageist
2024-01-13 21:11:47 +09:00
giginet
52f83569b8 Fix CSV format 2024-01-13 13:50:15 +09:00
Alessandro Pezzè
65e9a843f7
Merge branch 'master' into 987-dlc2-learnset 2024-01-13 04:00:22 +09:00
Alessandro Pezzè
22c43db306
Merge pull request #1000 from Deleca7755/master
Add missing past abilities
2024-01-12 18:12:29 +09:00
Deleca
eaae787852
Correct Basculin form 2024-01-12 04:05:46 -05:00
Deleca
90cd0027dd
Gallade Is also slot 2 apparently 2024-01-12 03:52:55 -05:00
Deleca
7763d3de67
Shiftry slot 2 not 1 2024-01-12 03:42:48 -05:00
Deleca
ce4b66f457
Gen 9 past abilities 2024-01-12 03:22:47 -05:00
Naramsim
9d9e291e06 chore: try increase sleep 2024-01-11 22:06:15 +01:00
Alessandro Pezzè
25ef7b57d1
Merge pull request #998 from helblingjoel/update-pokedexes
Link BDSP and SWSH DLC Pokedexes with Version Groups
2024-01-11 19:41:39 +09:00
Alessandro Pezzè
7eb8b42b88
Merge pull request #997 from helblingjoel/issue#995
fix: Swap Tornadus and Thundurus in Hisui Pokedex
2024-01-11 19:40:31 +09:00
Alessandro Pezzè
e74795ad90
Merge branch 'master' into poltchageist-form-names 2024-01-11 19:34:08 +09:00
Alessandro Pezzè
e6f3a8a0e4
Merge pull request #991 from giginet/add-missing-move-names
Add missing move translations
2024-01-11 19:33:52 +09:00
Naramsim
d4d82589cf chore: remove default 2024-01-11 11:29:18 +01:00
Penelope Yong
376abc2e4d
add learnsets for Pecharunt forms, plus new DLC2 TMs 2024-01-11 01:16:01 +00:00
Penelope Yong
5c36211ee7
Remove duplicate lines 2024-01-11 00:42:38 +00:00
Penelope Yong
72c3de0b6b
Add DLC2 learnsets (except for new TMs, I think) 2024-01-11 00:41:21 +00:00
Joel Helbling
133b40a56b Link Sword/Shield DLC Dexes with their Version Groups 2024-01-10 23:48:45 +00:00
Joel Helbling
e9bbc6f555 Add DP Pokedex to BDSP Version group
This closes #948
2024-01-10 23:48:25 +00:00
Joel Helbling
f4ce2ba48b fix: Swap Tornadus and Thundurus in Hisui Pokedex 2024-01-10 23:38:18 +00:00
Naramsim
f7ba0048f9 fix(cicd): move metadata application 2024-01-10 20:34:19 +01:00
Naramsim
bd4da3785b Merge branch 'master' of https://github.com/PokeAPI/pokeapi 2024-01-10 16:44:57 +01:00
Naramsim
d87da0eb2a feat(gql-cicd): apply metadata 2024-01-10 16:44:32 +01:00
Alessandro Pezzè
80ab47326e
Merge pull request #993 from PokeAPI/gql
Upgrade images/change GQL makefile
2024-01-10 23:31:26 +09:00
Naramsim
4ed97c6088 chore: use default images 2024-01-09 23:20:04 +01:00
Naramsim
c5d8338ee4 Merge branch 'gql' of https://github.com/PokeAPI/pokeapi into gql 2024-01-09 23:18:00 +01:00
Naramsim
17f0c075ce feat: remove cli pass 2024-01-09 23:17:57 +01:00
root
5643c7e8ab chore: update gql schema 2024-01-09 22:16:33 +00:00
Naramsim
c991adfd82 chore: use image 2024-01-09 21:12:46 +01:00