Merge origin/master

This commit is contained in:
LevelX2 2016-02-16 11:33:14 +01:00
commit 129c6ca6ff
107 changed files with 5331 additions and 86 deletions

View file

@ -36,7 +36,7 @@ public class GathererSets implements Iterable<DownloadJob> {
private static final String[] withMythics = {"M10", "M11", "M12", "M13", "M14", "M15", "ORI",
"DDF", "DDG", "DDH", "DDI", "DDJ", "DDK", "DDL", "DDM", "DDN",
"DD3", "DD3B", "DDO", "DDP",
"DD3", "DD3B", "DDO", "DDP", "DDQ",
"FVD", "FVE", "FVL", "FVR",
"V12", "V13", "V14", "V15",
"ALA", "CON", "ARB",
@ -50,7 +50,8 @@ public class GathererSets implements Iterable<DownloadJob> {
"CNS", "VMA", "TPR",
"KTK", "FRF", "DTK",
"BFZ", "EXP", "OGW",
"SOI", "EMN"};
"SOI", "EMN",
"EMA"};
private static final HashMap<String, String> symbolsReplacements = new HashMap<>();
static {

View file

@ -16,6 +16,7 @@ public class MagicCardsImageSource implements CardImageSource {
private static final Map<String, String> setNameTokenReplacement = new HashMap<String, String>() {
{
put("EMA", "eternal-masters");
put("EMN", "eldritch-moon");
put("SOI", "shadows-over-innistrad");
put("OGW", "oath-of-the-gatewatch");