search

PokeAPI / pokedex

PokeAPI's fork for adding gen-8 data.
https://github.com/PokeAPI/pokedex/tree/master-pokeapi/pokeapi
MIT License
43 stars 38 forks source link

Sync from Veekun: ability/characteristic/item #74

Closed Naramsim closed 2 years ago

Naramsim commented 2 years ago 
  22 git checkout master -- 'pokedex/data/csv/move_damage*.csv'
  23 git checkout master -- 'pokedex/data/csv/stat*.csv'
  24 git checkout master -- 'pokedex/data/csv/pokeathlon_stat*.csv'
  25 git checkout master -- 'pokedex/data/csv/abilit*.csv'
  30 git checkout master -- 'pokedex/data/csv/characteristic*.csv'
  31 git checkout master -- 'pokedex/data/csv/egg_group*.csv'
  32 git checkout master -- 'pokedex/data/csv/growth_rate*.csv'
  33 git checkout master -- 'pokedex/data/csv/item*.csv'

Resolved some Conflicts