Commit graph

4752 commits

Author SHA1 Message Date
LoneFox
04e2282e82 Extract RecruiterEffect from Goblin Recruiter to its own file. Implement cards: Dwarven Recruiter and Scouting Trek 2015-12-04 12:58:59 +02:00
LevelX2
ac19cfe379 Some changes to token expansion set calculation. 2015-12-04 08:24:18 +01:00
emerald000
3dcdd7f046 Removed obsolete Zone parameter in CardsImpl constructors. 2015-12-04 00:34:10 -05:00
fireshoes
e5b4790d20 Merge origin/master 2015-12-03 16:27:30 -06:00
fireshoes
7abd1133e6 Added numerous cards, mostly from PO2 and PO3. Fixed that Suture Priest's first ability wasn't optional. Updated Adam Styborski's Pauper Cube. 2015-12-03 16:26:29 -06:00
LevelX2
eb1c738b37 * Moved some logic in a framework class. Fixed some problems of Whirlpool creatures. 2015-12-02 16:55:09 +01:00
LevelX2
87fc4d53dc Fixed Framework pom - removed fixed src folder. Minor fixes to ManaTest. 2015-12-01 22:43:56 +01:00
LevelX2
595a55b7c5 Revert "Fixed package declarations for moved Mage package."
This reverts commit 06199eeca3.
2015-12-01 22:33:59 +01:00
poixen
db2af7000e Merge pull request #1399 from poixen/counters
Added unit tests and javadoc for Counter class.
2015-12-01 20:04:15 +01:00
emerald000
7abfc7d025 File that wanted to feel special and not be part of last commit. 2015-12-01 06:16:00 -05:00
emerald000
06199eeca3 Fixed package declarations for moved Mage package. 2015-12-01 06:07:01 -05:00
poixen
ad0fb6b7eb Added unit tests and javadoc for Counter class. 2015-11-30 21:44:57 +01:00
poixen
46eb6c0525 Restructured Mage module 2015-11-29 21:56:49 +01:00
poixen
409e66a2e9 Removed mutable public static mana 2015-11-29 20:12:39 +01:00
Neil Gentleman
7996d02b1a add Accelerated Mutation, Torrent of Fire, et al.
using new HighestConvertedManaCostValue
2015-11-28 21:11:56 -08:00
Neil Gentleman
bfb428b13a always use log4j
removed all references to mage.util.Logging, java.util.logging

