Merge remote-tracking branch 'origin/master'

Conflicts:
	data/v2/build.py
This commit is contained in:
Zane Adickes 2015-04-19 22:26:20 -04:00
commit 28035e5aeb

View file

@ -11,7 +11,7 @@
# If you don't need all of the data just go into data/v2/build.py and
# comment out everything but what you need to build the tables you're looking for.
# This might be useful because some of the csv files are massive
# (pokemon_moves expecially) and it can take about 30 minutes to build everything.
# (pokemon_moves expecially) and it can take about 25 minutes to build everything.
import csv
import os