Evan Kranzler 0656f97d7c Merge branch 'master' of https://github.com/magefree/mage into magefree-master ... # Conflicts: # Utils/mtg-cards-data.txt		2017-09-07 11:36:07 -04:00
..
abilities	Merge branch 'master' of https://github.com/magefree/mage into magefree-master	2017-09-07 11:36:07 -04:00
actions	C17 Added Alms Collector.	2017-08-28 12:44:08 +02:00
cards	xmage 1.4.26V3	2017-09-03 08:21:48 +02:00
choices	fixing choosing creature types	2017-08-02 08:04:26 +02:00
constants	Merge branch 'master' of https://github.com/magefree/mage into magefree-master	2017-09-07 11:36:07 -04:00
counters	Implemented Treasure Map/Treasure Cove	2017-08-30 21:56:45 -04:00
designations	Started to implement a solution for effects that change words in rule text.	2017-09-03 07:31:36 +02:00
filter	Started to implement a solution for effects that change words in rule text.	2017-09-03 07:31:36 +02:00
game	Implemented Fathom Fleet Captain	2017-09-06 18:04:41 -04:00
players	Merge https://github.com/magefree/mage	2017-09-02 13:03:46 +02:00
target	C17 Added Portal Mage.	2017-08-28 16:50:00 +02:00
util	Merge branch 'master' of https://github.com/magefree/mage into magefree-master	2017-09-07 11:36:07 -04:00
watchers	some cleanups	2017-09-01 22:48:42 +02:00
ConditionalMana.java	changed enum equals to ==, removed contains check for set	2017-03-07 21:47:11 +01:00
MageException.java
MageInt.java
MageItem.java
MageObject.java	Started to implement a solution for effects that change words in rule text.	2017-09-03 07:31:36 +02:00
MageObjectImpl.java	xmage 1.4.26V3	2017-09-03 08:21:48 +02:00
MageObjectReference.java	Some minor user handling changes.	2017-09-02 00:46:24 +02:00
Mana.java	Fixed that the information what mana was payed to pay the mana cost of a spell or ability were not correct if "spend mana as though" abilities were involved in the payment (fixes #3604).	2017-07-10 16:53:02 +02:00
ManaSymbol.java
ObjectColor.java	Merge pull request #3769 from Eleros/feature/HASCON2017Promos	2017-08-04 22:39:20 +02:00