transient static doesn't mean anything, since static fields are never
included in serialization
2015-11-28 21:11:25 -08:00
Quercitron
b9add2e041 * Turntimber Basilisk - Fix a bug when a creature that must be blocked is not attacking 2015-11-29 00:19:21 +03:00
LevelX2
d94a2712ba * Fixed a bug that a dies ability did still trigger as the stack was not cleared meanwhile. 2015-11-28 12:52:13 +01:00
poixen
b22036c041 added javadoc and final modifiers 2015-11-28 11:57:46 +01:00
LevelX2
cb4f996bce * Fixed a problem were Menace restriction could be bypassed by using Undo Block action. 2015-11-27 20:23:04 +01:00
LevelX2
121e55f1d7 * Fixed a problem with calculation of playable lands. 2015-11-27 20:21:48 +01:00
LevelX2
f23756c20b * Fixed that DiesThisOrAnotherCreatureTriggeredAbility did not work if the source died itself (e.g. Omnath, Locus of Rage). 2015-11-27 12:27:46 +01:00
LevelX2
123afcb44c * Some minor tooltip rule text fixes. 2015-11-26 22:57:42 +01:00
LevelX2
0b832c9b11 * Fixed a bug of cost reduction calculation. 2015-11-26 22:56:42 +01:00
LevelX2
eb6a5e7dcb * Some rework of play card effects. 2015-11-26 17:06:50 +01:00
LevelX2
780702be1b * Fixed some problems with replaced play land special action. 2015-11-26 10:48:40 +01:00
LevelX2
e51c4d5f67 * Fixed a bug where wrongly a card object was moved for a copied spell. 2015-11-26 00:48:28 +01:00
poixen
c0ee279da9 methods now access and set state directly, rather than through the API, which is meant to prevent accidently setting minus values 2015-11-25 23:12:23 +01:00
poixen
3ffb11d2e9 Updated mana class to pass failing tests 2015-11-25 19:57:11 +01:00
LevelX2
fbb3929d0a * Fixed some adjustTargets methods of cards were that the target adjustment could be applied to abilities not intended (fixes #1384). 2015-11-25 16:30:18 +01:00
LevelX2
b637d2c65c * Fixed layer problem of BecomesCreatureSourceEffect (causes Chimeric Mass to die after entering the Battlefield). 2015-11-25 14:51:41 +01:00
Neil Gentleman
12b6a22327 improve Devotion formatting
fixes Aspect of Hydra, Evangel of Heliod
2015-11-25 00:32:02 -08:00
Neil Gentleman
19a0e1dcc4 correct grammar, remove duplicate parentheses 2015-11-25 00:32:02 -08:00
Neil Gentleman
b1cc464d98 remove useless .toString() 2015-11-25 00:32:01 -08:00
Neil Gentleman
f83cb32ed3 don't use <i/> to end italic text
it's not correct html, and causes all following text to render italic.

only visible on a few cards, because reminder text typically comes at
the end of line.
2015-11-25 00:32:00 -08:00
fireshoes
692c7d2812 Added some POR cards and a few misc cards. Fixed POR collector's numbers. 2015-11-25 01:07:43 -06:00
LevelX2
8b3958f7d5 Merge pull request #1385 from LoneFox78/master
Some Coldsnap
2015-11-24 09:09:21 +01:00
LoneFox
6b345fb291 Snow mana symbol is {S}, not {snow} 2015-11-23 16:47:16 +02:00
LevelX2
be49cfc561 * Myriad - Fixed that wrongly also a token was created for the defending player. 2015-11-23 12:24:46 +01:00
Neil Gentleman
230d1d37bd fix Grinning Totem, Thada Adel, Commune with Lava
opponent was able to cast the exiled cards

also changed Knacksaw Clique to use the same templating as Ornate Kanzashi
2015-11-22 18:40:38 -08:00
Neil Gentleman
a90d0e5597 reuse shared code for picking basic land sets 2015-11-22 18:00:10 -08:00
LoneFox
4214ef94b0 Fix the text of ripple abilities 2015-11-22 20:10:39 +02:00
LevelX2
05dd1daee6 * Added some information to the player tooltip in game (expericence counters, deck hash code, # of wins). 2015-11-22 11:07:48 +01:00
Neil Gentleman
038d02e8d7 add test for non-standard booster generation 2015-11-21 18:35:10 -08:00
LevelX2
96bc3172f5 * Fixed a problem of returning cards from exile (e.g. Fiend Hunter) if the triggering permanent made multiple zone changes before the left battlefield triggered ability resolved to return the exiled permanents. 2015-11-21 23:41:41 +01:00
poixen
b0da2f2260 Merge pull request #1378 from poixen/mana_cleanup
Removed minus subtraction limits
2015-11-21 12:06:02 +01:00
poixen
a5242ff087 resolved conflicts 2015-11-21 12:02:55 +01:00
poixen
5c6bdfceb8 Merge pull request #1379 from poixen/manasymbol
Manasymbol
2015-11-21 11:47:28 +01:00
emerald000
59fabeee20 Added missing Scion subtype. 2015-11-20 17:42:14 -05:00
poixen
f2972c5b8e Updated Phyrexian Mana
+ “A Phyrexian mana symbol represents a cost that can be paid either
with *one mana of its color* or by paying 2 life”. These symbols are
mono colored, as such I have made them so.
+ Added test cases for phyrexian mana symbols
2015-11-20 22:43:26 +01:00
poixen
de13fb5cba Removed redundant modifiers
+ Removed the private modifiers. They are not needed in an ENUM class.
2015-11-20 22:08:39 +01:00
poixen
f34e69308e Updated mono colored hybrid mana type
+ “107.4e. Hybrid mana symbols are also colored mana symbols.” I have
added the Type COLORED to each mono hybrid symbol
+ added tests for hybrid mana symbols
2015-11-20 22:07:24 +01:00
poixen
f6cc03ec44 Added W mana test case
Added U mana test case
Added B mana test case
Added R mana test case
Added G mana test case
2015-11-20 20:59:52 +01:00
poixen
56be135532 Removed minus subtraction limits
+ Removed minus subtraction limits to allow other areas of code to work
2015-11-20 17:22:48 +01:00
LevelX2
8a133a43d0 Added test for Mana.enough method. 2015-11-20 15:06:00 +01:00
Quercitron
7e58dc70d5 Update Swiss tournament pairing - For the last round, for each unpaired player pair against the highest ranked player they haven't played against 2015-11-20 02:54:50 +03:00
LevelX2
c4ab5806e0 Revert "Mana Class Overhaul" 2015-11-19 22:59:57 +01:00
LevelX2
68ff09c219 Revert "Mana updates" 2015-11-19 22:59:15 +01:00
LevelX2
f4871fe489 Merge pull request #1375 from poixen/mana_cleanup
Mana updates
2015-11-19 22:37:14 +01:00
poixen
05b841577a added subtraction logic to enough()
+ added subornation logic to enough(). We do not want to mix the public
subtract() call with this method. As doing so would mean that either a)
subtraction can go below 0 (this should not happen) or b) we break this
function with exceptions. This is a work around for these scenarios.
2015-11-19 17:42:59 +01:00
poixen
2c617a6aaf Mana updates
+ calling subtraction will now throw an exception if you try and use
more mana than is available. This is better than setting it to 0.
Setting to 0 impose that you should still be allowed to perform the
action.
+ updated subtraction test to check for exception
+ subtractionCost() will not allow using mana that is not available,
same as subtract()
2015-11-19 17:09:40 +01:00
LevelX2
ec7c888044 Some fixes to put token onto battlefield handling of cards. Some minor reworks. 2015-11-19 15:52:45 +01:00
LevelX2
7bb5d1bb43 Merge pull request #1374 from poixen/mana_cleanup
Mana Class Overhaul
2015-11-19 14:37:39 +01:00
Quercitron
486d547f5e Fix Swiss pairing for the case when some players have left the tournament 2015-11-19 13:18:43 +03:00
poixen
1f5638539f Class Overhaul
+ added javadoc
+ added final to method variables that should not be mutated
+ Mana can no longer be initialised with minus values
+ added null assertions
+ renamed ‘addXXX’ to ‘increaseXXX’. Add implies that you are able to
add variable amounts.
+ subtraction can no longer allow minus values.
+ removed unused state
+ refactored classes use renamed/removed mana calls
+ added comment to contains(), needs to be looked into?
+ Added validation to setting of mana. Can no longer be set to minus
values. Will log if an attempt is made
+Added comment to static mana, this is unsafe.
2015-11-19 09:53:52 +01:00
Neil Gentleman
00ec431889 add Gorgon Recluse, cleanup similar cards
Added filtering to BlocksOrBecomesBlockedByCreatureTriggeredAbility,
so that non-wall and color-specific basilisks could reuse it.

