LevelX2 f95b0e6c0a Merge origin/master ... Conflicts: Mage.Sets/src/mage/sets/RivalsOfIxalan.java		2018-01-05 23:41:30 +01:00
..
abilities	[RIX] Added 4 cards.	2018-01-05 15:26:10 +01:00
actions	C17 Added Alms Collector.	2017-08-28 12:44:08 +02:00
cards	Fixed #4311: deck editor can't load decks with cards cards from Masterpiece Series Amonkhet (MPS-AKH)	2018-01-03 09:10:39 +04:00
choices	AI: fixed not working choice with key-value dialogs, random refactor	2018-01-04 00:23:20 +04:00
constants	Some rework to Framework.	2018-01-03 11:40:07 +01:00
counters	Added net counter	2018-01-01 19:09:08 +01:00
designations	[RIX] Added Vona's Hunger.	2017-12-21 17:08:24 +01:00
filter	[Rix] Added 5 cards.	2018-01-04 18:00:08 +01:00
game	Merge origin/master	2018-01-05 23:41:30 +01:00
players	Merge origin/master	2018-01-05 23:41:30 +01:00
target	updated some text and implementations	2017-10-18 14:53:30 -04:00
util	Overflow check methods in CardUtil	2017-12-23 23:01:35 +01:00
watchers	[RIX] Added 3 cards.	2018-01-02 17:47:38 +01:00
ConditionalMana.java
MageException.java
MageInt.java
MageItem.java
MageObject.java	some more changes to CDA effects, tested and working correctly	2017-10-02 16:32:36 -04:00
MageObjectImpl.java	Some minot fixes /changes.	2017-10-03 17:24:35 +02:00
MageObjectReference.java	Some minor user handling changes.	2017-09-02 00:46:24 +02:00
Mana.java	Fixed cards with any color lands produce ability:	2017-12-28 02:15:49 +04:00
ManaSymbol.java
ObjectColor.java	Merge pull request #3769 from Eleros/feature/HASCON2017Promos	2017-08-04 22:39:20 +02:00