github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2015-04-10 00:40:04 +02:00
commit 8f65053edb
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,6 @@ ddd=gvl
unh=uh unh=uh
dde=pvc dde=pvc
# Remove setname as soon as the images can be downloaded # Remove setname as soon as the images can be downloaded
ignore.urls=TOK,MMB,ORI,TPR ignore.urls=TOK,MMB,ORI
# sets ordered by release time (newest goes first) # sets ordered by release time (newest goes first)
token.lookup.order=TPR,MPRP,DD3,DDO,ORI,MMB,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=TPR,MPRP,DD3,DDO,ORI,MMB,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

40
Utils/mtg-cards-data.txt
View file

@ -26549,35 +26549,35 @@ Volrath's Laboratory|Tempest Remastered|234|R|{5}|Artifact|||As Volrath's Labora
Caldera Lake|Tempest Remastered|235|U||Land|||Caldera Lake enters the battlefield tapped.${tap}: Add {1} to your mana pool.${tap}: Add {U} or {R} to your mana pool. Caldera Lake deals 1 damage to you.| Caldera Lake|Tempest Remastered|235|U||Land|||Caldera Lake enters the battlefield tapped.${tap}: Add {1} to your mana pool.${tap}: Add {U} or {R} to your mana pool. Caldera Lake deals 1 damage to you.|
Cinder Marsh|Tempest Remastered|236|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Add {B} or {R} to your mana pool. Cinder Marsh doesn't untap during your next untap step.| Cinder Marsh|Tempest Remastered|236|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Add {B} or {R} to your mana pool. Cinder Marsh doesn't untap during your next untap step.|
City of Traitors|Tempest Remastered|237|R||Land|||When you play another land, sacrifice City of Traitors.${T}: Add {2} to your mana pool.| City of Traitors|Tempest Remastered|237|R||Land|||When you play another land, sacrifice City of Traitors.${T}: Add {2} to your mana pool.|
Forest|Tempest Remastered|266|L||Basic Land - Forest|||G|
Forest|Tempest Remastered|267|L||Basic Land - Forest|||G|
Forest|Tempest Remastered|268|L||Basic Land - Forest|||G|
Forest|Tempest Remastered|269|L||Basic Land - Forest|||G|
Island|Tempest Remastered|254|L||Basic Land - Island|||U|
Island|Tempest Remastered|255|L||Basic Land - Island|||U|
Island|Tempest Remastered|256|L||Basic Land - Island|||U|
Island|Tempest Remastered|257|L||Basic Land - Island|||U|
Maze of Shadows|Tempest Remastered|238|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Untap target attacking creature with shadow. Prevent all combat damage that would be dealt to and dealt by that creature this turn.| Maze of Shadows|Tempest Remastered|238|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Untap target attacking creature with shadow. Prevent all combat damage that would be dealt to and dealt by that creature this turn.|
Mogg Hollows|Tempest Remastered|239|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Add {R} or {G} to your mana pool. Mogg Hollows doesn't untap during your next untap step.| Mogg Hollows|Tempest Remastered|239|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Add {R} or {G} to your mana pool. Mogg Hollows doesn't untap during your next untap step.|
Mountain|Tempest Remastered|262|L||Basic Land - Mountain|||R|
Mountain|Tempest Remastered|263|L||Basic Land - Mountain|||R|
Mountain|Tempest Remastered|264|L||Basic Land - Mountain|||R|
Mountain|Tempest Remastered|265|L||Basic Land - Mountain|||R|
Pine Barrens|Tempest Remastered|240|U||Land|||Pine Barrens enters the battlefield tapped.${tap}: Add {1} to your mana pool.${tap}: Add {B} or {G} to your mana pool. Pine Barrens deals 1 damage to you.| Pine Barrens|Tempest Remastered|240|U||Land|||Pine Barrens enters the battlefield tapped.${tap}: Add {1} to your mana pool.${tap}: Add {B} or {G} to your mana pool. Pine Barrens deals 1 damage to you.|
Plains|Tempest Remastered|250|L||Basic Land - Plains|||W|
Plains|Tempest Remastered|251|L||Basic Land - Plains|||W|
Plains|Tempest Remastered|252|L||Basic Land - Plains|||W|
Plains|Tempest Remastered|253|L||Basic Land - Plains|||W|
Rootwater Depths|Tempest Remastered|241|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Add {U} or {B} to your mana pool. Rootwater Depths doesn't untap during your next untap step.| Rootwater Depths|Tempest Remastered|241|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Add {U} or {B} to your mana pool. Rootwater Depths doesn't untap during your next untap step.|
Salt Flats|Tempest Remastered|242|U||Land|||Salt Flats enters the battlefield tapped.${tap}: Add {1} to your mana pool.${tap}: Add {W} or {B} to your mana pool. Salt Flats deals 1 damage to you.| Salt Flats|Tempest Remastered|242|U||Land|||Salt Flats enters the battlefield tapped.${tap}: Add {1} to your mana pool.${tap}: Add {W} or {B} to your mana pool. Salt Flats deals 1 damage to you.|
Scabland|Tempest Remastered|243|U||Land|||Scabland enters the battlefield tapped.${tap}: Add {1} to your mana pool.${tap}: Add {R} or {W} to your mana pool. Scabland deals 1 damage to you.| Scabland|Tempest Remastered|243|U||Land|||Scabland enters the battlefield tapped.${tap}: Add {1} to your mana pool.${tap}: Add {R} or {W} to your mana pool. Scabland deals 1 damage to you.|
Skyshroud Forest|Tempest Remastered|244|U||Land|||Skyshroud Forest enters the battlefield tapped.${tap}: Add {1} to your mana pool.${tap}: Add {G} or {U} to your mana pool. Skyshroud Forest deals 1 damage to you.| Skyshroud Forest|Tempest Remastered|244|U||Land|||Skyshroud Forest enters the battlefield tapped.${tap}: Add {1} to your mana pool.${tap}: Add {G} or {U} to your mana pool. Skyshroud Forest deals 1 damage to you.|
Stalking Stones|Tempest Remastered|245|U||Land|||{tap}: Add {1} to your mana pool.${6}: Stalking Stones becomes a 3/3 Elemental artifact creature that's still a land.| Stalking Stones|Tempest Remastered|245|U||Land|||{tap}: Add {1} to your mana pool.${6}: Stalking Stones becomes a 3/3 Elemental artifact creature that's still a land.|
Swamp|Tempest Remastered|258|L||Basic Land - Swamp|||B|
Swamp|Tempest Remastered|259|L||Basic Land - Swamp|||B|
Swamp|Tempest Remastered|260|L||Basic Land - Swamp|||B|
Swamp|Tempest Remastered|261|L||Basic Land - Swamp|||B|
Thalakos Lowlands|Tempest Remastered|246|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Add {W} or {U} to your mana pool. Thalakos Lowlands doesn't untap during your next untap step.| Thalakos Lowlands|Tempest Remastered|246|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Add {W} or {U} to your mana pool. Thalakos Lowlands doesn't untap during your next untap step.|
Vec Townships|Tempest Remastered|247|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Add {G} or {W} to your mana pool. Vec Townships doesn't untap during your next untap step.| Vec Townships|Tempest Remastered|247|U||Land|||{tap}: Add {1} to your mana pool.${tap}: Add {G} or {W} to your mana pool. Vec Townships doesn't untap during your next untap step.|
Volrath's Stronghold|Tempest Remastered|248|M||Legendary Land|||{T}: Add {1} to your mana pool.${1}{B}, {T}: Put target creature card from your graveyard on top of your library.| Volrath's Stronghold|Tempest Remastered|248|M||Legendary Land|||{T}: Add {1} to your mana pool.${1}{B}, {T}: Put target creature card from your graveyard on top of your library.|
Wasteland|Tempest Remastered|249|R||Land|||{tap}: Add {1} to your mana pool.${tap}, Sacrifice Wasteland: Destroy target nonbasic land.| Wasteland|Tempest Remastered|249|R||Land|||{tap}: Add {1} to your mana pool.${tap}, Sacrifice Wasteland: Destroy target nonbasic land.|
Plains|Tempest Remastered|250|L||Basic Land - Plains|||W|
Plains|Tempest Remastered|251|L||Basic Land - Plains|||W|
Plains|Tempest Remastered|252|L||Basic Land - Plains|||W|
Plains|Tempest Remastered|253|L||Basic Land - Plains|||W|
Island|Tempest Remastered|254|L||Basic Land - Island|||U|
Island|Tempest Remastered|255|L||Basic Land - Island|||U|
Island|Tempest Remastered|256|L||Basic Land - Island|||U|
Island|Tempest Remastered|257|L||Basic Land - Island|||U|
Swamp|Tempest Remastered|258|L||Basic Land - Swamp|||B|
Swamp|Tempest Remastered|259|L||Basic Land - Swamp|||B|
Swamp|Tempest Remastered|260|L||Basic Land - Swamp|||B|
Swamp|Tempest Remastered|261|L||Basic Land - Swamp|||B|
Mountain|Tempest Remastered|262|L||Basic Land - Mountain|||R|
Mountain|Tempest Remastered|263|L||Basic Land - Mountain|||R|
Mountain|Tempest Remastered|264|L||Basic Land - Mountain|||R|
Mountain|Tempest Remastered|265|L||Basic Land - Mountain|||R|
Forest|Tempest Remastered|266|L||Basic Land - Forest|||G|
Forest|Tempest Remastered|267|L||Basic Land - Forest|||G|
Forest|Tempest Remastered|268|L||Basic Land - Forest|||G|
Forest|Tempest Remastered|269|L||Basic Land - Forest|||G|