LevelX2 2429425fd2 Merge origin/master ... Conflicts: Mage.Sets/src/mage/cards/s/SalvageTrader.java Mage.Sets/src/mage/cards/t/ThermalDetonator.java		2018-08-15 10:51:21 +02:00
..
basiclands	remove all MIT copyright notices from files	2018-06-02 17:59:49 +02:00
decks	replaced apostrophes	2018-06-06 22:39:16 -04:00
mock	remove all MIT copyright notices from files	2018-06-02 17:59:49 +02:00
repository	Merge origin/master	2018-08-15 10:51:21 +02:00
ArtRect.java	* Correct type line rendering for split cards with different types on each half.	2017-04-04 21:58:52 -06:00
Card.java	add isOwned and isControlled methods. remove some null-checks, remove some unnecessary casts	2018-07-04 14:24:11 +02:00
CardGraphicInfo.java	* Workaround to fix problem with deck layout.	2016-10-08 19:03:09 +02:00
CardImpl.java	Reverted 7092d16c5d	2018-08-01 17:46:02 -06:00
Cards.java	remove all MIT copyright notices from files	2018-06-02 17:59:49 +02:00
CardSetInfo.java	remove redundant cardgraphicinfo instances	2017-08-06 17:23:03 +02:00
CardsImpl.java	remove all MIT copyright notices from files	2018-06-02 17:59:49 +02:00
ExpansionSet.java	Update ExpansionSet.java	2018-07-31 17:24:20 +03:00
FrameStyle.java	New M15 Rendering for Unstable lands	2018-03-20 16:12:43 +11:00
LevelerCard.java	remove all MIT copyright notices from files	2018-06-02 17:59:49 +02:00
MeldCard.java	remove all MIT copyright notices from files	2018-06-02 17:59:49 +02:00
Sets.java	remove all MIT copyright notices from files	2018-06-02 17:59:49 +02:00
SplitCard.java	remove all MIT copyright notices from files	2018-06-02 17:59:49 +02:00
SplitCardHalf.java	Amonket Aftermath ability and card frame changes Completed	2017-04-04 00:29:54 -06:00
SplitCardHalfImpl.java	* Added to all toUpperCase/toLowerCase calls the Locale.ENGLISH to prevent problems with some languages (e.g. Turkish). Removed some unused import statements. (#4634).	2018-03-18 18:18:54 +01:00