Commit graph

1157 commits

Author SHA1 Message Date
Alessandro Pezzè
9825a83185
Merge branch 'master' into master 2023-04-27 18:39:07 +02:00
Alessandro Pezzè
5816a93002
Merge pull request #871 from PokeAPI/small-fixes 2023-04-27 13:35:36 +02:00
Paul Hallett
da549566d9 Copyright update, small fixes 2023-04-26 10:57:57 +12:00
Paul Hallett
da23b68a76
Merge pull request #869 from dhaber/master
Fix Tinkaton's minimum level from 28 to 38
2023-04-21 10:49:03 +12:00
dhaber
82eed2f7eb
Fix Tinkaton's minimum level from 28 to 38 2023-04-14 09:15:15 -04:00
Cyrille Legrand
7d51d6c1c8 Add French translations to encounter methods and encounter condition values
(yes, Good Rod is Super Canne, and Super Rod is Méga Canne, that’s not a mistake)
2023-04-12 16:52:51 +02:00
kittenchilly
2c61fe2d38 Update region names 2023-04-10 21:52:11 -05:00
Andrea Colangelo
222385916d Update move_names.csv 2023-03-28 10:15:10 +02:00
Alessandro Pezzè
78a030cf26
Merge pull request #858 from misterhay/master
Set is_legendary flag for Ruinous Quartet as true
2023-03-25 18:40:40 +01:00
David Hay
79e8b96bc3 Set is_legendary flag for Ruinous Quartet as true 2023-03-25 11:33:05 -06:00
Alessandro Pezzè
94aece4e69
Merge pull request #856 from SKCwillie/gen-9-egg-moves 2023-03-15 18:28:56 +01:00
Robert
a19e65442c Adding egg group information for Gen 9
data comes from reliable source and done programmatically to avoid errors. some information was reordered to stay consistent throughout.
2023-03-14 13:00:12 -05:00
Alessandro Pezzè
5bfaf4e028
Merge pull request #855 from SKCwillie/meltan-type-fix 2023-03-13 22:19:00 +01:00
SKCwillie
08061c34a4
Merge branch 'master' into meltan-type-fix 2023-03-13 15:38:19 -05:00
Alessandro Pezzè
1588e88303
Merge pull request #854 from GuikiPT/master
Update requirements.txt for virtual python enviroments
2023-03-13 20:39:48 +01:00
GuikiPT
7e28cfbe17
Update requirements.txt
Fix error when execute `make install` in virtual python enviroment
2023-03-13 17:11:25 +00:00
Robert
ebda0a4363 Added Meltan and Melmetal shape
pokemon_species.csv were missing shape information for Meltan and Melmetal. Updated to correct info and added some evolution info to Melmetal as well.
2023-03-13 10:32:55 -05:00
Alessandro Pezzè
144aaeff8e
Merge pull request #852 from WyattC16/pokemonDay2023
pokemon day 2023 new data
2023-03-04 18:14:12 +01:00
Wyatt Condon
49b219e80f update name to be consistent 2023-03-04 08:20:08 -05:00
Wyatt Condon
6acb45b22d remove blank values 2023-03-04 08:06:36 -05:00
Wyatt Condon
8bcab5c602 pokemon day 2023 new data 2023-03-04 08:01:55 -05:00
Alessandro Pezzè
602c299359
Merge pull request #851 from megane42/fix-japanese-translation-double-shock 2023-02-27 14:17:25 +01:00
megane42
c2489dfc15 Fix Japanese translation for "Double Shock"
https://bulbapedia.bulbagarden.net/wiki/Double_Shock_(move)
2023-02-27 21:38:16 +09:00
Alessandro Pezzè
2123020240
Merge pull request #847 from helblingjoel/german_sprigatito_floragato 2023-02-20 11:48:45 +01:00
Joel Helbling
c346727a75 Add German name for Floragato 2023-02-15 21:34:52 +00:00
Joel Helbling
cfea3c9af5 Add German name for Sprigatito 2023-02-15 21:34:32 +00:00
Alessandro Pezzè
14c2f06bfb
Merge pull request #843 from noc7c9/fix-incorrect-csv-formatting 2023-02-10 14:52:30 +01:00
Athir Saleem
bc23a2b86a Remove trailing commas 2023-02-10 17:18:04 +11:00
Athir Saleem
5c48ad3581 Fix unquoted string with comma 2023-02-10 17:16:26 +11:00
Alessandro Pezzè
7c8ef6571f
Merge pull request #841 from giginet/fix-japanese-move-translation 2023-02-08 22:28:55 +01:00
giginet
2756846753 Fix Japanese move translation 2023-02-09 00:30:38 +09:00
Alessandro Pezzè
77843ee3bf
Merge pull request #840 from Eldarni/master 2023-02-06 12:21:56 +01:00
Alessandro Pezzè
5b528d9e12
Merge branch 'master' into master 2023-02-06 12:15:35 +01:00
Alessandro Pezzè
adbf204c5f
chore: enable build in circleci pipeline [skip ci] 2023-02-06 12:15:23 +01:00
Alessandro Pezzè
6305602cb6
chore: add target [skip ci] 2023-02-06 12:10:08 +01:00
RickBaby
2d8ff07cbc Add evolution/family information for paldea 2023-02-05 19:27:08 +00:00
Alessandro Pezzè
00a73288d3
Merge pull request #836 from bobbyrc/paldea-locations 2023-02-02 09:50:04 +01:00
Bobby Craig
4eaa0fcd9b add paldea locations 2023-01-31 21:38:15 -05:00
Bobby Craig
c09dc0257a Merge remote-tracking branch 'upstream/master' 2023-01-31 20:50:13 -05:00
Paul Hallett
812e1074dd
Merge pull request #835 from PhilipArmstead/master
feat: updating metadata of Uproar min and max turns
2023-02-01 13:33:06 +13:00
Phil
c2a6de5d7d feat: updating metadata of Uproar min and max turns 2023-01-31 21:25:50 +00:00
Naramsim
976c1aad5f Merge branch 'master' of https://github.com/PokeAPI/pokeapi 2023-01-30 16:09:05 +01:00
Naramsim
39293d7a3f chore: new target [skip ci] 2023-01-30 16:07:34 +01:00
Alessandro Pezzè
454b3a8067
Merge pull request #830 from WyattC16/addPaldeaPokedex 2023-01-29 14:56:47 +01:00
Wyatt Condon
41e7984c03 Add Paldea Pokedex Entries 2023-01-28 08:49:10 -05:00
Alessandro Pezzè
9a937478c9
Merge pull request #826 from Pythonic-Rainbow/paldea 2023-01-27 16:28:31 +01:00
Pythonic-Rainbow
7068ef7d52
Add version names for Gen9 2023-01-25 17:12:35 +00:00
Pythonic-Rainbow
ff6981b154
Add versions and vgroup regions for actual gen9 games 2023-01-25 00:55:08 +00:00
Pythonic-Rainbow
fc4e83b1a4
Merge branch 'PokeAPI:master' into paldea 2023-01-25 00:05:34 +00:00
Alessandro Pezzè
6c3c68a91b
Merge pull request #825 from Licious17/master 2023-01-24 22:05:45 +01:00