Ludwig.Hirth a175ac3a1d Merge origin/master ... Conflicts: Mage.Sets/src/mage/cards/c/CogworkAssembler.java		2017-01-19 17:01:34 +01:00
..
abilityword
common	Merge origin/master	2017-01-19 17:01:34 +01:00
condition	* Some changes to EnterTheBattlefield events, some other fixes (fixes #2765).	2017-01-15 15:22:33 +01:00
costs	Big refactoring	2017-01-09 19:16:53 +03:00
decorator	* Vorinclex, Voice of Hunger - FIxed a bug that id did not work correctly with some conditional land mana sources (e.g. Gemstone Caverns).	2017-01-14 12:25:07 +01:00
dynamicvalue	[AER] Added rest of green cards	2017-01-07 00:26:30 +01:00
effects	[AER] Refactored some similar abilities and effects	2017-01-18 14:25:58 +01:00
keyword	* Some changes to EnterTheBattlefield events, some other fixes (fixes #2765).	2017-01-15 15:22:33 +01:00
mana	[AER] Added Battke at the Bridge.	2016-12-31 17:00:00 +01:00
Abilities.java	* Fixed a problem with triggered mana abilities. Fixed a problem that AI did not always select the needed mana color. Fixed a problem with Reflecting Pool not taking triggered mana abilities into account.	2016-11-03 22:37:54 +01:00
AbilitiesImpl.java	* Fixed a problem with triggered mana abilities. Fixed a problem that AI did not always select the needed mana color. Fixed a problem with Reflecting Pool not taking triggered mana abilities into account.	2016-11-03 22:37:54 +01:00
Ability.java
AbilityImpl.java	replaced enum comparison from equals to ==	2017-01-11 09:53:16 +01:00
ActivatedAbility.java	Merge	2016-10-17 23:45:47 -05:00
ActivatedAbilityImpl.java	Added Personal Incarnation	2016-11-29 20:15:02 -05:00
ActivationInfo.java	Merge	2016-10-17 23:45:47 -05:00
CompoundAbility.java
DelayedTriggeredAbilities.java
DelayedTriggeredAbility.java	Merge	2016-10-17 23:45:47 -05:00
EvasionAbility.java
LoyaltyAbility.java
MageSingleton.java
Mode.java	Fixed mode handling for modes that can be selected multiple times.	2016-10-03 19:41:46 +02:00
Modes.java	Fixed mode handling for modes that can be selected multiple times.	2016-10-03 19:41:46 +02:00
OpeningHandAction.java	* Fixed that the order of opening hand actions could not be chosen by the player.	2016-11-19 17:49:51 +01:00
PlayLandAbility.java
SpecialAction.java
SpecialActions.java
SpellAbility.java
StateTriggeredAbility.java
StaticAbility.java
TriggeredAbilities.java	Some fixes to the Monarch designation.	2016-12-07 17:14:08 +01:00
TriggeredAbility.java
TriggeredAbilityImpl.java	* Fixed a problem that optional effects could produce IndexOutOfBoundsExceptions.	2016-11-19 12:47:20 +01:00