Commit graph

18363 commits

Author SHA1 Message Date
spjspj
fcffb6fa7f Merge pull request #2755 from spjspj/master
Some Chat Manager updates
2017-01-08 11:58:25 +11:00
spjspj
0de89ca5b7 Some Chat Manager updates 2017-01-08 11:57:16 +11:00
LevelX2
ee203cf981 Xmage Release 1.4.20V0 2017-01-08 01:36:05 +01:00
LevelX2
13659e064c Merge origin/master 2017-01-07 23:54:00 +01:00
LevelX2
a75e4f4fcb Fixed that adding counters to players did not work correctly (e.g. Winding Constrictor). 2017-01-07 23:53:47 +01:00
LevelX2
e04e69f947 [AER] Fixed Baral Chief of Compliance triggered ability. 2017-01-07 23:52:55 +01:00
fireshoes
5b3c273da7 [AER] Fix some more card text. 2017-01-07 16:39:16 -06:00
LevelX2
491ab5fbb0 [AER] Fixed Daredevil Dragster. 2017-01-07 23:29:27 +01:00
LevelX2
9353c5aa9c [AER] Some more minor fixes. 2017-01-07 22:22:17 +01:00
LevelX2
d519aa55c1 [AER] Fixed wrong revolt tool tips. 2017-01-07 21:58:34 +01:00
LevelX2
b358597bf4 [AER] Added the last missing cards. Some fixes. 2017-01-07 21:42:29 +01:00
LevelX2
32e55a7342 Merge origin/master 2017-01-07 20:03:29 +01:00
LevelX2
c7e149904b [AER] Fixed some problems with revolt. 2017-01-07 20:03:03 +01:00
fireshoes
e42a1cd4c1 Merge origin/master 2017-01-07 12:27:08 -06:00
fireshoes
24d0353672 [AER] Edited some cards for text or other minor fixes. 2017-01-07 12:14:50 -06:00
LevelX2
2033095e3d [AER] Added 4 cards. 2017-01-07 19:12:58 +01:00
spjspj
de77a2aa84 Merge pull request #2754 from spjspj/master
spjspj - Allow appending from the clipboard in deck editor
2017-01-08 01:02:47 +11:00
spjspj
7a8055172d spjspj - Allow appending from the clipboard in deck editor 2017-01-08 01:02:01 +11:00
Styxo
9227c4615f [AER] Added some of the missing cards 2017-01-07 13:51:02 +01:00
spjspj
155bdb8a87 Merge pull request #2753 from spjspj/master
spjspj - Add 1 card [AER]
2017-01-07 22:28:59 +11:00
spjspj
d6d431d4b1 spjspj - Add 1 card [AER] 2017-01-07 22:28:26 +11:00
spjspj
508cf7eeaa Merge pull request #2752 from spjspj/master
spjspj - Add 3 cards [AER]
2017-01-07 18:38:59 +11:00
spjspj
f5f48f4833 spjspj - Add 3 cards [AER] 2017-01-07 18:37:22 +11:00
spjspj
e7e3b0c0da spjspj - Add 3 cards [AER] 2017-01-07 18:34:08 +11:00
fireshoes
216b9cb2d0 [AER] Added more cards. 2017-01-07 01:05:20 -06:00
spjspj
a5ab9316c0 Merge pull request #2751 from spjspj/master
spjspj - Add Cogwork Assembler [AER]
2017-01-07 15:54:14 +11:00
spjspj
bf4ec26861 spjspj - Add Cogwork Assembler [AER] 2017-01-07 15:52:41 +11:00
spjspj
d0898e5f6c Merge pull request #2750 from spjspj/master
spjspj - Add 2 AER cards
2017-01-07 15:40:01 +11:00
spjspj
fee6fcec78 spjspj - Add Chandra's Revolution and Bastion Inventor [AER] 2017-01-07 15:38:00 +11:00
spjspj
2d1c01fd84 Fix for github tracking issue for new cards in sets 2017-01-07 12:55:09 +11:00
spjspj
203d6eaeab Merge pull request #2749 from spjspj/master
spjspj - Fix some collector numbers
2017-01-07 12:23:48 +11:00
spjspj
2c08545c88 spjspj - Fix some collector numbers 2017-01-07 12:21:35 +11:00
spjspj
9c2506f423 Merge pull request #2748 from spjspj/master
spjspj - Fix some collector numbers
2017-01-07 12:11:32 +11:00
spjspj
db62f67d97 spjspj - Fix some collector numbers 2017-01-07 12:10:43 +11:00
Styxo
57d7140f59 [AER] Added some artifact cards 2017-01-07 01:45:57 +01:00
LevelX2
b1e65b1bb4 Merge pull request #2744 from Galatolol/master
Added 3 cards, little refactoring (Unattach cost)
2017-01-07 00:40:04 +01:00
LevelX2
db981e4b87 Merge origin/master
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
2017-01-07 00:36:35 +01:00
LevelX2
82d5e81a40 [AEN] Added missing black cards. 2017-01-07 00:29:21 +01:00
Styxo
90b3bacf6e [AER] Added rest of green cards 2017-01-07 00:26:30 +01:00
Styxo
47b9832db6 [AER] Fixed some names and cards 2017-01-06 23:17:13 +01:00
LevelX2
0094e700c9 [AEN] Removed Hidden Stocks. 2017-01-06 22:15:56 +01:00
LevelX2
7ec9394a83 Merge origin/master
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
2017-01-06 21:57:18 +01:00
LevelX2
69db775d05 [AEN] Added Hidden Stockpile. 2017-01-06 21:52:51 +01:00
Styxo
5e98860694 Merge origin/master
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
2017-01-06 21:39:37 +01:00
Styxo
7aa57cc01f [AER] Added white cards 2017-01-06 21:22:24 +01:00
fireshoes
5e8cdf546a [AER] Added some green cards. 2017-01-06 14:14:54 -06:00
LevelX2
a1a93d3691 [AEN] Winding Constrictor & Weldfast Engineer 2017-01-06 19:05:40 +01:00
Styxo
f2e9daece7 [AER] Added reprints 2017-01-06 18:26:38 +01:00
Styxo
bbecebf57b Merge origin/master 2017-01-06 18:08:23 +01:00
Styxo
928a63432c [AER] Added Skyship Plunderer and Midnight Entourage 2017-01-06 18:06:20 +01:00