github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
18697 commits 2 branches 0 tags 782 MiB
Commit graph

18697 commits

This branch
This branch
All branches
Author SHA1 Message Date
igoudt
89b7d4e0e6 UT for #3550 2017-06-28 21:51:25 +02:00
Jeff
b39c61eff3 - Added Chaosphere, Goblin Shrine, and Kudzu. All requested. 2017-06-28 14:44:28 -05:00
LevelX2
c11d77e28e Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/HourOfDevastation.java
 2017-06-28 17:07:04 +02:00
LevelX2
886022fd19 [HOU] Added 4 cards and some fixes. 2017-06-28 17:03:26 +02:00
spjspj
54c8c86735 Merge pull request #3552 from spjspj/master 
Implement 2 cards (HOU)
 2017-06-28 22:51:29 +10:00
spjspj
afa0acd3f4 Implement 2 cards (HOU) 2017-06-28 22:50:31 +10:00
LevelX2
6a86cb6717 [HOU] Updated mtg-cards-data.txt 2017-06-28 2017-06-28 12:20:54 +02:00
LevelX2
f4d8fcece8 [HOU] Updated mtg-cards-data.txt 2017-06-28 2017-06-28 12:16:39 +02:00
spjspj
89c3a5c118 Merge pull request #3551 from spjspj/master 
Implement Avid Reclaimer (HOU)
 2017-06-28 18:41:59 +10:00
spjspj
8d91cff617 Implement Avid Reclaimer (HOU) 2017-06-28 18:41:09 +10:00
emerald000
130a123052 Remove useless parameter of ExertSourceCost. 2017-06-27 23:07:24 -04:00
igoudt
235443c04d UT for issue 3542 2017-06-27 21:26:08 +02:00
lilhomie96
892fb8c70d Merge pull request #1 from magefree/master 
a
 2017-06-27 13:50:15 -05:00
LevelX2
feec4269eb Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/HourOfDevastation.java
 2017-06-27 17:37:37 +02:00
LevelX2
e6ce3e168a [HOU] Added 4 white cards and some fixes. 2017-06-27 17:29:51 +02:00
spjspj
5a7a9049d9 Merge pull request #3549 from spjspj/master 
Implement The Locust God (HOU)
 2017-06-27 21:33:21 +10:00
spjspj
6d35de829f Implement The Locust God (HOU) 2017-06-27 21:32:14 +10:00
spjspj
d95bd421fc Implement The Locust God (HOU) 2017-06-27 21:16:27 +10:00
spjspj
41af09f43c Merge pull request #3548 from spjspj/master 
Implement full art basics (HOU)
 2017-06-27 20:23:09 +10:00
spjspj
34bde8a61a Implement full art basics (HOU) 2017-06-27 20:21:33 +10:00
lilhomie96
de530f3025 eighth edition box set 2017-06-27 01:33:59 -05:00
lilhomie96
ff5ce7fea0 Delete EighthEditionBox.java 2017-06-26 22:42:26 -05:00
lilhomie96
0a9ac8663d Delete EighthEditionBox.java 2017-06-26 22:17:42 -05:00
lilhomie96
f8465d3671 eighth edition box set 
7 cards
 2017-06-26 22:10:29 -05:00
lilhomie96
5131aedebe eighth edition box set 2017-06-26 22:05:56 -05:00
fireshoes
1d183736c8 Added Vintage Cube June 2017. Added some HOU and XLN spoilers to mtg-cards-data.txt. 2017-06-26 20:31:02 -05:00
LevelX2
9b31a5a7e3 Merge pull request #3516 from ruler501/summerproject 
Shortcut/Macro System
 2017-06-26 17:53:49 +02:00
spjspj
68baba1b0b Merge pull request #3543 from spjspj/master 
Implement The Scarab God (HOU)
 2017-06-26 23:17:13 +10:00
spjspj
dae7530155 Merge branch 'master' into master 2017-06-26 23:16:50 +10:00
spjspj
64524a8c18 Implement The Scarab God (HOU) 2017-06-26 23:13:48 +10:00
emerald000
9302940463 Removed typoed duplicate line from mtg-cards-data.txt. 2017-06-26 08:41:18 -04:00
emerald000
3388fce4c1 [HOU] Added Desert's Hold. 
Implemented OrCondition.
 2017-06-26 08:26:02 -04:00
emerald000
6ee570d5e7 [HOU] Added Angel of Condemnation. 
Implemented ExertSourceCost.
 2017-06-26 07:31:06 -04:00
spjspj
e683a579b3 Merge pull request #3512 from spacemoses/master 
Enhancement #3222 - Adding scroll to clipboard import in deck builder
 2017-06-25 23:16:21 +10:00
spjspj
081e2ad887 Merge pull request #3535 from spjspj/master 
Fix for The Scorpion God
 2017-06-25 22:58:51 +10:00
spjspj
2681091bf2 Implement The Scorpion God (HOU) 2017-06-25 22:57:39 +10:00
spjspj
9aa7829010 Implement The Scorpion God (HOU) 2017-06-25 22:38:08 +10:00
spjspj
e9a58a7fca Merge pull request #3534 from spjspj/master 
Implement The Scorpion God (HOU)  + Fix for Unesh
 2017-06-25 22:31:50 +10:00
spjspj
754b2bdfaf Implement The Scorpion God (HOU) + Fix for Unesh 2017-06-25 22:30:55 +10:00
spjspj
55a5c00e7f Merge pull request #3533 from spjspj/master 
mtg-cards-data - remove prepended 0s in collector number
 2017-06-25 21:42:12 +10:00
spjspj
cbb4c9e633 mtg-cards-data - remove prepended 0s in collector number 2017-06-25 21:41:29 +10:00
spjspj
9e35d41ab5 Merge pull request #3532 from spjspj/master 
2 x HOU cards
 2017-06-25 21:35:45 +10:00
spjspj
fc0b8ec9cb Merge branch 'master' into master 2017-06-25 21:35:37 +10:00
spjspj
67ce816381 Implement Unesh (HOU) 2017-06-25 21:33:06 +10:00
spjspj
cc368c3e1d Implement 2 cards from (HOU) 2017-06-25 21:31:12 +10:00
spjspj
8285f387db Implement Vizier of the True (HOU) 2017-06-25 20:09:50 +10:00
spjspj
e5611d1571 Merge pull request #3531 from spjspj/master 
Implement Vizier of the True (HOU)
 2017-06-25 20:07:46 +10:00
spjspj
b80aab0cfd Implement Vizier of the True (HOU) 2017-06-25 20:06:51 +10:00
LevelX2
f0dbc1da1c [HOU] Added 4 black cards. Some fixes. 2017-06-25 10:21:52 +02:00
Devon Richards
fee630a0ac Small cleanup 2017-06-24 11:23:58 -05:00