79 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
tritoch	8d96f7070f	Merge pull request #3 from Cockatrice/master ... Synchronize Upstream	2017-06-19 15:51:49 -05:00
tritoch	9f51dce940	Merge pull request #17 from tritoch/comment-json ... Allow comments in JSON files	2017-06-19 15:30:30 -05:00
tritoch	fbdee30d65	Improved Split Card Handling. Dump XML to log.	2017-06-19 15:20:48 -05:00
tritoch	9fbd0c37f8	Merge branch 'master' into comment-json	2017-06-19 12:23:48 -05:00
tritoch	3084417241	Merge pull request #2 from Cockatrice/master ... Synchronize Upstream	2017-06-19 12:17:24 -05:00
tritoch	6a9ef7bfd0	Merge pull request #16 from tritoch/master ... Aftermath handling for MTGS	2017-06-19 12:16:01 -05:00
tritoch	094ca85029	Allow comments in JSON files	2017-06-19 12:12:55 -05:00
tritoch	aac7664caf	Revert "Allow comments in JSON files" ... This reverts commit 9f1b096e0c.	2017-06-19 13:06:40 -04:00
tritoch	b426dc2662	Merge pull request #13 from Cheldra/patch-1 ... Fixing 3 Mythicspoiler typos	2017-06-19 12:03:58 -05:00
tritoch	f8c97d551e	Lowercase Key	2017-06-19 11:59:25 -05:00
tritoch	9f1b096e0c	Allow comments in JSON files	2017-06-19 11:55:09 -05:00
Cheldra	8cdcfa6b51	Fixing a stray comma	2017-06-19 17:48:25 +01:00
tritoch	b914c445d1	Aftermath handling for MTGS	2017-06-19 11:35:13 -05:00
Cheldra	f03a49b2bf	Using English & higher quality art	2017-06-19 17:34:46 +01:00
Cheldra	b170d6292e	Update cards_corrections.json	2017-06-19 17:28:54 +01:00
tooomm	d793ac5bbe	Merge pull request #14 from Cheldra/patch-2 ... Sunset Pyramid duplicate	2017-06-19 18:05:26 +02:00
Cheldra	5e07f55a2c	Update cards_corrections.json	2017-06-19 16:08:30 +01:00
Cheldra	1bf91f9424	Update cards_corrections.json	2017-06-19 16:08:06 +01:00
Cheldra	258384990f	Update cards_corrections.json	2017-06-19 16:01:04 +01:00
Cheldra	d83adfe084	Update cards_delete.json	2017-06-19 15:50:06 +01:00
Cheldra	71663e2adc	Fixing 3 Mythicspoiler typos	2017-06-19 15:48:55 +01:00
tritoch	edd0afdf77	Merge pull request #12 from tritoch/master ... Remove html tag from card text	2017-06-19 08:05:50 -05:00
tritoch	d4ca443300	Remove html tag from card text	2017-06-18 22:07:59 -05:00
tritoch	3aa5061712	Merge pull request #10 from tritoch/master ... Return of Split Cards. MPS set starting. Sanitize Scryfall.	2017-06-17 00:12:25 -05:00
tritoch	aa7ea2270b	Return of Split Cards. MPS set starting. Sanitize Scryfall.	2017-06-17 00:10:52 -05:00
tritoch	b6a1204c79	Travis Run	2017-06-16 23:38:39 -05:00
tritoch	534f197f18	Run Travis	2017-06-16 22:43:39 -05:00
tritoch	52b0b42cb3	Merge pull request #9 from tritoch/mythic-scraper ... Mythic scraper	2017-06-16 21:35:03 -05:00
tritoch	96da921b98	Merge remote-tracking branch 'origin/master'	2017-06-16 15:35:25 -05:00
tritoch	74f6583dd5	Merge pull request #1 from Cockatrice/master ... Synchronize with upstream	2017-06-16 15:35:10 -05:00
tritoch	45f55a8a28	Add mythicspoiler scraper	2017-06-16 15:32:45 -05:00
tritoch	3f976fe9d5	Merge pull request #8 from Cockatrice/multi-set ... Multiple Set Support	2017-06-16 15:30:47 -05:00
tritoch	f7d1f54784	Multiple Set Support	2017-06-16 09:55:45 -05:00
tritoch	4c882f3597	Nicol Bolas, the Deceiver ... http://mythicspoiler.com/hou/cards/nicolbolasthedeceiver.html Planeswalker Deck Card. Loyalty Obscured currently.	2017-06-15 11:49:12 -05:00
tritoch	eb4ef2a0c2	Drop Old Masterpieces	2017-06-13 16:30:28 -05:00
tritoch	997ef150a6	Not Full Spoil	2017-06-13 15:43:30 -05:00
tritoch	1eccb895a4	Travis Debug	2017-06-13 15:30:42 -05:00
tritoch	d9e7214540	Merge remote-tracking branch 'origin/master'	2017-06-13 15:25:28 -05:00
tritoch	f038522634	Fix XML Pretty Print	2017-06-13 15:24:59 -05:00
tritoch	cb8722fdb4	More Travis Debug	2017-06-13 15:11:05 -05:00
tritoch	38b27182a9	Create deploy.sh	2017-06-13 12:29:20 -05:00
tritoch	d36e42e35f	Travis Debug	2017-06-13 12:22:24 -05:00
tritoch	743a89070f	Travis Debug	2017-06-13 12:10:27 -05:00
tritoch	46394c63c2	Merge pull request #7 from Cockatrice/travis-debug ... Travis Debug	2017-06-13 12:03:23 -05:00
tritoch	77ca65c927	Travis Debug	2017-06-13 11:57:15 -05:00
tritoch	1aa29e4a4f	Debug PR vs Push Travis	2017-06-13 11:43:31 -05:00
tritoch	b00b8bc154	Move branch write inside calling function	2017-06-13 11:32:09 -05:00
tritoch	7bbc7bc402	Run the script for PR, just don't push it to files	2017-06-13 11:13:20 -05:00
tritoch	99055f7405	Merge pull request #6 from tritoch/travis-test-1 ... Testing Travis	2017-06-12 09:21:36 -05:00
tritoch	eefe47d7be	Testing Travis ... Testing to see if Travis builds a PR	2017-06-12 09:04:35 -05:00