Samuel Sandeen 434be545f7 Merge remote-tracking branch 'magefree/master' ... # Conflicts: # Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondi tion.java # Mage/src/main/java/mage/game/permanent/PermanentToken.java		2016-09-03 20:06:33 -04:00
..
java/org/mage/test	Merge remote-tracking branch 'magefree/master'	2016-09-03 20:06:33 -04:00
resources	* Made a lot of changes to handling of continuous and triggered abilities. This should fix the problems with Mage Singletons like Flyinging / Intimidate / Reach not working. Fixed also #533 and some other problems with copy effects of cards like Clone that did not end if e.g. Clone left the battlefield.	2014-12-25 02:07:40 +01:00