Alex Vasile b3bf42389b Merge branch 'master' into fix_hints_equip ... # Conflicts: # Mage.Sets/src/mage/cards/b/BehemothSledge.java # Mage.Sets/src/mage/cards/d/DivinersWand.java # Mage.Sets/src/mage/cards/u/UmbralMantle.java # Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java # Mage.Sets/src/mage/cards/w/WandOfOrcus.java # Mage/src/main/java/mage/abilities/keyword/EquipAbility.java		2022-05-12 08:12:25 -06:00
..
abilities	Merge branch 'master' into fix_hints_equip	2022-05-12 08:12:25 -06:00
actions
cards	moved addAbilities method into the only class that uses it to make my IDE's autocomplete less annoying	2022-04-25 09:09:29 -04:00
choices
collation
constants	[NCC] Implemented Cabaretti Confluence	2022-04-24 22:37:50 -04:00
counters	[SNC] Implemented Evelyn the Covetous	2022-04-24 19:18:45 -04:00
designations	Remove obsolete adjustCosts and adjustTargets methods from MageObject interface	2022-03-12 19:01:59 -05:00
filter	[SNC] fixed Ballroom Brawlers targeting restriction (fixes #8906)	2022-05-11 19:09:27 -04:00
game	[NCC] various text fixes	2022-04-30 07:58:09 -04:00
players	[SNC] Implemented Ziatora's Envoy	2022-04-24 17:20:57 -04:00
target	[SNC] fixed NPE with Rocco, Cabaretti Caterer (fixes #8886)	2022-04-27 08:30:14 -04:00
util	(WIP) [SNC] Implemented Ob Nixilis, the Adversary (#8838)	2022-04-18 22:04:51 -04:00
watchers	Fractured powerstone (#8805)	2022-05-06 11:25:46 -05:00
ApprovingObject.java
ConditionalMana.java
Emptiable.java
MageException.java
MageIdentifier.java	[AFC] Implemented Share the Spoils (#8583)	2022-03-15 18:34:36 -04:00
MageInt.java
MageItem.java
MageObject.java	Remove obsolete adjustCosts and adjustTargets methods from MageObject interface	2022-03-12 19:01:59 -05:00
MageObjectImpl.java	Remove obsolete adjustCosts and adjustTargets methods from MageObject interface	2022-03-12 19:01:59 -05:00
MageObjectReference.java	[SNC] Implemented Evelyn the Covetous	2022-04-24 19:18:45 -04:00
Mana.java
ManaSymbol.java	[NEO] Implementing Compleated mechanic and hybrid phyrexian mana (ready for review) (#8677)	2022-02-10 10:25:23 -05:00
ObjectColor.java	Implementing Blitz mechanic (WIP) (#8835)	2022-04-24 12:03:25 -04:00