Commit graph

6 commits

Author SHA1 Message Date
Lynn "Zhorken" Vaughan
d3693319f1 Add Conquest gallery order. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan
b8ece53720 Merge master branch into branch 'black-and-white-2'
Conflicts:
	pokedex/data/csv/pokemon_forms.csv
	pokedex/data/csv/pokemon_species.csv
2012-06-21 14:21:11 -04:00
Lynn "Zhorken" Vaughan
ec048f3221 Add and populate pokemon_species.order. 2012-06-06 23:32:10 -04:00
Lynn "Zhorken" Vaughan
1f6191ca51 Add new forms with dummy types and stats. 2012-06-06 21:24:21 -04:00
Petr Viktorin
11a65761e7 Oops, forgot to normalize the CSVs with a load/dump 2011-05-06 12:26:16 +03:00
Petr Viktorin
24b0862c32 Pokemon species split: Automatic data changes 2011-05-02 01:12:03 +03:00