External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 14:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
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 {

1
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
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");

3
Mage.Client/src/main/resources/card-pictures-tok.txt
View file

@ -15,6 +15,9 @@
|Generate|TOK:OGW|Zombie||
#|Generate|TOK:DDQ|Angel||
#|Generate|TOK:DDQ|Human||
#|Generate|TOK:DDQ|Spirit||
#|Generate|TOK:DDQ|Zombie||
|Generate|TOK:C15|Angel||
|Generate|TOK:C15|Bear||

4
Mage.Client/src/main/resources/image.url.properties
View file

@ -64,6 +64,6 @@ ddd=gvl
unh=uh
dde=pvc
# Remove setname as soon as the images can be downloaded
ignore.urls=TOK, DDQ, EMN
ignore.urls=TOK, DDQ, EMN, EMA
# sets ordered by release time (newest goes first)
token.lookup.order=EMN,SOI,DDQ,CP,CMA,ARENA,SUS,APAC,EURO,UGIN,C15,OGW,EXP,DDP,BFZ,FVD,FVE,FVL,FVR,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC
token.lookup.order=EMA, EMN,SOI,DDQ,CP,CMA,ARENA,SUS,APAC,EURO,UGIN,C15,OGW,EXP,DDP,BFZ,FVD,FVE,FVL,FVR,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC