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

22608 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zzooouhh
e4f113c035
Implemented Trade Caravan and Truce 2018-01-07 16:41:06 +00:00
Zzooouhh
0faf22455a
Implemented Indentured Djinn 2018-01-07 16:40:17 +00:00
Zzooouhh
de46891d74
Implemented Indenttured Djinn 2018-01-07 16:38:12 +00:00
Zzooouhh
f1bea8ee4c
Implemented Indentured Djinn 2018-01-07 16:36:32 +00:00
Zzooouhh
a3e33b7d3f
Implemented Truce 2018-01-07 16:35:29 +00:00
Zzooouhh
ba8843115b
Implemented Trade Caravan 2018-01-07 16:34:12 +00:00
Zzooouhh
9c77a5db7a
Added currency counter 2018-01-07 16:13:34 +00:00
LevelX2
682de367a0 [RIX] Added Angrath, the Flame-Chained. Set complete! 2018-01-07 15:50:19 +01:00
LevelX2
4898c75bbd [RIX] Added 2 cards. 2018-01-07 15:19:18 +01:00
LevelX2
ca11def714 [RIX] Added 3 cards. 2018-01-07 15:05:27 +01:00
LevelX2
690c04f5fc [RIX] Added 3 cards. 2018-01-07 15:05:20 +01:00
Oleg Agafonov
453344546a
Merge pull request #4352 from Zzooouhh/Zzooouhh-rix 
[RIX] Added 4 cards
 2018-01-07 18:00:34 +04:00
Zzooouhh
590717c12e
[RIX] Added 4 cards 2018-01-07 13:38:08 +00:00
Zzooouhh
1459d8fc90
Implemented Buccaneer's Bravado 2018-01-07 13:34:25 +00:00
Zzooouhh
67f964160b
Implemented Brazen Freebooter 2018-01-07 13:32:00 +00:00
Zzooouhh
275cd90439
Implemented Aquatic Incursion 2018-01-07 13:31:27 +00:00
Zzooouhh
7f4d9087aa
Implemented Azor, the Lawbringer 2018-01-07 13:30:33 +00:00
Zzooouhh
3693f2315d
Merge pull request #35 from magefree/master 
Merge https://github.com/magefree/mage
 2018-01-07 14:28:43 +01:00
LevelX2
0e119ffa01 [RIX] Fixed set card [RIX] Added 5 cards. 2018-01-07 13:29:40 +01:00
LevelX2
e997022de6 [RIX] Fixed set card [RIX] Added 7 cards. 2018-01-07 12:25:46 +01:00
LevelX2
fafc94d4d6 [RIX] Fixed set card list. 2018-01-07 10:57:40 +01:00
LevelX2
3480d47d11 [RIX] Added 7 cards. 2018-01-07 10:54:15 +01:00
LevelX2
15081f7d0e Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-07 02:41:49 +01:00
LevelX2
0f0b1d8330 [RIX] Added 8 cards. 2018-01-07 02:33:32 +01:00
Oleg Agafonov
4255a57528 Cleanup 2018-01-07 05:02:05 +04:00
Oleg Agafonov
cae20c1a3f [RIX] Added Swaggering Corsair 2018-01-07 04:58:02 +04:00
Oleg Agafonov
1280565928 Fixed images downloading from scryfall (two sided cards) 2018-01-07 04:41:07 +04:00
Oleg Agafonov
e9bd2852e6
Merge pull request #4348 from use/master 
Added Human type to Daring Buccaneer.
 2018-01-07 04:34:26 +04:00
Will Hall
72844741da Added Human type to Daring Buccaneer. 2018-01-06 16:29:48 -08:00
Oleg Agafonov
3e7c5aee9c typos 2018-01-07 04:09:52 +04:00
Oleg Agafonov
5bcb93bec1 typos 2018-01-07 04:08:27 +04:00
Oleg Agafonov
099bba8ba9
Merge pull request #4347 from use/master 
Implemented Grasping Scoundrel.
 2018-01-07 04:07:02 +04:00
Oleg Agafonov
c4452da446
Merge branch 'master' into master 2018-01-07 04:06:17 +04:00
Oleg Agafonov
d1463d08e4
Merge branch 'master' into master 2018-01-07 04:04:47 +04:00
Oleg Agafonov
f185138fa3 [RIX] Fixed duplicated Profane Procession and card number 2018-01-07 03:59:26 +04:00
Oleg Agafonov
7df0d81ea1 [RIX] Added 6 cards 2018-01-07 03:46:28 +04:00
Oleg Agafonov
70e99e185b Updated menace and explore abilities to show or hide description 2018-01-07 03:46:07 +04:00
Will Hall
0fe8e28e5c Implemented Grasping Scoundrel. 2018-01-06 15:21:41 -08:00
LevelX2
096d020c94
Merge pull request #4346 from use/master 
Implemented Daring Buccaneer.
 2018-01-06 23:48:59 +01:00
LevelX2
5935221878 [RIX] Added 6 cards. 2018-01-06 23:47:54 +01:00
Will Hall
5437c0ef2a Implemented Daring Buccaneer. 2018-01-06 13:55:33 -08:00
LevelX2
b4f9cbd15c [RIX] Added 5 cards. 2018-01-06 22:35:39 +01:00
LevelX2
4571ab8dce [RIX] Added 5 cards. 2018-01-06 21:34:15 +01:00
LevelX2
80c0107434 [RIX] Added 5 cards. 2018-01-06 18:55:44 +01:00
LevelX2
803df371f9 [RIX] Added 4 cards. 2018-01-06 18:42:03 +01:00
LevelX2
488622662a [RIX] Added Profane Procession, Tomb of the Dusk Rose, Twilight Prophet. 2018-01-06 17:24:00 +01:00
LevelX2
509648448e [RIX] Added 2 cards. 2018-01-06 13:31:50 +01:00
LevelX2
d0fd325bfa Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/c/Cacophodon.java
	Mage.Sets/src/mage/cards/g/GiltgroveStalker.java
	Mage.Sets/src/mage/cards/h/HardyVeteran.java
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-06 12:48:46 +01:00
LevelX2
f66834fc19 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/c/Cacophodon.java
	Mage.Sets/src/mage/cards/g/GiltgroveStalker.java
	Mage.Sets/src/mage/cards/h/HardyVeteran.java
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-06 12:48:35 +01:00
LevelX2
7189cb868f [RIX] Added 9 cards. 2018-01-06 12:40:25 +01:00