Evan Kranzler 0656f97d7c Merge branch 'master' of https://github.com/magefree/mage into magefree-master ... # Conflicts: # Utils/mtg-cards-data.txt		2017-09-07 11:36:07 -04:00
..
main	Merge branch 'master' of https://github.com/magefree/mage into magefree-master	2017-09-07 11:36:07 -04:00
test/java/mage	changed cardtype from list to enumset	2017-03-03 17:04:32 +01:00