Commit graph

1093 commits

Author SHA1 Message Date
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
Pythonic-Rainbow
b5fd0cb837
Fix main region ID for Gen9 in Generations 2023-01-24 17:25:12 +00:00
Licious17
8aa5c91d19 Add growth rate to generation 9 Pokémon 2023-01-24 17:03:51 +00:00
Naramsim
57c11f9b9f chore: update sub 2023-01-23 15:16:38 +01:00
Alessandro Pezzè
fb82697eb1
Merge pull request #823 from pebou/feature/gen-9-pokemon-name-fr-de-ko-roomaji 2023-01-17 14:58:10 +01:00
Paul-Émile Bretegnier
364a63d755
Add French, German, Korean and Roomaji Pokémon names for gen 9 2023-01-17 13:35:05 +01:00
Alessandro Pezzè
3b744a1373
Merge pull request #821 from tillfox/paldeasIdsFixing 2023-01-16 17:35:20 +01:00
tillfox
8de5b5ef21 Sorted lines of pokemon_moves.csv 2023-01-16 17:21:06 +01:00
tillfox
fa06f32ee7 Fixed pokemon_moves 2023-01-16 15:12:19 +01:00
tillfox
6f1b07c8cc Fixed wrong ids of pokemons from Scarlet and Violet games 2023-01-16 02:12:13 +01:00
Alessandro Pezzè
c04d5c906a
Merge pull request #819 from giginet/fix-item-names-id 2023-01-15 19:34:39 +01:00
Alessandro Pezzè
a29394ecf5
Merge branch 'staging' into fix-item-names-id 2023-01-15 19:34:21 +01:00
Alessandro Pezzè
65e3354938 Merge branch 'master' into staging 2023-01-15 19:33:15 +01:00