Commit Graph

313 Commits

Author SHA1 Message Date
tritoch
3efba33849 Remove Thoughtseize from main HOU set 2017-06-22 12:54:42 -05:00
tritoch
55fe07b63b Prevent Print Error from Halt
If a unicode error happens in a debug print, program halted.
2017-06-22 12:19:20 -05:00
tooomm
5f56b74952 Update README.md with Files branch history (#45) [skip ci] 2017-06-22 11:28:16 -05:00
tooomm
498cfffe42 deploy from master branch only (#42) 2017-06-22 10:01:17 -05:00
tritoch
60279ab3f9 Error Fix (#43)
* Errors with loading input files now cause CI to fail

* Misc syntax corrections

* Images for Reason // Believe
2017-06-22 08:55:27 -05:00
tooomm
ba4fdfc9f2 missing comma (#41) 2017-06-22 08:29:11 -05:00
tritoch
82a74439b8 Syntax Fix 2017-06-22 06:28:51 -05:00
Cheldra
82ae195d31 Update cards_corrections (#38)
Planeswalker Deck Cards image source to WOTC
2017-06-21 13:34:45 -05:00
tritoch
6d21eb5ca8 Scrape MTGS for images. Fix WOTC URL (#36)
* Scrape MTGS for images

* Fix WOTC card gallery URL.

* Additional Aftermath Fixes
2017-06-21 12:44:39 -05:00
tritoch
ab75dd2104 Merge pull request #35 from tritoch/aftermath-mtgs-handling
Aftermath Handling
2017-06-21 10:13:35 -05:00
tritoch
be0a51267c Aftermath Handling
Split MTGS-sourced aftermath card text on two newlines instead of three, which will catch both
2017-06-21 10:08:03 -05:00
tritoch
82836d7141 Update old branch value 2017-06-21 09:33:13 -05:00
tritoch
3f83451020 Don't deploy non-master branches to Files branch 2017-06-21 09:25:04 -05:00
Cheldra
09b8db64aa Non-english & low-quality pic fixes (#32) 2017-06-20 16:56:50 -05:00
Cheldra
1611302326 Crook of Condemnation pic added (#30)
* Crook of Condemnation pic added

* Syntax
2017-06-20 15:00:30 -05:00
tritoch
eba81f48d7 Add try/except blocks for file loading. (#31) 2017-06-20 14:52:53 -05:00
tritoch
839ce66d3a Syntax fix 2017-06-20 13:03:07 -05:00
tritoch
64c9a15bc3 Cardfix Crook of Comdemnation --> Crook of Condemnation
http://www.mtgsalvation.com/cards/hour-of-devastation/28947-crook-of-comdemnation
2017-06-20 12:58:46 -05:00
Cheldra
6e9e0b4afa Update cards_corrections (#28)
* Update cards_corrections

* Syntax & Extra Bracket
2017-06-20 12:46:21 -05:00
tritoch
0f2d772821 Return of Corrections (#29) 2017-06-20 12:33:32 -05:00
tritoch
b471f1073d Fix Typing
Type for printing
2017-06-20 11:40:25 -05:00
tritoch
3572607c47 Merge branch 'argument-parser' into master 2017-06-20 11:35:25 -05:00
tritoch
5d48d567c3 Add command line argument parser.
Can change a preset by adding `preset=newvalue` to command line execution.
2017-06-20 11:33:07 -05:00
tritoch
75421ddd2d Add command line argument parser.
Can change a preset by adding `preset=newvalue` to command line execution.
2017-06-20 11:29:03 -05:00
tritoch
c68da7ccab Types and errorlog improvements (#26)
* Ignore corrected files in Error.
Card Type/Types detection improvement.

* Merge fix

Bad Merge Conflict Resolution
2017-06-20 09:50:16 -05:00
Cheldra
45de69d330 Using mtgs over mythic when they differ (#25)
Mtgs updates their images as higher quality pics are found
2017-06-20 09:50:01 -05:00
tritoch
47234b17d2 Corrections Post Scrape, Unicode JSON
Corrections should be after all scraping. Output files should be Unicode.
2017-06-19 20:38:12 -05:00
tritoch
45d2233058 Merge pull request #4 from Cockatrice/master
Synchronize Upstream
2017-06-19 18:57:06 -05:00
tooomm
f7e71f4ca1 full list of supported services + rephrasing (#11) [skip ci]
* full list of supported services + rephrasing

* Update README.md

* [skip ci] final wording
2017-06-19 16:23:38 -05:00
tritoch
a70b518f30 Merge pull request #19 from tritoch/split-cards-and-xml-dump
Split Card fix and XML dump
2017-06-19 16:03:50 -05:00
tritoch
4f49559751 Missed file extension 2017-06-19 15:57:11 -05:00
tritoch
8d96f7070f Merge pull request #3 from Cockatrice/master
Synchronize Upstream
2017-06-19 15:51:49 -05:00
tritoch
ba87735c6a Merge branch 'master' into split-cards-and-xml-dump 2017-06-19 15:31:35 -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
ef4f2c7377 Improved Split Card Handling. Dump XML to log. 2017-06-19 14:49:00 -05:00
tritoch
4ee8c132eb Improved Split Card Handling. Dump XML to log. 2017-06-19 14:45:32 -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