Simic Basilisk and Deathgazer were incorrectly destroying the creature
immediately, not at end of combat.
2015-11-18 21:05:14 -08:00
Quercitron
05a789cd8b Use approach with minimal weight matching to determine Swiss tournament pairings 2015-11-19 02:58:02 +03:00
LevelX2
9b074876db Merge origin/master 2015-11-19 00:42:45 +01:00
LevelX2
fd0d9c166d [C15] Added Mizzix's Mastery, Mirror Match and Synthetic Destiny. 2015-11-19 00:39:43 +01:00
Fiorden
3991ec4ba0 Merge pull request #1 from magefree/master
testing update
2015-11-18 21:05:09 +01:00
Fiorden
bfb7d06cae Fixed that Mountain subtype was not remowed by Spreading Seas, Sea's Claim 2015-11-18 20:05:06 +01:00
LevelX2
dcf3ac87f1 [C15] Added Deadly Tempest and Dread Summons. 2015-11-18 20:04:00 +01:00
LevelX2
7044e58231 [C15] Added Scourge of Nel Toth. 2015-11-18 17:39:32 +01:00
LevelX2
bfb54ca112 * Deflecting Palm - Fixed a bug that the to the source controller redirected damage of Deflecting Palm could not be redirected to an existing planeswalker of that controller. 2015-11-18 17:38:48 +01:00
Neil Gentleman
1750bf32a1 fix Seance
Spirit subtype wasn't being added, and the token shouldn't have haste
2015-11-17 23:36:06 -08:00
LevelX2
1d590442d0 [C15] Added Awaken the Sky Tyrant and Dream Pillager. 2015-11-15 20:05:58 +01:00
LevelX2
160f14eed1 [C15] Oreskos Explorer, Bastion Protector and Dawnbreak Reclaimer. 2015-11-15 18:54:26 +01:00
LevelX2
d3751af0db [C15] Added Skullwinder and Ezuri's Predation. 2015-11-15 11:10:52 +01:00
LevelX2
576a9ea74f Updated mtg-cards-data.txt. Added a land deck for Mormir Basic format. 2015-11-15 10:25:02 +01:00
LevelX2
dd28bb18c4 * Untap symbol - Fixed that the creature has to be under your control since the start of the last turn or needs to have haste to be able to pay the untap cost (e.g. Pili-Pala). 2015-11-14 11:46:23 +01:00
LevelX2
d3000da3a3 * Void Winnower - Fixed that the check for even casting costs did not work correctly. 2015-11-14 11:14:50 +01:00
LevelX2
50b5602459 * Conflagrate - Fixed that the damage amount could be calulated if cast by flashback. 2015-11-14 10:01:13 +01:00
LevelX2
1335d58e77 * Collapsing Borders - Fixed that it did not give life to players. 2015-11-14 02:33:24 +01:00
LevelX2
4711e0cf99 Changed ability handling of modal spells to be able to select the same mode multiple times with different targets. 2015-11-14 01:56:56 +01:00
LevelX2
ae3640557a Merge pull request #1361 from nigelzor/vanguard
add Momir Basic game type
2015-11-12 04:00:27 -05:00
Neil Gentleman
c5ecb26289 Momir: lookup token at activation
loading all the cards at game start is quite slow
2015-11-11 12:55:49 -08:00
Neil Gentleman
cda5a06a6c fix sorcery-speed LimitedTimesPerTurnActivatedAbility
calling super.canActivate() from inside activate() will always fail,
because the stack is no longer empty
2015-11-11 12:31:42 -08:00
LoneFox
70f77b858e Rename BecomesTappedCreatureControlledTriggeredAbility -> BecomesTappedTriggeredAbility and generalize it to allow all kinds of permanent fiilters instead of just controlled creatures. Implement cards: Lifeblood and Lifetap 2015-11-11 10:18:49 +02:00
LoneFox
f133854db1 Rename BecomesTappedTriggeredAbility -> BecomesTappedSourceTriggeredAbility 2015-11-11 09:49:25 +02:00
LoneFox
2c23d23566 Fix PlayWithTheTopCardRevealedEffect's text. Implement cards: Field of Dreams and Wizened Snitches 2015-11-10 21:11:11 +02:00
LoneFox
c33e7ad59b Add support for selecting the counter type during resolution to RemoveCounterTargetEffect. Use it for existing cards. Fix some tooltip text issues with the effect. Implement cards: Ferropede and Spinal Parasite 2015-11-10 20:35:48 +02:00
LevelX2
932b454595 * Myriad - Fixed handling of source object determination. 2015-11-09 14:25:42 +01:00
Neil Gentleman
eda5d1a1ef BoostSourceEffect: format X like BoostTargetEffect
primarily to fix Chameleon Colossus and friends, but also updated
Terra Ravager's ability to match the corrected format, and now
both Source and Target support -X, for Death's Shadow.
2015-11-08 22:14:15 -08:00
LevelX2
431d0005f2 Updated modes to handle selection of modes multiple times (not working yet if targets included). 2015-11-08 20:07:02 +01:00
Quercitron
9b29cd042f Move updateExpansionSetCode from CreateTokenEffect.apply to Token.putOntoBattlefield 2015-11-08 20:16:47 +03:00
Quercitron
e23fc13db0 Fix pictures for some tokens from recent sets 2015-11-08 20:16:47 +03:00
LevelX2
6f2d3a18c0 [C15] Added Myriad keyword. 2015-11-08 11:51:36 +01:00
LevelX2
7572c756c4 * PlanarGate, Mana Matrix, StoneCalendar - Fixed not correctly working spell cost reduction. 2015-11-08 09:57:35 +01:00
fireshoes
4de4caad26 [C15] Implemented Shielded by Faith, Grasp of Fate, Arachnogenesis, and Great Oak Guardian. 2015-11-07 21:18:21 -06:00
LevelX2
5702c694a9 * Fixed that the corresponding token image was not always set correctly. 2015-11-07 21:23:22 +01:00
LevelX2
f3e8a93316 * Renegade Krasis - Fixed that check if Renegade Krasis was evolved did not always work correctly. 2015-11-07 21:21:03 +01:00
LevelX2
d596a1ef83 * Fixed a bug that self scope were checked for non relevant events (fixes #1350). 2015-11-07 13:32:15 +01:00
LevelX2
b1c3d690f5 * Fixed some ability and subtype removing effects (fixes #1352). 2015-11-07 12:29:31 +01:00
LevelX2
bb99148b78 * Fixed a problem with zone change counter comparation. 2015-11-07 10:16:11 +01:00
fireshoes
ae55c8b176 [C15] Updated complete spoiler and added existing reprints. Add Rite of the Raging Storm and Corpse Augur. 2015-11-06 12:35:50 -06:00
LevelX2
e3c43c0c31 Merge origin/master 2015-11-06 12:30:15 +01:00
LevelX2
27ae613ce8 * Fixed handling of zoneChangeCounter of PermanentCard (fixes #1353). 2015-11-06 12:28:58 +01:00
LevelX2
e6860a6020 Merge pull request #1357 from LoneFox78/master
Some Tempest
2015-11-06 12:09:52 +01:00
LoneFox
fde9ae68dc Extract DestroyTargetAtBeginningOfNextEndStepEffect from Stone Giant to its own file. Implement cards: Blood Frenzy, Flowstone Sculpture, Imps' Taunt, and Mogg Cannon 2015-11-06 09:19:47 +02:00
LevelX2
e82a7b621e * Fixed a problem with countering abilities on the stack. 2015-11-05 15:39:12 +01:00
LevelX2
3de7ff6808 * Some rework of card moving after spell countering. 2015-11-05 00:37:30 +01:00
LevelX2
1139495fd7 * SetPowerToughnessSourceEffect - Set the correct sublayer to use (fixes #1354). 2015-11-04 22:31:35 +01:00
LoneFox
2080ad3ab8 Add CastOnlyIfYouHaveCastAnotherSpellEffect and use it for existing cards. Implement card: Skyshroud Condor 2015-11-04 10:40:07 +02:00
LoneFox
9e3ef31b4b Implement cards: Apes of Rath, Endless Scream, Fool's Tome, and Fylamarid 2015-11-04 09:29:08 +02:00
BursegSardaukar
3376f418c6 Pulled from trunk. 2015-11-01 16:42:44 -05:00
BursegSardaukar
6807496357 Corrected bug with copy/paste 2015-10-04 21:32:40 -04:00
BursegSardaukar
8afc24ae15 Added the effect to allow for future card usage. 2015-10-04 16:10:52 -04:00
LevelX2
abca80e951 * Cascade - Fixed that the remaining cards were not set to graveyard in a random order. 2015-10-02 15:05:00 +02:00
LevelX2
cc8c650285 * Iname as One - Fixed that it was able to return itself. 2015-10-02 08:40:26 +02:00
LevelX2
73766a21eb * Fixed that the token image of Kithkin Solder was not shown (token was only named Kithkin instead of Kithkin Solder). 2015-10-02 01:37:15 +02:00
LevelX2
5912ed80ad * Fixed some problems with undo/cancel action (fixes #1267). 2015-10-02 01:04:40 +02:00
LevelX2
8044940a97 * Fixed a bug that if all targets (if targets were set) of a spell with an up to target definition (e.g. Adverse Conditions) became illegal the spell did not fizzle as it should. 2015-09-30 00:53:33 +02:00
LevelX2
f5b411c516 Merge pull request #1292 from LoneFox78/master
Third part of the big token cleanup + a few other fixes and new cards
2015-09-29 15:48:09 +02:00
LoneFox
ab0e4b0ddc Revert connectSource changes from TapTargetEffect. Not needed anymore. 2015-09-29 15:25:52 +03:00
LoneFox
705bdabafb Much simpler way to implement DontUntapAsLongAsSourceTappedEffect.
This also works correctly when the source permanent untaps and then taps again.
2015-09-29 15:11:01 +03:00
LoneFox
82f2d73fb9 Add DontUntapAsLongAsSourceTappedEffect and connectSource parameter to TapTargetEffect. Use them for existing cards. Implement card: Thalakos Dreamsower 2015-09-29 13:15:09 +03:00
LoneFox
6d90539b7b Fix DealsDamageToOpponentTriggeredAbility unconditionally overwriting the targets of any effects added to it.
This fixes at least Charnelhoard Wurm, and possibly other similar abilities.
2015-09-29 12:19:50 +03:00
LevelX2
8f086c8c7e * Maelstrom Nexus - Fixed that the compared casting cost was always 5 instead of the casting cost of the spell that got Cascade. 2015-09-29 00:37:52 +02:00
LevelX2
707358f875 Fixed a bug that effects forcing creatures to block an attacker forced also creatures of players not attacked (multiplayer games) to block, locking the game UI. 2015-09-29 00:36:08 +02:00
LevelX2
7650f53dee * Rosheen Meanderer - Fixed that the created conditional mana could only be used for spells. 2015-09-27 10:29:30 +02:00
LevelX2
b6f6866452 * Krond the Dawn-Clad - Added the missing vigilance ability. 2015-09-27 00:34:10 +02:00
LevelX2
46fa935172 * Emrakul, the Aeons Torn, Ulamog, the Infinite Gyre, Kozilek, Butcher of Truth - Fixed that the shuffle graveyard to library was wrongly done for the controller of instead the owner. 2015-09-27 00:22:51 +02:00
LevelX2
56a5030f93 * Goryo's Vengeance - Fixed that the beginning of next end step ability also exiled the target if it meanwhile left and returned the battlefield as sa new object. 2015-09-26 23:30:24 +02:00
LoneFox
a2e1e2e614 Remove some unneeded imports and fix an incorrect set code 2015-09-26 13:31:40 +03:00
LoneFox
c47d39390f Add 4/4 Beast token and use it for existing cards. 2015-09-26 12:09:00 +03:00
LoneFox
e16bec3472 Add 5/5 Wurm token with trample and use it for existing cards. 2015-09-26 11:50:41 +03:00
LoneFox
b64c495212 Fix a copy-paste error 2015-09-26 11:44:59 +03:00
LoneFox
4e5bcddd56 Add 5/5 Dragon token and use it for existing cards. 2015-09-26 11:44:03 +03:00
LoneFox
54acb445db Add Goblin token with haste and use it for existing cards. Add missing images for Goblin token. 2015-09-26 11:18:15 +03:00
LoneFox
06440fd606 Add red and white Soldier token with haste and use it for existing cards. Kill unnecessary custom effect from Assemble the Legion. 2015-09-26 10:35:31 +03:00
LoneFox
66a341e1a2 Add Bird token and use it for existing cards. 2015-09-26 10:09:34 +03:00
LevelX2
6119f71022 * Added the text (to sacrifice) for selections done for sacrifice costs so the player can better distinguish what object to select currently. 2015-09-25 23:15:55 +02:00
LevelX2
85cec315db * Fixed a lot of cards with return permanent to hand costs, where the selection of the permanent was handled targeted. 2015-09-25 22:32:53 +02:00
LevelX2
28b575cf37 * Ninjutsu - Fixed that the selection of the unblocked attacker was not handled untargeted (so shroud on a creature did prevent to be able to select it). 2015-09-25 22:15:13 +02:00
LevelX2
c7edbbac5b * Fixed a bug that automatically pass priority after putting an activated ability to stack passed to next phase if the ability was not put on the stack (e.g. Suspend). 2015-09-25 22:04:49 +02:00
LoneFox
0ebd773caf Merge branch 'master' of https://github.com/magefree/mage 2015-09-25 20:51:29 +03:00
LoneFox
71e8d90c83 Implement cards: Circle of Protection: Shadow, Faceless Devourer, Stronghold Overseer, and Thalakos Mistfolk 2015-09-25 07:20:33 +03:00
LevelX2
3bb7b6dd5b * Slab Hammer - Removed unneccessary target. 2015-09-25 00:21:29 +02:00
LevelX2
b2cc5b59c6 * Brutal Expulsion - Fixed that the spell could wrongly target itself on the stack. 2015-09-24 19:51:30 +02:00
LoneFox
9bedbc8821 Add copy() method to tokens that need it. 2015-09-24 09:47:59 +03:00
LevelX2
21061ac928 Fixed some attack forcing cards to only force to attack once a turn instead of wrongly forcing to attack each combat. 2015-09-24 08:25:45 +02:00
LoneFox
9d52ecef83 Fix yet another copy-paste error 2015-09-24 09:05:22 +03:00
LoneFox
d6a1f96547 Add Faerie Rogue token and use it for existing cards. Implement card: Notorious Throng 2015-09-24 08:57:25 +03:00
LoneFox
bee7758625 Fix another copy-paste error 2015-09-24 07:54:45 +03:00
LevelX2
044e8b70f0 Some minor changes for BFZ token image handling. 2015-09-23 19:53:25 +02:00
LoneFox
f380b2cdde Add Goat token and use it for existing cards. 2015-09-23 16:59:21 +03:00
LoneFox
10695ddf4c Add Warrior token and use it for existing cards. 2015-09-23 16:34:20 +03:00
LoneFox
9279d81c24 Add Human token and use it for existing cards 2015-09-23 13:55:40 +03:00
LoneFox
e5e7ec456d Fix a couple of copy-paste errors 2015-09-23 13:37:10 +03:00
LoneFox
3d1ae1c414 Add Cat token and use it for existing cards. 2015-09-23 12:49:12 +03:00
LoneFox
5fdd1aae49 Add Sliver token and use it for existing cards 2015-09-23 12:34:28 +03:00
LevelX2
822528d05c * Splice onto Arcane - Fixed that an arcane spell with no targets did not fizzle if a targeted spell was spliced with it that has no more legal targets on resolution (so all targets of the spell were illegal). 2015-09-21 17:57:27 +02:00
LevelX2
6249e21ff3 Fixed possible null pointer exception. 2015-09-21 16:26:00 +02:00
LevelX2
9ab323a89c Deck editor - renamed sort type "Color Detailed" to "Color Identity" and compare for the sort also with mana symbols in casting cost and rules. 2015-09-21 08:11:58 +02:00
LevelX2
e94163a4c3 Fixed that no Zendikar Expeditions lands were added to Battle for Zendikar boosters. I replaced every 20th basic land now by one random land of Zendikar Expeditions. 2015-09-20 21:10:02 +02:00
LevelX2
b2ff7ac380 * Monocolor hybrid mana - Fixed that the payment did not always try to pay the colored cost if possible. 2015-09-20 19:13:18 +02:00
LoneFox
5d51e03a69 Add Goblin Rogue token and use it for existing cards. 2015-09-20 19:17:30 +03:00
LoneFox
795bf74f11 Add Demon token and use it for existing cards. 2015-09-20 18:25:48 +03:00
LevelX2
05648987d2 Merge pull request #1283 from LoneFox78/master
Random card from random sets and first part of a big token cleanup
2015-09-20 13:30:39 +02:00
LoneFox
258f903c48 Add Kor Soldier token and use it for existing cards.
This also fixes a bug where Nomads' Assembly was creating regular Soldiers instead of Kor Soldiers.
2015-09-20 11:45:41 +03:00
LevelX2
391d247e7c * Brutal Expulsion - Fixed that also spell targets were handled correctly. 2015-09-20 10:31:14 +02:00
LoneFox
89a7170f58 Add PegasusToken and use it for existing cards. Implement card: Pegasus Refuge 2015-09-20 11:04:23 +03:00
LevelX2
24d555f41c * Emira Shepherd - Fixed that the returned card could be returned to battlefield if the played land was a Plains. 2015-09-20 09:46:19 +02:00
LevelX2
5a8ca36916 * Ondu Rising - Fixed that the attacking creatures did not get lifelink. 2015-09-20 09:25:25 +02:00
LevelX2
35d4106311 * Tide Drifter and Ruination Guide - Fixed that they buffed themself. 2015-09-20 08:43:04 +02:00
LoneFox
b43814a122 Fix type of the counters used by Vile Requiem. Implement cards: Great Whale, Hermetic Study, Midsummer Revel, and Torch Song 2015-09-19 18:48:37 +03:00
LevelX2
cd2842d457 XMage 1.4.4v4 2015-09-19 13:09:27 +02:00
LevelX2
f101db7c84 [BFZ] Added missing blue cards (19 cards). Some minor fixes. BFZ COMPLETE! 2015-09-19 11:54:31 +02:00
LevelX2
39baa82ce0 [BFZ] Added missing blue cards (20 cards). 2015-09-19 10:43:03 +02:00
LevelX2
f18b29bec9 [BFZ] Some fixes to tooltip texts. Some minor bugs fixed. 2015-09-19 10:42:36 +02:00
LevelX2
1708a49d37 [BFZ] Added missing green cards (19 cards). 2015-09-19 02:22:08 +02:00
LevelX2
fffeaf1e5c [BFZ] Added missing colorless cards (3 cards). 2015-09-19 01:12:47 +02:00
LevelX2
8fe48b78dd Merge pull request #1279 from hanasu/master
Fixed issue with Dredge rules text where it always read "three cards"
2015-09-18 23:04:45 +02:00
LevelX2
13fa7aeb62 [BFZ] Added missing red cards (22 cards). 2015-09-18 23:04:03 +02:00
hanasu
c1ff3c2927 Fixed issue with Dredge rules text where it always read "three cards" 2015-09-18 15:51:34 -04:00
LevelX2
fcbc9ce3a5 Fixed a bug of TargetSpellOrPermanent. 2015-09-18 15:31:49 +02:00
LevelX2
6f15e38b27 [BFZ] Added Fertile Thicket, Brutal Expulsion and Guul Draz Overseer. 2015-09-18 13:07:01 +02:00
fireshoes
f2b7771d59 [BFZ] Implemented Prism Array, Sanctum of Ugin, Spawning Bed, Makindi Sliderunner , Snapping Gnarlid, Molten Nursery, Pilgrim's Eye 2015-09-17 20:35:14 -05:00
LevelX2
afe352168c Created a more generic ConditionalSpellManaBuilder. Replaced some custom mana builders (more to do). 2015-09-17 16:18:39 +02:00
LevelX2
74161c665d Merge pull request #1274 from LoneFox78/master
Some Stronghold
2015-09-17 11:26:25 +02:00
LoneFox
2474472df6 Implement cards: Bullwhip, Change of Heart, Mindwarper, and Mob Justice 2015-09-17 10:46:17 +03:00
fireshoes
9df8d4799e Merge origin/master 2015-09-17 01:27:06 -05:00
fireshoes
c56f551c18 [BFZ] Implemented Retreat to Coralhelm, Retreat to Valakut, Retreat to Hagra, Benthic Infiltrator, Scatter to the Winds, Scour from Existence, Beastcaller Expert, Mind Raker, Murk Strider, Part the Waterveil, Culling Drone, COmplete Disregard, Blighted Cataract 2015-09-17 01:25:39 -05:00
LevelX2
5470a9ee1a Added logging statement. 2015-09-17 08:21:08 +02:00
LevelX2
fed8463d76 Some fixes to shown player messages. Added an effect to add counters to permanents entering the battlefield (e.g. Protean Hydra). 2015-09-16 17:36:32 +02:00
LoneFox
0f54149b00 Another fix to PutIntoGraveFromBattlefieldAllTriggeredAbility 2015-09-16 16:57:45 +03:00
LevelX2
429f434216 Merge pull request #1270 from LoneFox78/master
Some Weatherlight
2015-09-16 15:52:16 +02:00
LevelX2
391b766b6e Some minor changes. 2015-09-16 15:45:38 +02:00
LoneFox
40815d8560 Implement cards: Benalish Missionary, Boiling Blood, Chimeric Sphere, and Mwonvuli Ooze 2015-09-16 09:38:08 +03:00
LoneFox
94b310b7f7 Implement cards: Angelic Renewal, Mana Chains, Roc hatchling, and Touchstone 2015-09-16 08:51:25 +03:00
LoneFox
9abfe04054 Fix PutIntoGraveFromBattlefieldAllTriggeredAbility: the onlyToControllerGraveyard parameter was not implemented at all. 2015-09-16 08:50:51 +03:00
LevelX2
3e1e8a5534 [BFZ] Added Dust Stalker, Bring to Light, Ally Encampment and Woodland Wanderer. 2015-09-16 00:05:37 +02:00
LevelX2
002037a683 * Flamerush Rider - Fixed that the token put onto the battlefield was not attacking and not tapped. 2015-09-15 22:35:08 +02:00
LevelX2
12d584ebd1 [BFZ] Added Conduit of Ruin, Exert Influence and March from the Tomb. 2015-09-15 17:38:12 +02:00
LevelX2
afc6a5aadc * Fixed that if in a multiplayer game the player that selects the starting player concedes before he selects a starting player, a starting player is slected by the game. The game starts now correctly with all remaining players. 2015-09-15 12:41:07 +02:00
LevelX2
310627c924 Some minor updates to the cards of the recently merged pull requests. 2015-09-15 00:24:08 +02:00
LevelX2
83230aebc2 Merge pull request #1241 from BijanT/master
Implemented Cards: Grave Scrabbler, EbonbladeReaper
2015-09-15 00:02:28 +02:00
LevelX2
8f64a2ab54 * Fixed that a player doing a library search with a stated quality (701.15b) couldn't fail to find a card if cards with the stated quality did exist in the searched library. 2015-09-14 23:36:32 +02:00
LoneFox
d2a90e6131 Implement cards: Briar Shield, Bubble Matrix, Foriysian Brigade, and Master of Arms 2015-09-14 13:41:13 +03:00
LevelX2
9da4d44ad2 * Combat - Fixed a bug that the game log showed block information of blocks that were undone. 2015-09-13 23:35:13 +02:00
LevelX2
3d8494edb5 Fixed some possible exceptions. 2015-09-13 09:48:35 +02:00
LevelX2
a505173854 Merge pull request #1260 from LoneFox78/master
New cards and fixes
2015-09-13 09:47:21 +02:00
LevelX2
63e25cf132 * Shallow Grave - Fixed that the delayed triggered ability did also effect the target if it changed zone meanwhile (fixes #1262). 2015-09-13 08:47:45 +02:00
LevelX2
7639f1bc6d * Fixed possible NPE and added warning to log to check what abilities have no sourceId (fixes #1261). 2015-09-13 07:55:04 +02:00
LevelX2
88c18bcd8c * Infernal Scarring - Fixed that the "Dies" trigger did not work if the enchanted creature was sacrificed (e.g. using Nantuko Husk). 2015-09-12 20:14:44 +02:00
LevelX2
0ca991c4ba * Starfield of Nyx - Fixed that the continuous effect's dependancy to continuousEffects that add subtype aura was not checked. Reworked the dependency check to be a bit more generic (#1259). 2015-09-12 19:35:02 +02:00
LoneFox
43bf34613d Combine Final Fortune's effect into AddExtraTurnControllerEffect. Implement cards: Last Chance and Warrior's Oath 2015-09-12 19:27:42 +03:00
LevelX2
1175a18661 * Fixed put token into play thta's of copy of target effects to handle targets correctly that already copy something (e.g. Kiki-Jiki, Mirror Breaker copying a Body Double creature). 2015-09-12 14:52:14 +02:00
LoneFox
41ca5f198f Add LoseLifeControllerAttachedEffect. Kill some custom abilities and effects. Implement card: Pooling Venom 2015-09-12 12:31:08 +03:00
LoneFox
a6aa484ea0 Add description parameter to BecomesTappedAttachedTriggeredAbility. Use it and DestroyAttachedEffect for some existing cards. Fix several issues with Brink of Disaster. Implement card: Uncontrolled Infestation 2015-09-12 11:31:57 +03:00
LevelX2
de639cc1d6 * Suspend, added the card name to the rule text of the ability triggering, so different suspended cards were not auto put on the stack by the activated same rule text option. 2015-09-11 23:06:26 +02:00
LevelX2
69dc4f10ac * Fixed that spells with targets cast without paying mana could simply be canceled by canceling the target selection (e.g. player was able to cancel a spell cast by suspend what's not allowed by the rules). 2015-09-11 23:03:03 +02:00
LevelX2
4c0473a3c9 * Augur of Bolas - Fixed that the effect to reveal and put a card to hand was not optional. 2015-09-11 15:11:28 +02:00
LevelX2
65f4c9d4b2 Merge pull request #1258 from LoneFox78/master
New cards and fixes
2015-09-11 12:38:10 +02:00
LoneFox
dfb70e07a3 Add description parameter to DontUntapInControllersUntapStepEnchantedEffect.
This fixes a lot of tooltip texts that had "enchanted permanent" instead of "enchanted creature" in them.
2015-09-11 09:24:40 +03:00
LoneFox
cb34084321 Add DestroyattachedEffect and use it for existing cards. Implement cards: Frozen Solid, Mortal Wound, and Parallax Dementia 2015-09-11 08:43:41 +03:00
LevelX2
464955bd3a Fixed that for enchantments put into play (e.g. by Zur the Enchanter) that the selection of the enchanted permanent is not handled targeted. 2015-09-10 23:59:53 +02:00
LevelX2
5494f191b9 * Arcbond - Fixed that an exception was thrown if the ability triggered. 2015-09-10 22:47:26 +02:00
LoneFox
45862acaee Implement the Charm cycle from Onslaught 2015-09-09 12:16:56 +03:00
LoneFox
34d604fe4b Rename BecomesChosenNonWallCreatureTypeTargetEffect -> BecomesChosenCreatureTypeTargetEffect and make the non-Wall part a parameter. Clean up the cards that use it. Fix Standardize, which was using wrong effect. 2015-09-09 12:14:54 +03:00
fireshoes
4fefd3f773 Merge origin/master 2015-09-08 18:46:41 -05:00
fireshoes
b0550530ca Fixed spelling of AtTheBeginOfMainPhaseDelayedTriggeredAbility. [BFZ] Implemented Undergrowth Champion and Kiora, Master of the Depths. Fixed mistranslated name for Fathom Feeder. 2015-09-08 18:45:39 -05:00
LevelX2
340398fb74 * Fixed that state triggered abilities were not checked at the correct times. 2015-09-09 00:51:41 +02:00
LevelX2
e37c9a6472 * Fixed some problems with creation of tokens of target permanents (fixes #1244). 2015-09-08 18:13:32 +02:00
LevelX2
b4d7009af8 Fixed multitarget handling of Decimate and Boom//Bust. 2015-09-08 08:09:48 +02:00
LevelX2
0dcd11cf4b * Reversed target handling of DestroyTargetEffect. 2015-09-08 08:05:07 +02:00
LevelX2
5b36eebdde * Travel Preparations - Fixed tooltip text. 2015-09-07 23:54:43 +02:00
LevelX2
14a2f0489b Merge pull request #1249 from LoneFox78/master
New stuff and some fixes
2015-09-07 22:51:52 +02:00
LevelX2
77d783f587 * Isochron Scepter - Fixed that not always the correct spell ability was cat for the imprinted card (e.g. overload ability for cards with overload). 2015-09-07 17:32:49 +02:00
LoneFox
a0ba619b87 Implement RampageAbility and some creatures that have it 2015-09-07 17:53:43 +03:00
LevelX2
9aa14cdba8 * Added some tests. 2015-09-07 16:14:57 +02:00
LevelX2
94c0e05891 * Suspend - Fixed that creatures coming into play with suspend didn't gain haste anymore. 2015-09-07 15:03:19 +02:00
LevelX2
b3eb6f536a Fixed some bugs causing null pointer or concurrent modification exceptions. 2015-09-07 07:42:19 +02:00
LevelX2
0cb92e6936 Fixed a bug of DiscardsACardOpponentTriggeredAbility. 2015-09-07 07:41:33 +02:00
LevelX2
3f383f2aa8 Merge origin/master 2015-09-07 00:34:32 +02:00
LevelX2
e1541ece20 Some fixes to prevent concurrent modification errors on public server. 2015-09-07 00:33:33 +02:00
LevelX2
25275e523d Merge pull request #1245 from LoneFox78/master
Cards with "attacks and is not blocked" type triggers
2015-09-06 23:37:31 +02:00
LevelX2
fb819f1f51 Added test (failing because bug not fixed yet). Some minor changes. 2015-09-06 23:29:58 +02:00
LevelX2
9dde5c2810 * Fixed a bug that prevented that a spell was removed from stack in some situations. 2015-09-06 22:40:55 +02:00
LevelX2
7aa27a9800 * ManaSpentToCastWatcher - Fixed possible null pointer exception. 2015-09-06 22:14:35 +02:00
LoneFox
7bf2c48d78 Implement cards: Coral fighters, Guiltfeeder, Keeper of Tresserhorn, and Lim-Dul's Paladin 2015-09-06 18:46:10 +03:00
LoneFox
56a5db497e Fix AddPoisonCounterTargetEffect ignoring setText(). Implement cards: Crypt Cobra, Suq'Ata Assassin, and Swamp Mosquito 2015-09-06 14:43:12 +03:00
LevelX2
3a29e7c336 * Some minor chnages. 2015-09-05 18:52:02 +02:00
LoneFox
07cab82ed6 Add AttacksAndIsNotBlockedTriggeredAbility. Implement cards: Abyssal Nightstalker, Farrel's Zealot, Ophidian, and Zealot il-Vec 2015-09-05 16:38:42 +03:00
LevelX2
67969e9f80 * Landfall - Fixed a bug that the check if a land was player did not work always correctly. 2015-09-05 12:13:05 +02:00
LevelX2
411ea27772 * Supend - Fixed that the haste ability lasted also if a creature brought into play by supend if the creature leftz and returned the battlefield by another effect than suspend. 2015-09-05 11:51:02 +02:00
LevelX2
0aacff4e6a * Fixed a bug that ended continuous effects were not already removed before an aura enters the battlefield (e.g. Brago + Pentarch Ward combo) fixes #1238. 2015-09-05 10:27:04 +02:00
LevelX2
fe80d292ab Some changes for token download. 2015-09-05 01:53:48 +02:00
LevelX2
c7e64ac9fe [BFZ] Added Oblivion Sower and Titan's Presence. 2015-09-05 00:13:11 +02:00
LevelX2
ce562f5afc * Hideaway - Fixed a bug with playing lands from exile not working. 2015-09-04 15:24:00 +02:00
LevelX2
a1e385160a * Mishra, Artificer Prodigy - Fixed that artifact put into play with it's triggered ability where wrongly handled face down. 2015-09-04 14:33:27 +02:00
LevelX2
707c1acf6b * Added an option to auto order triggers with the same text. Added options to pass priority automatically after spell cast and ability activation. Fixed a problem of the tests with the new Scry mulligan. 2015-09-04 00:25:23 +02:00
BijanT
a0f716125d Merge remote-tracking branch 'magefree/master' 2015-09-03 16:20:15 -05:00
LevelX2
db7784f39d Merge pull request #1243 from LoneFox78/master
New cards
2015-09-03 21:18:16 +02:00
LoneFox
e96540e422 Implement cards: Alabaster Dragon, Dwarven Weaponsmith, Jamuraan Lion, and Living Artifact 2015-09-03 21:46:17 +03:00
LevelX2
5a812f022d Added the new mulligan rule with Scry. Litte Scry rework. 2015-09-03 17:27:43 +02:00
LoneFox
561366133d Implement cards: Detonate, Disembowel, Serendib Sorcerer, and Spire Owl 2015-09-03 12:48:05 +03:00
LevelX2
71860b0168 Adde AbilityWord "Rally" to rule text of AllyEntersBattlefieldTriggeredAbility. Added a test. 2015-09-03 11:29:59 +02:00
LevelX2
7627935d93 * Chain of Vapor - Fixed that the copied spell did nor work correctly. 2015-09-03 01:28:26 +02:00
LevelX2
1ee22be81a [BFZ] Added Radiant Flames. 2015-09-02 23:28:25 +02:00
LevelX2
b9e005c556 * Deathbellow Raider - Fixed that attacking was not forced. 2015-09-02 16:33:00 +02:00
LevelX2
74109afcbb [BFZ] Added Awaken ability. 2015-09-02 16:20:58 +02:00
LevelX2
93825fff9c * Wheel of Sun and Moon - Fixed a bug that happened as Wheel of Sun and Moon tried to move the card of a spell cast to the library. 2015-09-02 16:20:05 +02:00
LevelX2
22adee71ca * Cabal Slaver - Fixed that the discard effect for damaged opponents did not work. 2015-09-02 12:26:16 +02:00
LevelX2
2c4d23bbb4 * Protection - Fixed that protection from spells is also checked for determining if a spell can be cast due to have a valid target available. 2015-09-02 08:32:57 +02:00
LevelX2
5545aa02b5 Added LoseAbilityAllEffect. 2015-09-01 21:52:52 +02:00
LevelX2
df4dfc16d7 * Cipher - Fixed that the selection of the creature was handled targeted (e.g. checking for protection) fixes #1240). 2015-09-01 21:39:34 +02:00
LevelX2
1213fd22c8 * Followed Footsteps - Fixed that the token copy was not working correctly if the target was already copying something (e.g. a Cryptoplasm). 2015-09-01 17:34:21 +02:00
LevelX2
a289169708 Merge origin/master 2015-09-01 11:23:03 +02:00
LevelX2
e0d9678b99 * Fixed split card handling in deck editor. 2015-09-01 11:22:04 +02:00
fireshoes
4da225475f Changed some existing cards to use PermanentsOnTheBattlefieldCondition instead of adding a cost.[BFZ] Implemented Brood Butcher.[CSP] Implemented Heidar Rimewind Master, Rimewind Cryomancer, and Rimewind Taskmage.[LEG] Implemented Hyperion Blacksmith. 2015-08-31 18:58:45 -05:00
LevelX2
8d683a7e5c * Split cards - Fixed a bug when split cards get copied (e.g. by Isochron Scepter) refering still to the copied card. 2015-08-30 23:49:38 +02:00
LevelX2
a09eb2f94e * Leeching Bite - Fixed target handling to use correctly two target instances. 2015-08-30 21:15:09 +02:00
LevelX2
3df8b4958f Merge pull request #1234 from LoneFox78/master
New cards
2015-08-30 10:41:28 +02:00
LevelX2
826b65628e * Aven Windreader - Fixed that the reveal ability did only show the card to the controller of the ability and that the card was removed from libraray instead only shown. 2015-08-30 10:12:28 +02:00
LevelX2
eb3aef7ee5 * Fixed that the new early way to add counters to permanents entering the battlefield (e.g. used for Undying) checked effects while the permanents was not already set to Zone battlefield. That caused e.g. the ability of Tatterkite not to work at that time. 2015-08-30 10:04:36 +02:00
fireshoes
9e1f67fa1a [BFZ] Implemented Felidar Cub, Incubator Drone, Barrage Tyrant, Mist Intruder, Gideon's Reproach, Kozilek's Channeler, and Eldrazi Scion Token. [ONS] Implemented Airdrop Condor. 2015-08-30 02:52:11 -05:00
LevelX2
fb965ebdd6 * Opalescence - Fixed that the dependent effect (613.7) Opalescence was applied before the effect of Enchanted Evening if Opalescence was cast earlier. 2015-08-29 18:52:46 +02:00
LoneFox
4c446bd1c5 Add SacrificeCostConvertedMana and use it for Bosh, Iron Golem. Implement cards: Faith Healer, Priest of Yawgmoth, Sacrifice, and Soldevi Adnate 2015-08-29 17:38:42 +03:00
LevelX2
447e42409b * Lieutenant - Fixed that the Lieutenant effects were also applied if the commander was controlled by another player as the commander owner. 2015-08-29 10:53:13 +02:00
LevelX2
e8983ae992 Fixed that cards moved from hand to library were named in the log by default. 2015-08-29 09:55:58 +02:00
LevelX2
b6c3355329 [BFZ] Added Devoid and Ingest keywords. 2015-08-28 16:51:37 +02:00
LevelX2
758f56792e * Added button popup menu to be able to automatically answer ability related "Yes" / "No" requests (related to #328). 2015-08-28 11:44:14 +02:00
LevelX2
2efa60bc13 Merge pull request #1231 from LoneFox78/master
More Portal Three Kingdoms cards + a couple of others
2015-08-28 11:25:46 +02:00
BijanT
950c9c428e Merge remote-tracking branch 'magefree/master' 2015-08-27 21:33:17 -05:00
LevelX2
b63cc121ef Some minor changes. 2015-08-27 14:51:21 +02:00
LoneFox
2953baa466 Add AttacksAloneTriggeredAbility and use it for Nefarox, Overlord of Grixis. Implement cards: Lunk Errant; Ma Chao, Western Warrior; Reckless Ogre; Rogue Kavu; and Yuan Shao's Infantry 2015-08-27 15:44:31 +03:00
BijanT
45044a51ee Revert "Revert "Implemented Grave Scrabbler""
This reverts commit 46fff6acfe.
2015-08-26 21:44:09 -05:00
BijanT
46fff6acfe Revert "Implemented Grave Scrabbler"
This reverts commit 09200bc68a.
2015-08-26 21:42:04 -05:00
BijanT
150fc8649a Merge remote-tracking branch 'magefree/master' 2015-08-26 21:41:20 -05:00