7004 commits

Author	SHA1	Message	Date
Oleg Agafonov	9268281c4b	Tests: fixed random gen deck	2018-01-27 15:49:24 +04:00
LevelX2	020beb1bf6	Merge origin/master	2018-01-27 11:43:01 +01:00
LevelX2	6b90c1fd7f	Fixed some exception problems.	2018-01-27 11:42:43 +01:00
Oleg Agafonov	1b191a5f93	Fixed temporary effects copy between game states, fixed concurrent access errors while execute some cheat commands;	2018-01-27 13:26:04 +04:00
Oleg Agafonov	c69b3f4609	Fixed wrong players compare (not by UUID -- see #4407)	2018-01-27 13:23:03 +04:00
Oleg Agafonov	9d131f6bde	Random generated decks improvements and fixes for AI: ... * added generation of only basic lands decks; * fixed wrong color cards selection;	2018-01-27 13:19:03 +04:00
spjspj	8db20dbe8d	Merge pull request #4430 from spjspj/master ... Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)	2018-01-19 22:20:03 +11:00
spjspj	d095f83d8a	Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)	2018-01-19 21:28:47 +11:00
spjspj	af48b17451	Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)	2018-01-19 20:30:12 +11:00
Oleg Agafonov	89f5967441	* [RIX] Added missing tokens (tokens.mtg.onl is updated with 150+ images too);	2018-01-18 07:02:02 +04:00
L_J	1dceae4e95	Implemented Lurker	2018-01-17 20:34:35 +00:00
Achilles	6da1112a89	- Code by Noxx to address the Blood Moon/Urborgtoy layering issue. Layer test updated.	2018-01-15 18:47:42 -06:00
Oleg Agafonov	98cc704592	Fixed visible empty sets in new tournament dialog (#4415)	2018-01-14 20:54:42 +04:00
igoudt	7f319c2751	fix null-check in raging river and a watcher	2018-01-13 23:26:35 +01:00
LevelX2	ed3742b1e4	Merge origin/master	2018-01-13 22:55:44 +01:00
LevelX2	40afa04b24	xmage 1.4.27V0	2018-01-13 22:54:53 +01:00
Zzooouhh	d4e2b70cf3	Added hunger counter	2018-01-13 19:14:39 +00:00
LevelX2	9a760670dd	* Fixed that Explore did not trigger if it was initiated from a instant or sorcery.	2018-01-13 19:37:36 +01:00
LevelX2	2e3ba7e104	Added designation names to player tooltip.	2018-01-13 18:55:07 +01:00
LevelX2	6693929557	* Some refactoring.	2018-01-13 14:45:50 +01:00
Oleg Agafonov	9a0b48e9b7	Little fix on filter	2018-01-13 14:58:43 +04:00
LevelX2	393f8dc9f4	* World at War - Fixed that its extra Main Phase was not executed (fixes #4382).	2018-01-13 11:14:13 +01:00
LevelX2	524541040f	* Daretti, Ingenious Iconoclast - Fixed wrong third text (fixes #4405).	2018-01-13 10:20:35 +01:00
LevelX2	83528369ee	* Daretti, Ingenious Iconoclast - Fixed wrong third text (fixes #4405).	2018-01-13 09:25:31 +01:00
Achilles	7ade17595d	- Aftermath keyword works again. Added test for Aftermath keyword.	2018-01-12 23:58:38 -06:00
Oleg Agafonov	4771ad2c63	Fixed UGL test, rename new token	2018-01-13 02:27:16 +04:00
Oleg Agafonov	9b740b8cbb	Merge pull request #4363 from SpikesCafe-google/master ... Implement "Pure Reflection" card from Invasion.	2018-01-13 02:23:30 +04:00
Oleg Agafonov	bbdf762775	Merge pull request #4404 from Zzooouhh/Zzooouhh-sporogenesis ... Implemented Sporogenesis & some The Dark cards	2018-01-13 01:10:30 +04:00
Oleg Agafonov	36dcae63b3	For last fix	2018-01-12 21:28:10 +04:00
Oleg Agafonov	7c2511355e	Tests: added checks for errors on card loading (see #4402)	2018-01-12 21:10:10 +04:00
Zzooouhh	c6f623ea41	Added fungus counter	2018-01-12 16:40:53 +00:00
LevelX2	a63f87da2c	Little fix.	2018-01-12 17:04:51 +01:00
LevelX2	f798a25b3b	Added some mechanism that helps to prevent unintended changes to StaticFilters.	2018-01-12 15:27:52 +01:00
igoudt	267100d3d6	fix for #4402	2018-01-12 15:03:54 +01:00
Radoslaw Sypen	29a889b236	Merge branch 'master' of github.com:rsypen/mage into fix_tests_not_passing	2018-01-12 10:42:50 +01:00
Radoslaw Sypen	88527987cc	Fixed ItThatBetrays and Barrin, Master Wizard broken effects, added new test for Emrakul's annihilator trigger	2018-01-12 10:33:11 +01:00
Zzooouhh	ca46a8872a	Moved PermanentInListPredicate to common predicates	2018-01-11 17:53:32 +00:00
spjspj	ab4490e476	Merge pull request #4398 from spjspj/master ... Add 5 cards (UGL)	2018-01-12 00:06:39 +11:00
spjspj	d9bcfa3f31	Add 5 cards (UGL)	2018-01-11 23:55:37 +11:00
spjspj	8a1619f9b4	Merge pull request #4396 from spjspj/master ... Add 3 cards (UGL)	2018-01-11 17:56:55 +11:00
spjspj	96e6a917b4	Add 3 cards (UGL)	2018-01-11 17:43:33 +11:00
LevelX2	4c9ed95662	Xmage 1.4.26V11d	2018-01-11 07:14:49 +01:00
LevelX2	2685d9f8b4	Fixed some possible null pointer exceptions (found in server log). Market Festival, Kindred Summons, Profane Processions, New Blood, Kindred Charge , Bishop of Binding, Metzal Tower of Triumph, Chrome Mox	2018-01-11 06:12:27 +01:00
Zzooouhh	a38ec84581	Removed slipped beta Blaze of Glory code ... in case it could break something, as it's still buggy	2018-01-10 19:49:15 +00:00
Zzooouhh	8f9356533d	Fixed undoing individual blocker declarations for multi-blockers ... One more #4172 fix	2018-01-10 19:44:48 +00:00
ciaccona007	470bb69a7e	Implement Timmy, Power Gamer	2018-01-09 14:14:34 -08:00
ciaccona007	3e87a50b4d	Implement Krazy Kow	2018-01-09 13:25:46 -08:00
ciaccona007	79c18d28e2	Implement Chicken Egg	2018-01-09 12:40:39 -08:00
LevelX2	fef0ef83ec	xmage 1.4.26V11c	2018-01-08 22:59:35 +01:00
Zzooouhh	1109d2b246	Made Changeling take effect in all zones ... Still doesn't fix Path of Ancestry interaction of Dr. Julius Jumblemorph though	2018-01-08 17:23:12 +00:00
SpikesCafe-google	645b4ac47b	Rename PermanentReflectionToken.java to PureReflectionToken.java	2018-01-07 20:59:00 -05:00
SpikesCafe-google	99b4b427f0	Create PermanentReflectionToken.java	2018-01-07 20:45:30 -05:00
igoudt	ec5b34be04	Merge branch 'master' of https://github.com/magefree/mage	2018-01-07 22:39:40 +01:00
igoudt	27ec3431ee	rewrite with staticfilter	2018-01-07 22:39:31 +01:00
igoudt	6d16e41ec3	use some staticfilters, rewrite some lines to java8 streams	2018-01-07 22:38:54 +01:00
LevelX2	995c58e381	* Reckless Rage - Fixed damge dealing to the creatures.	2018-01-07 22:11:12 +01:00
LevelX2	86857e2e0f	Merge origin/master	2018-01-07 18:05:23 +01:00
LevelX2	46bcad2ada	Mage 1.4.26V11	2018-01-07 18:04:59 +01:00
Zzooouhh	9c77a5db7a	Added currency counter	2018-01-07 16:13:34 +00:00
LevelX2	0e119ffa01	[RIX] Fixed set card [RIX] Added 5 cards.	2018-01-07 13:29:40 +01:00
LevelX2	3480d47d11	[RIX] Added 7 cards.	2018-01-07 10:54:15 +01:00
LevelX2	15081f7d0e	Merge origin/master ... Conflicts: Mage.Sets/src/mage/sets/RivalsOfIxalan.java	2018-01-07 02:41:49 +01:00
LevelX2	0f0b1d8330	[RIX] Added 8 cards.	2018-01-07 02:33:32 +01:00
Oleg Agafonov	70e99e185b	Updated menace and explore abilities to show or hide description	2018-01-07 03:46:07 +04:00
LevelX2	5935221878	[RIX] Added 6 cards.	2018-01-06 23:47:54 +01:00
LevelX2	b4f9cbd15c	[RIX] Added 5 cards.	2018-01-06 22:35:39 +01:00
LevelX2	4571ab8dce	[RIX] Added 5 cards.	2018-01-06 21:34:15 +01:00
LevelX2	803df371f9	[RIX] Added 4 cards.	2018-01-06 18:42:03 +01:00
LevelX2	488622662a	[RIX] Added Profane Procession, Tomb of the Dusk Rose, Twilight Prophet.	2018-01-06 17:24:00 +01:00
LevelX2	509648448e	[RIX] Added 2 cards.	2018-01-06 13:31:50 +01:00
LevelX2	7189cb868f	[RIX] Added 9 cards.	2018-01-06 12:40:25 +01:00
LevelX2	f95b0e6c0a	Merge origin/master ... Conflicts: Mage.Sets/src/mage/sets/RivalsOfIxalan.java	2018-01-05 23:41:30 +01:00
LevelX2	f0494383fd	[RIX] Added 4 cards.	2018-01-05 15:26:10 +01:00
Oleg Agafonov	bc75f82524	Fixed wrong ability texts with duplicated card name (see #4335)	2018-01-05 02:21:16 +04:00
LevelX2	145fe8ca15	[Rix] Added 5 cards.	2018-01-04 18:00:08 +01:00
Oleg Agafonov	56949414d1	Fixed wrong ability texts with duplicated card name (see #4335)	2018-01-04 20:48:41 +04:00
Oleg Agafonov	6b9db5eb17	[RIX] Added Deeproot Elite	2018-01-04 05:44:12 +04:00
Oleg Agafonov	3dda5712db	AI: fixed not working choice with key-value dialogs, random refactor	2018-01-04 00:23:20 +04:00
LevelX2	547c7078bf	[Rix] Added 6 cards.	2018-01-03 18:02:27 +01:00
LevelX2	32fb2507c3	Some rework to Framework.	2018-01-03 11:40:07 +01:00
Oleg Agafonov	1a252e61a2	Fixed #4311: deck editor can't load decks with cards cards from Masterpiece Series Amonkhet (MPS-AKH)	2018-01-03 09:10:39 +04:00
Oleg Agafonov	204a602b36	Added old decklist files compatibility loading (free to change card numbers, names and codes, see #4332)	2018-01-03 07:43:15 +04:00
LevelX2	02f6ce7639	Merge origin/master	2018-01-02 23:48:27 +01:00
LevelX2	bc490ef91a	Added Spellweaver Volute.	2018-01-02 23:48:07 +01:00
LevelX2	7d026c699f	[RIX] Added 3 cards.	2018-01-02 17:47:38 +01:00
LevelX2	70c08a2d81	* Victimize - Fixed that continuous effects of sacrificed permanent did not end before returning targets from graveyard (fixes #4315).	2018-01-02 15:01:58 +01:00
Zzooouhh	f201ec6fc0	Merge pull request #4326 from Zzooouhh/Zzooouhh-hml ... Implemented some Homelands cards	2018-01-02 09:11:46 +01:00
Zzooouhh	497ebebc05	Implemented Broken Visage	2018-01-02 05:52:47 +01:00
Zzooouhh	bde116e201	Implemented Autumn Willow	2018-01-02 05:48:06 +01:00
Zzooouhh	aa10e2d336	Implemented Autumn Willow	2018-01-02 05:46:33 +01:00
Zzooouhh	49aa22079f	Added net counter	2018-01-01 19:09:08 +01:00
igoudt	54c585afd8	fixes #4317	2017-12-31 22:24:03 +01:00
LevelX2	d87ce66347	Added Even the Odds and reworked Feast of Blood's cast restriction.	2017-12-31 12:55:21 +01:00
LevelX2	519eae42fc	* Fixed some problems with abilities that let permanents become artifact creatures but only added creature card type instead of artifact and creature card type (fixes #4290).	2017-12-31 11:31:58 +01:00
LevelX2	330c6f1393	XMage 1.4.26V10	2017-12-30 20:17:04 +01:00
LevelX2	e81f6c5e90	* Unearth - Fixed that a pahsed out creature were wrongly exiled by unearth.	2017-12-30 19:15:33 +01:00
LevelX2	529a38a96f	Fixed some card download problems.	2017-12-30 18:36:03 +01:00
Zzooouhh	0f61bdeabd	Lot of progress on Panglacial Wurm quirks	2017-12-30 06:14:45 +01:00
Zzooouhh	1f5ab92e9d	Fix attempt	2017-12-30 03:15:17 +01:00
Zzooouhh	4c5dc3f839	Fix attempt	2017-12-30 03:09:56 +01:00
Zzooouhh	310764814f	Minor fix	2017-12-30 02:42:32 +01:00
Zzooouhh	c675f3b4d1	Cleanup, improvements etc.	2017-12-30 02:26:14 +01:00
Zzooouhh	818a005b59	Fixed double copypaste	2017-12-30 02:06:39 +01:00
Zzooouhh	d671c2a06c	Plenty of Panglacial Wurm fixes	2017-12-30 02:03:36 +01:00
Zzooouhh	549fb0fb22	Merge pull request #28 from Zzooouhh/Zzooouhh-csp-panglacialwurm ... Zzooouhh csp panglacialwurm	2017-12-30 01:24:44 +01:00
Zzooouhh	5a1a6f7031	Implemented Panglacial Wurm (buggy!)	2017-12-30 01:23:52 +01:00
Zzooouhh	fc754372bd	Implemented Panglacial Wurm	2017-12-30 01:09:35 +01:00
Oleg Agafonov	e87db19b7d	Tests: fixed NykthosShrineToNyx that broke dozens of other tests with mana choice	2017-12-29 17:10:07 +04:00
Zzooouhh	31648dbc0e	Changed PermanentImpl to Permanent	2017-12-29 05:31:55 +01:00
Oleg Agafonov	78b8d64649	Merge remote-tracking branch 'production/master' into production_master	2017-12-29 06:16:51 +04:00
Oleg Agafonov	af0c77a409	UI: added custom sorting in choice dialog	2017-12-29 06:11:10 +04:00
Zzooouhh	f93c55025e	Auras targetting tokens fix (fixes #4297)	2017-12-29 01:10:06 +01:00
Oleg Agafonov	35a950dc80	Merge remote-tracking branch 'production/master' into production_master	2017-12-29 04:03:45 +04:00
Oleg Agafonov	e4dfa5925b	UI: added start selection value on choice dialog popup;	2017-12-28 22:38:18 +04:00
LevelX2	80f71027d6	Merge origin/master	2017-12-28 16:56:13 +01:00
LevelX2	f88a42dd74	Merge origin/master	2017-12-28 16:53:56 +01:00
Zzooouhh	c25eaa9446	Fixed one overlooked instance of lethalDamage	2017-12-28 16:53:52 +01:00
LevelX2	d808b15569	* Hollow One - Fixed counting of discarded/cycled cards if returned to hand during a turn.	2017-12-28 16:52:51 +01:00
Zzooouhh	f166bebe8c	Fixed lethal damage potentially dipping into negative values ... Example: in multiple multi-blocker creatures blocking the same creatures (if one of them assigns more than lethal to the first creature in its attackerOrder)	2017-12-28 16:49:51 +01:00
LevelX2	6d17199129	* Toxin Sliver - Fixed that the damaged creature was not destroyed.	2017-12-28 15:57:31 +01:00
LevelX2	91efa42d0d	Merge origin/master	2017-12-28 12:57:53 +01:00
LevelX2	d85637336e	* Cabal Ritual, Gemstone Caverns, River of Tears - Fixed a problem that the tap for mana event was sent twice for theses lands (fixes #4288).	2017-12-28 12:57:16 +01:00
Oleg Agafonov	8a699bae81	Merge remote-tracking branch 'production/master' into production_master	2017-12-28 15:40:21 +04:00
Zzooouhh	cedfc5591b	Merge pull request #4293 from Zzooouhh/master ... Implemented Corrosion and Desolation	2017-12-28 12:39:54 +01:00
Oleg Agafonov	101cb304fb	Fixed typos	2017-12-28 15:39:00 +04:00
Oleg Agafonov	6afbcb638b	Updated cards for new choice dialog	2017-12-28 04:25:17 +04:00
Oleg Agafonov	3bdd2ae8bb	Fixed choice typos	2017-12-28 04:14:37 +04:00
Oleg Agafonov	7954031f41	Merge pull request #4283 from JayDi85/ui-choose-new ... Added new choose dialog	2017-12-28 02:59:09 +04:00
Oleg Agafonov	68c6551188	Fixed cards with any color lands produce ability: ... * Fixed ManaOptions result (no more duplicated records with same options); * Fixed mana types searching (now mana search return {Any} type too); * Fixed cards: Fellwar Stone, Harvester Druid, Reflecting Pool (#4125), Sylvok Explorer, Exotic Orchard (#3374), Naga Vitalist;	2017-12-28 02:15:49 +04:00
Oleg Agafonov	80b5026ec7	Search enabled by default	2017-12-27 06:42:27 +04:00
Oleg Agafonov	534e00e41f	Updated choose color dialog: added mana value and ability source	2017-12-27 06:32:24 +04:00
Oleg Agafonov	75cec526dc	Fixed magic "error switch" for unit tests	2017-12-27 06:26:05 +04:00
Zzooouhh	3de6f417dc	Combat.removeBlocker incorrectly ignored blockingGroups (Partial fix for #4172)	2017-12-26 22:29:54 +01:00
Zzooouhh	3a7b1454f8	Implemented Corrosion	2017-12-26 16:50:46 +01:00
LevelX2	8228cee30c	* Some minor changes.	2017-12-26 10:59:28 +01:00
Oleg Agafonov	531b5bc569	Added auto enabled search for all pickup dialogs with many items;	2017-12-25 12:47:30 +04:00
Oleg Agafonov	749ca59ad6	Added new choose dialog (creature types and etc): ... * added incremental search; * added keyboard hotkeys (up/down for select, enter for choose); * added choose by mouse double click; * added source card name; * fixed cancel button on required choice (#4230); * fixed text sizes form messages (now it's auto size);	2017-12-25 08:12:02 +04:00
LevelX2	cfadfe9942	* Fixed a problem that subtypes were still present (e.g. for spell cost reduction) for cards cast face down (fixes #4277).	2017-12-24 01:07:35 +01:00
LevelX2	6f8aec173d	[RIX] Added 2 cards.	2017-12-24 00:36:56 +01:00
Zzooouhh	e6fa563919	Merge pull request #4225 from Zzooouhh/master ... Implemented cards, overflow check & other stuff	2017-12-24 00:17:08 +01:00
Zzooouhh	688e0658b7	Moved overflow check method to CardUtil	2017-12-23 23:58:40 +01:00
Zzooouhh	c4334ef043	Moved overflow check method to CardUtil	2017-12-23 23:58:31 +01:00
Zzooouhh	88e421918e	CardUtil overflow	2017-12-23 23:19:33 +01:00
Zzooouhh	2bb4f07df2	CardUtil overflow	2017-12-23 23:17:53 +01:00
Zzooouhh	ab3128975a	Overflow check methods in CardUtil	2017-12-23 23:01:35 +01:00
LevelX2	3df4af2104	[RIX] Added Tetzimoc, Primal Death.	2017-12-23 19:27:47 +01:00
LevelX2	66acc1c1e8	[RIX] Added 6 cards.	2017-12-23 18:54:43 +01:00
spjspj	5af1355083	Merge pull request #4274 from spjspj/master ... Add The Big Idea	2017-12-23 21:03:19 +10:00
LevelX2	ef34b3ca21	[RIX] Added Angrath's Ambusher and Angrath, Minotaur Pirate.	2017-12-23 11:30:12 +01:00
spjspj	f9896be537	Add The Big Idea (UST)	2017-12-23 18:32:20 +11:00
spjspj	118e05516a	Merge pull request #4273 from spjspj/master ... Slight fix	2017-12-23 15:44:01 +10:00
spjspj	5272b88947	Slight fix	2017-12-23 16:43:10 +11:00
Zzooouhh	6fae8ef606	Merge branch 'master' into master	2017-12-22 23:17:20 +01:00
Oleg Agafonov	8624671a52	typos	2017-12-22 09:23:33 +04:00
Oleg Agafonov	39ca5a13f4	Added new set: Explorers of Ixalan (47 cards, 1 token)	2017-12-22 09:18:41 +04:00
LevelX2	43c732c751	[RIX] Added Vona's Hunger.	2017-12-21 17:08:24 +01:00
spjspj	856cb2b71d	Merge pull request #4267 from spjspj/master ... Add Arboria (LEG)	2017-12-21 16:25:48 +10:00
spjspj	3055bac004	Add Arboria (LEG)	2017-12-21 17:07:08 +11:00
LevelX2	eecc322618	[RIX] Added Brass's Bounty.	2017-12-20 16:26:08 +01:00
spjspj	38272a6dde	Add Arboria (LEG)	2017-12-21 01:08:55 +11:00
Zzooouhh	bf6939f45b	Included overflow check methods	2017-12-20 00:31:31 +01:00
Zzooouhh	40561e900a	Included overflow check methods	2017-12-20 00:29:36 +01:00
Zzooouhh	35bbe20b95	Included overflow check methods	2017-12-20 00:21:44 +01:00
Zzooouhh	29c9ce696d	Included overflow check methods	2017-12-20 00:20:27 +01:00
Zzooouhh	4a6ff5593e	More edits	2017-12-19 01:40:44 +01:00
Zzooouhh	a4ce4e4b17	Merge pull request #23 from magefree/master ... Merge https://github.com/magefree/mage	2017-12-18 03:08:01 +01:00
Zzooouhh	860909408d	Minor improvement	2017-12-17 23:03:54 +01:00
Zzooouhh	aa7231bec0	Expanded DoUnlessTargetPlayerOrTargetsControllerPaysEffect	2017-12-17 19:41:22 +01:00
Zzooouhh	982c178921	Added DoUnlessTargetPlayerOrTargetsControllerPaysEffect	2017-12-17 14:46:24 +01:00
spjspj	578ea668bb	Add Summon The Pack (modification - needs the creatures to be zombies (done) but not black)	2017-12-18 00:28:37 +11:00
spjspj	b17d35dff3	Add 1.25 UST cards	2017-12-16 18:04:26 +11:00
spjspj	667b2affdf	Add 2 unstable cards.	2017-12-16 00:34:21 +11:00
spjspj	635c446148	Add 2 unstable cards.	2017-12-14 23:44:18 +11:00
spjspj	f39a0d4a77	Add 2 unstable cards.	2017-12-14 19:21:53 +11:00
spjspj	7645f10202	Add 2 unstable cards.	2017-12-14 10:14:48 +11:00
spjspj	7c855990c9	Add 1 unstable card. Fix dice roll (was only returning '0-(n-1)')	2017-12-12 00:08:37 +11:00
spjspj	46cbaed493	Merge branch 'master' of https://github.com/spjspj/mage	2017-12-10 23:02:33 +11:00
spjspj	eb9f50e370	Crow Storm!	2017-12-10 23:01:55 +11:00
spjspj	f5d16a930f	Merge branch 'master' into master	2017-12-10 21:54:02 +10:00
spjspj	eca218881c	Start adding in Dice Roll effects	2017-12-10 22:51:08 +11:00
spjspj	8e3daf54a9	Start adding in Dice Roll effects	2017-12-10 22:49:55 +11:00
Oleg Agafonov	dce69c18dc	+ improved deck import from deckstats	2017-12-09 18:52:24 +04:00
Oleg Agafonov	763594e579	type	2017-12-08 00:53:46 +04:00
Oleg Agafonov	5fc0393bc7	Deck editor: ... + added warning messages dialog after load/import decks with errors (instead throw exception); + added loading cursors on import-load decks; - fixed null exception error on empty/error deck loading;	2017-12-08 00:20:18 +04:00
Oleg Agafonov	1efc062f66	Decks importer: ... + added support for new decklist text format from deckstats.net (see #4228); + added new checks to text format (too many empty lines, too big card number: more then 100); + fixed double window popup on cancel/close import from clipboard window;	2017-12-07 23:14:22 +04:00
Zzooouhh	230233659b	Some naming changes, Butcher Orgg first strike fix	2017-12-07 11:13:27 +01:00
Oleg Agafonov	5b7ab0de7a	typo	2017-12-07 08:41:59 +04:00
Oleg Agafonov	66a70dd116	- Fixed #4220 - card viewer raise error with alternative card numbers; ... - Fixed potential error on getCardsByRarity; - Added inner checks for wrong booster max card numbers settings;	2017-12-07 08:01:54 +04:00
Zzooouhh	d8daec11d4	Fixed Butcher Orgg handling attackers/blockers leaving combat	2017-12-07 01:04:31 +01:00
Zzooouhh	d6a08fbdd7	NullPointerException fix	2017-12-07 01:01:52 +01:00
Zzooouhh	e1fdc3093a	Some other edits + small fix for Defensive Formation	2017-12-06 21:30:33 +01:00
Zzooouhh	5fec04935d	Optimization edit for assignDamageToBlockers	2017-12-06 20:31:54 +01:00
Zzooouhh	c6e69868fa	Test message cleanup	2017-12-06 19:50:06 +01:00
Zzooouhh	edd07d4f80	Implemented Butcher Orgg (the missing bits)	2017-12-06 19:46:13 +01:00
Zzooouhh	16513408fc	Cleanup #2	2017-12-06 17:05:30 +01:00
Zzooouhh	b48c37ea8f	Defensive Formation slight cleanup	2017-12-06 17:02:49 +01:00
Zzooouhh	47ef2a4ce4	Implemented Butcher Orgg (partially) ... Option to divide damage while being a blocker doesn't work for some reason	2017-12-06 16:31:36 +01:00
Zzooouhh	dcce07cfdc	Implemented Butcher Orgg	2017-12-06 15:00:09 +01:00
LevelX2	8fac7a3dc1	XMage 1.4.26V9	2017-12-03 18:15:16 +01:00
Zzooouhh	7d72172c60	Included Echo counter type	2017-12-02 16:36:54 +01:00
LevelX2	b2e3201ea4	[RIX] Added some cards. Added some spoiler texts to mtg-cards-data.txt	2017-12-02 13:39:30 +01:00
Zzooouhh	659e3d7015	Merge branch 'master' into master	2017-11-26 21:17:27 +01:00
Zzooouhh	32ef8a5047	Small damage fix	2017-11-25 09:10:01 +01:00
Zzooouhh	200e5e07bf	Hollowhenge Spirit fix (partial fix for #4172)	2017-11-25 08:48:21 +01:00
Zzooouhh	b035c436d5	Another small fix	2017-11-25 08:35:18 +01:00
Zzooouhh	a7514fc671	Added mustBlockAllAttackers	2017-11-25 07:49:30 +01:00
Zzooouhh	7cf73917e6	Added mustBlockAllAttackers	2017-11-25 07:47:39 +01:00
Zzooouhh	92e5d8de0a	multiAttackerDamage fix	2017-11-25 07:20:25 +01:00
LevelX2	53448e6dc4	Ficed a problem with Bestow, adding multiple times "AURA" subtype.	2017-11-24 12:30:15 +01:00
Zzooouhh	19ef8f47f2	Final fix	2017-11-23 10:07:54 +01:00
Zzooouhh	0e2096395a	Another watcher fix	2017-11-23 09:56:07 +01:00
Zzooouhh	ce3176adf2	Fix for Giant Turtle/Halls of Mist watcher	2017-11-23 09:32:14 +01:00
Zzooouhh	a40e80e9e5	Created new watcher for Giant Turtle	2017-11-22 20:21:30 +01:00
Zzooouhh	813219df2d	Some changes to how Defensive Formation handles lethal damage	2017-11-22 11:28:36 +01:00
Zzooouhh	bb56568ea1	Implemented Defensive Formation	2017-11-22 02:13:22 +01:00
Zzooouhh	877a98d3d5	Implemented Defensive Formation	2017-11-22 02:08:00 +01:00
Evan Kranzler	afcf3a43d2	fixed Simic Manipulator implementation	2017-11-21 16:42:27 -05:00
Zzooouhh	bbc5f4594b	Implemented Imprison	2017-11-21 17:03:15 +01:00
Zzooouhh	6164a631ba	Fix for Umbra Mystic	2017-11-20 19:17:14 +01:00
theelk801	ad249d7c6b	Merge pull request #4158 from Zzooouhh/master ... Implemented more cards & fix for Grinning Totem	2017-11-18 09:52:01 -05:00
Zzooouhh	8ffa590a08	Alleged text fix ... Will this mess up anything?	2017-11-18 06:59:31 +01:00
Zzooouhh	5cc042779a	Implemented False Orders and Balduvian Warlord	2017-11-17 23:45:40 +01:00
Zzooouhh	ad9b95553f	Implemented Tombstone Stairwell	2017-11-15 00:05:29 +01:00
Zzooouhh	5d1ef487bf	Text fix	2017-11-13 22:03:37 +01:00
Evan Kranzler	036bc12508	fixed delayed end step triggers not triggering if created during an end step	2017-11-11 10:21:17 -05:00
Zzooouhh	de21a86913	Implemented Telekinesis	2017-11-11 12:59:46 +01:00
Zzooouhh	c63da1bb67	Made choosing at least one color mandatory ... 10/1/2005: You can choose any single color or any combination of more than one color. You can't choose colorless.	2017-11-11 12:17:42 +01:00
Zzooouhh	a52c98aa25	Typo fix	2017-11-05 20:49:39 +01:00
LevelX2	f5f6f924f9	XMage 1.4.26V8	2017-11-04 18:50:00 +01:00
LevelX2	a5e80d66f1	Merge origin/master	2017-11-04 18:20:35 +01:00
LevelX2	0d46c68924	* Fixed some problems for handling concede during game init.	2017-11-04 18:19:41 +01:00
Evan Kranzler	cddae049d6	fixed life loss triggers triggering off of 0 life	2017-11-04 12:15:33 -04:00
LevelX2	9a28f8d678	* Fixed that conditional mana colors were not tracked correctly for abilities like Converge.	2017-11-04 16:48:13 +01:00
LevelX2	9704d21c82	* Fixed a problem with player leaving the game during multiplayer game.	2017-11-03 15:50:01 +01:00
LevelX2	9e4beb6b51	* Nettling Impl - Fixed that the conditional delayed destroy ability did not work corretly (fixes #4142).	2017-11-03 14:59:26 +01:00
LevelX2	583033ff3b	Merge pull request #4139 from Zzooouhh/master ... Implemented a whole bunch of cards + fixes for #4131, #4137, #4138 and #4090	2017-11-02 14:08:26 +01:00
LevelX2	02b97aa9b3	Some fixes to: Merge pull request #4129 from jerekwilson/master - Implementing 5 cards	2017-11-02 13:43:49 +01:00
LevelX2	7202e27891	Merge origin/master	2017-11-02 11:17:40 +01:00
LevelX2	b4ee3ff1da	Merge pull request #4101 from magefree/phasingFix ... Fixed how phasing is implemented	2017-11-02 11:00:33 +01:00
LevelX2	f1bbb37c81	Merge origin/master	2017-11-02 10:29:04 +01:00
Zzooouhh	f653ddb921	Another fix for #4090	2017-11-02 07:05:33 +01:00
Zzooouhh	9423c30245	Fix for #4131	2017-11-01 20:40:49 +01:00
Zzooouhh	6e1a3b1b11	Removed garbage imports	2017-10-26 16:06:16 +02:00
Zzooouhh	1296537765	Included new watcher for "you choose blockers..." effects	2017-10-26 15:54:52 +02:00
Zzooouhh	7afb7eb2c5	Merge branch 'master' into master	2017-10-25 16:15:07 +02:00
Evan Kranzler	3746fddf54	fixed Angelic Accord displaying the wrong amount of life gain required (fixes #4132 and #4133)	2017-10-25 07:24:49 -04:00
Zzooouhh	fe9ce16ed2	Reverted MeleeAbility.calculate	2017-10-25 01:10:02 +02:00
Zzooouhh	6a8ce4c6ea	Delete JohanVigilanceAbility.java	2017-10-24 17:04:35 +02:00
Zzooouhh	549f89ac20	Update Combat.java	2017-10-24 17:04:12 +02:00
Zzooouhh	58ff5e017a	Moved JohanVigilanceAbility	2017-10-24 17:01:46 +02:00
Zzooouhh	e82d640060	Implemented Johan	2017-10-24 06:12:10 +02:00
Zzooouhh	7c5562881b	Implemented Johan	2017-10-24 06:10:06 +02:00
Zzooouhh	b153a7c2a2	Implemented Custodi Soulcaller	2017-10-22 23:39:31 +02:00
Zzooouhh	db8e38b587	Implemented Johan	2017-10-22 16:48:47 +02:00
Evan Kranzler	f29141605b	fixed Nissa, Genesis Mage -10 forcing players to put 10 cards into play in order to continue	2017-10-22 09:16:51 -04:00
LevelX2	919ec2fade	Merge origin/master	2017-10-21 16:14:14 +02:00
LevelX2	58d3fc2328	Fixed player leaving/conceding handling.	2017-10-21 16:13:45 +02:00
Evan Kranzler	b30335e344	Implemented Momentum	2017-10-20 10:58:44 -04:00
Evan Kranzler	1452e10128	Implemented Waylay	2017-10-19 07:34:46 -04:00
Evan Kranzler	8cbffc89d8	updated some text and implementations	2017-10-18 14:53:30 -04:00
Evan Kranzler	08bdfcc961	updated some text and implementations	2017-10-18 14:45:30 -04:00
Evan Kranzler	474048bcbc	fixed implementation of Confusion in the Ranks	2017-10-17 14:02:47 -04:00
Evan Kranzler	ba31763a7a	Implemented Rally the Troops	2017-10-16 20:29:53 -04:00
Evan Kranzler	457269cb12	fixed some range of influence issues	2017-10-16 18:12:57 -04:00
Evan Kranzler	587e8a75ef	fixed phased-out permanents not being invalid targets upon resolution	2017-10-16 17:04:04 -04:00
Evan Kranzler	79d4c07d20	updated how Withering Wisps and limited use activated abilities are implemented	2017-10-14 09:04:45 -04:00
Zzooouhh	5735515a31	Implemented Ovinomancer	2017-10-14 10:22:53 +02:00
igoudt	81875d19dc	revert cardtextpredicate to fix issue #4091	2017-10-14 10:07:17 +02:00
Zzooouhh	eba43f1905	Create SacrificeAttachedCost.java	2017-10-12 23:14:09 +02:00
Zzooouhh	36fed5d72e	Create TapAttachedCost.java	2017-10-12 21:28:52 +02:00
Zzooouhh	c82f38e3df	(Credit where it's due)	2017-10-12 18:29:04 +02:00
Zzooouhh	c3c8148baf	Create SkipUntapStepEffect.java	2017-10-12 18:24:32 +02:00
Evan Kranzler	0fc3afb235	fixed Evangelize not being castable when caster controls no creatures. ... (fixes #4094)	2017-10-12 07:56:45 -04:00
Evan Kranzler	9b51694908	fixed embalm and eternalize sometimes giving the token to the wrong player	2017-10-11 13:09:39 -04:00
Evan Kranzler	ab632ef1d0	small fix	2017-10-11 08:35:33 -04:00
Evan Kranzler	81a1e81525	fixed being able to cast spells from an opponents hand when revealed. (fixes #4102)	2017-10-10 19:27:03 -04:00
Evan Kranzler	4116b58414	fixed Venser, Shaper Savant and other similar cards not properly removing copied spells from the stack (fixes #4072)	2017-10-10 16:58:40 -04:00
Evan Kranzler	80f21132eb	fixed Nivmagus Elemental being able to infinitely exile copied spells (fixes #4092)	2017-10-10 16:25:15 -04:00
Evan Kranzler	fdf3f831ca	updated cards which phase things out to properly handle indirect phasing ... (#4071)	2017-10-10 14:32:08 -04:00
Evan Kranzler	3d20e4dbef	changed how phasing is handled	2017-10-10 13:37:05 -04:00
theelk801	51f0e92103	Merge pull request #4100 from magefree/master ... merge	2017-10-10 11:25:00 -04:00
Evan Kranzler	118978e39d	text fixes	2017-10-09 12:23:14 -04:00
Evan Kranzler	f16b5881e8	fext tixes	2017-10-08 09:33:01 -04:00
Evan Kranzler	54b8f10c3c	text fixes and test fixes to fix how tests test text, then more text next	2017-10-07 16:08:06 -04:00
Evan Kranzler	14107b3d55	2 text 2 fixrious	2017-10-07 11:02:36 -04:00
Evan Kranzler	0075535650	so many text fixes	2017-10-06 22:00:06 -04:00
Evan Kranzler	bc2bfba02a	more text fixes	2017-10-06 18:28:22 -04:00
Evan Kranzler	3baabe2534	some text fixes	2017-10-06 16:55:46 -04:00
Evan Kranzler	a63e024ea4	initial setup for phasing fix	2017-10-06 12:29:14 -04:00
Evan Kranzler	0ea78d21ef	Implemented Spheres from Odyssey	2017-10-05 20:13:48 -04:00
Evan Kranzler	b320d1d0f0	Implemented Forgotten Harvest	2017-10-05 18:02:10 -04:00
Evan Kranzler	2733d736d5	fixed Curtain of Light targeting, updated how being unblocked is checked	2017-10-05 13:41:12 -04:00
Evan Kranzler	3b0b923b7c	Implemented Weathered Bodyguards	2017-10-05 13:31:05 -04:00
Evan Kranzler	8c20861e92	Implemented Kjeldoran Home Guard	2017-10-04 18:32:46 -04:00
Evan Kranzler	6725c50b4a	Implemented Elder Land Wurm	2017-10-04 14:19:10 -04:00
Evan Kranzler	1453fa46a7	Fixed Urborg's functionality, also fixed Scarwood Hag not removing forestwalk properly (#4088)	2017-10-03 15:54:42 -04:00
LevelX2	71336a916d	XMage 1.4.26V7	2017-10-03 18:41:06 +02:00
LevelX2	4a71f8af67	Some minot fixes /changes.	2017-10-03 17:24:35 +02:00
Evan Kranzler	de8ae96aaa	Fixed Hour of Eternity's targeting and another small fix that was causing an error	2017-10-02 20:55:02 -04:00
Evan Kranzler	67bc2fb6bb	Updated some power-setting and toughness-setting effects to the correct layers	2017-10-02 16:58:48 -04:00
Evan Kranzler	549103a2f0	some more changes to CDA effects, tested and working correctly	2017-10-02 16:32:36 -04:00
Evan Kranzler	6b2c20b29e	initial commit for changing CDAs interacting with Scarab God/God-Pharaoh's gift (untested)(#4082)	2017-10-02 12:48:15 -04:00
Evan Kranzler	ec3af50090	Implemented Rohgahh of Kher Keep	2017-10-01 11:24:52 -04:00
igoudt	b7cf08bee4	Merge branch 'master' of https://github.com/magefree/mage	2017-10-01 10:06:00 +02:00
igoudt	116104db58	replace loops in triggeredabilities to lambdas	2017-10-01 09:59:15 +02:00
Evan Kranzler	87f237c835	Implemented Moratorium Stone	2017-09-30 16:39:53 -04:00
Evan Kranzler	d15ed359ce	Implemented Infinite Hourglass, updated upkeep-only text generation	2017-09-30 11:14:37 -04:00
Evan Kranzler	ee422e8289	Implemented Skirk Alarmist	2017-09-29 18:28:48 -04:00
Evan Kranzler	bd0417d917	Implemented Sawback Manticore	2017-09-29 18:28:28 -04:00
Evan Kranzler	b25f8c8881	fixed Mind Control and related cards not properly changing control when stolen from another player's library	2017-09-29 18:28:06 -04:00
igoudt	7c34dad8cb	update cardtextpredicate	2017-09-30 00:07:25 +02:00
Evan Kranzler	851b729b0e	fixed emblems not being removed when a player leaves a multiplayer game	2017-09-28 19:41:31 -04:00
Evan Kranzler	f177ce14d2	fixed emblems not being removed when a player leaves a multiplayer game	2017-09-28 19:12:53 -04:00
Evan Kranzler	b70bf04b8e	replaced all "attacks each turn" with "attacks each combat" per the oracle update	2017-09-28 11:30:06 -04:00
Evan Kranzler	db6045c39a	Implemented Mistform Dreamer	2017-09-28 11:29:49 -04:00
Evan Kranzler	9797f4d23b	fixed Mana Web not taking colorless mana into account	2017-09-27 21:19:04 -04:00
Evan Kranzler	84c95b13ab	fixed stolen spells being uncastable when returned to their owner's hand ... fixes #4048, #3753, #3697, #2721, #2713, and probably more	2017-09-27 13:08:29 -04:00
Evan Kranzler	21d3db39c8	fixed color-changing effects removing subtypes	2017-09-26 20:30:52 -04:00
Evan Kranzler	330c0b9702	Implemented Mimeofacture	2017-09-26 09:59:55 -04:00
Evan Kranzler	f7ba5716e9	fixed player becoming monarch incorrectly triggering things when they're already the monarch ... fixes #3527	2017-09-25 20:23:34 -04:00
Evan Kranzler	66ff9c43c1	fixed not being able to cast face-down creatures at instant speed with effects like Winding Canyons and Teferi, Mage of Zhalfir	2017-09-25 20:22:27 -04:00
igoudt	b12b0e29b8	change subtype.contains() to hasSubtype()	2017-09-25 21:21:13 +02:00
theelk801	1951d4fdcc	Merge branch 'master' into master	2017-09-24 15:03:15 -04:00
Evan Kranzler	400ab04620	Implemented Trophy Hunter	2017-09-24 11:26:34 -04:00
Evan Kranzler	f8faae4bb3	Implemented Security Detail	2017-09-24 10:35:12 -04:00
Evan Kranzler	b1e0d49b58	Implemented Sound the Call	2017-09-24 10:16:17 -04:00
Evan Kranzler	52507dbd3d	Implemented Serra Paladin	2017-09-24 09:30:29 -04:00
Evan Kranzler	0681edfa48	updated defending player predicate again	2017-09-23 18:53:12 -04:00
LevelX2	eb842e3219	Merge origin/master	2017-09-24 00:28:21 +02:00
LevelX2	d866234e89	Xmage 1.4.25V6	2017-09-23 23:49:00 +02:00
LevelX2	3ac7fc2726	* Some fixes to possible exceptions.	2017-09-23 23:48:25 +02:00
Evan Kranzler	631acef6b9	updated defending player predicate	2017-09-23 17:40:42 -04:00
theelk801	dafd75e1ab	Merge pull request #80 from magefree/master ... merge	2017-09-23 17:30:43 -04:00
LevelX2	e6225e3ad3	Merge branch 'master' into adjustTargets	2017-09-23 19:27:45 +02:00
LevelX2	0714ae39dc	* Hope of Ghirapur - Fixed a problem with check if current object has daone the damage.	2017-09-23 19:16:21 +02:00
Evan Kranzler	843a09b074	fixed activated abilities not being controlled by the player who activated it (#4047)	2017-09-23 09:59:21 -04:00
theelk801	da176e2b7a	Merge pull request #79 from magefree/master ... merge	2017-09-22 22:57:56 -04:00
Evan Kranzler	59b38b76ec	(#4015) fixed enrage triggers triggering multiple times in combat, ... didn't fix triggers which use amount of damage dealt (Boros Reckoner)	2017-09-22 18:18:30 -04:00
Evan Kranzler	2a9def5f50	Implemented Elephant Resurgence	2017-09-22 16:02:34 -04:00
igoudt	cd31a94ed2	text fixes, gatecreeper vine etb is optional	2017-09-22 14:28:52 +02:00
Evan Kranzler	9384bf8df4	Implemented Apocalypse Sanctuaries	2017-09-21 21:20:42 -04:00
Evan Kranzler	0d49e385d5	small fix	2017-09-19 22:12:50 -04:00
Evan Kranzler	b0c3d6aee6	small fix	2017-09-19 21:56:55 -04:00
Evan Kranzler	bd415215f5	Legacy's Allure modified so its ability can be copied	2017-09-19 20:52:18 -04:00
Evan Kranzler	602eee1928	Vile Requiem modified so its ability can be copied, ... implemented Recantation, Rumbling Crescendo, Serra's Liturgy and War Dance	2017-09-19 20:29:33 -04:00
Evan Kranzler	ce68a1d9ed	Pentarch Paladin is now supported properly	2017-09-19 18:01:37 -04:00
Evan Kranzler	79d3bd24d5	cleaned up some cards, tested that the abilities can be copied	2017-09-19 15:40:45 -04:00
Evan Kranzler	e2a1fa50ea	moved some target choices to CardImpl, they should be properly copiable now	2017-09-19 12:50:19 -04:00
Evan Kranzler	96a3f40891	changed Ancient Hellkite, made predicate for cards/permanents defending player controls/owns	2017-09-19 11:58:55 -04:00
theelk801	2d577287d1	Merge pull request #77 from magefree/master ... merge	2017-09-19 10:32:28 -04:00
Evan Kranzler	7bb7754bb3	Updated how spell triggers get information about the spell that triggered them. ... This prevents countering the spell from removing the effect of the trigger.	2017-09-18 17:02:55 -04:00
Evan Kranzler	6f4d77fc0f	Implemented Gemini Engine	2017-09-18 10:40:15 -04:00
Evan Kranzler	356737075a	Revert "Skulk is now singleton" ... This reverts commit 6ca03a339a.	2017-09-17 19:57:54 -04:00
Evan Kranzler	6ab143c123	Implemented Mine Layer	2017-09-17 18:55:06 -04:00
LevelX2	1d5105c0bd	Xmage 1.4.26V5	2017-09-17 23:11:38 +02:00
theelk801	c32c5d41a2	Merge pull request #75 from theelk801/master ... merge	2017-09-17 15:31:03 -04:00
Evan Kranzler	9a57480f4b	Fixed Dual Nature	2017-09-17 12:42:59 -04:00
theelk801	a6b95db4fc	Merge pull request #73 from magefree/master ... merge	2017-09-16 21:57:19 -04:00
Evan Kranzler	e646c75487	Fixed Dowsing Dagger token	2017-09-16 21:46:12 -04:00
Evan Kranzler	dcddc91144	Updated cards which target cards with attribute x	2017-09-16 21:08:52 -04:00
Evan Kranzler	b3712b88c7	updated Hakim, Loreweaver	2017-09-16 21:06:56 -04:00
Evan Kranzler	856dcb54d5	updated abilities with x targets	2017-09-16 17:07:48 -04:00
Evan Kranzler	d68efc21c5	Changed some X cost abilities (untested)	2017-09-16 12:58:25 -04:00
LevelX2	2d6bcd83f4	xmage 1.4.26V4	2017-09-16 16:55:58 +02:00
LevelX2	563856434d	Some more minor fixes.	2017-09-16 16:03:12 +02:00
LevelX2	afd6bc080d	Removed exception for missing subType to prevent empty card list in older deck editors.	2017-09-16 15:14:52 +02:00
LevelX2	d66a9d1693	Some fixes to red cards.	2017-09-16 15:14:21 +02:00
LevelX2	21c3e2cf02	Some fixes to black cards.	2017-09-16 11:39:33 +02:00
LevelX2	53324c0f4d	Reverted making Menace a MageSingleton.	2017-09-16 10:38:10 +02:00
Evan Kranzler	217a17b864	Removed planeswalker uniqueness rule	2017-09-15 23:34:49 -04:00
theelk801	ecbc4950cd	Merge branch 'master' into master	2017-09-15 18:18:10 -04:00
LevelX2	7d748721da	[XLN] Added 10 cards.	2017-09-16 00:11:38 +02:00
theelk801	a62410d3e5	Merge pull request #67 from magefree/master ... merge	2017-09-15 17:33:51 -04:00
Evan Kranzler	6fe2eaf6a3	Implemented Shore Keeper	2017-09-15 16:51:11 -04:00
LevelX2	82d2953d7b	Merge origin/master	2017-09-15 21:57:54 +02:00
Evan Kranzler	58bba450e0	Added all XLN reprints	2017-09-15 13:24:25 -04:00
LevelX2	5996aa12e6	Trove of Temptation working for Human.	2017-09-15 17:51:54 +02:00
LevelX2	24c2c69a81	Merge master into TroveOfTemptation	2017-09-15 17:12:45 +02:00
Evan Kranzler	c611d71f30	Implemented Spiritual Asylum	2017-09-14 22:23:01 -04:00
Evan Kranzler	10a57b1594	Implemented Energy Storm	2017-09-14 21:12:25 -04:00
theelk801	ba85640c84	Merge pull request #3987 from theelk801/master ... Added XLN cards	2017-09-14 18:17:01 -04:00
Evan Kranzler	7663827a30	Implemented Vance's Blasting Cannons/Spitfire Bastion	2017-09-14 18:14:32 -04:00
LevelX2	d0dfd46c5f	Fixed problem that prevented project generation.	2017-09-14 23:45:48 +02:00
Evan Kranzler	73a8d64d5c	fixed Thraben Sentry	2017-09-14 13:38:25 -04:00
LevelX2	d9c601dd26	Trove of Temptation - Basic some changes to Combat and Human	2017-09-14 17:50:00 +02:00
Evan Kranzler	68a42726a8	Implemented Shadowed Caravel, generalized explore triggers	2017-09-14 11:19:29 -04:00
Evan Kranzler	1ae29e900a	Implemented Guided Passage	2017-09-14 10:02:32 -04:00
theelk801	6802b60d21	Merge pull request #3971 from theelk801/mairsil2 ... Fixed issues with Mairsil (I think) re:#3963	2017-09-14 08:00:56 -04:00
Evan Kranzler	98c2332b3c	a few small changes	2017-09-14 07:04:44 -04:00
Evan Kranzler	6ca03a339a	Skulk is now singleton	2017-09-13 20:38:29 -04:00
Evan Kranzler	b83e12f51c	Menace is now a singleton like other keywords	2017-09-13 15:38:02 -04:00
theelk801	c7cfca6677	Merge pull request #3977 from theelk801/master ... Implemented cards, updated spoiler	2017-09-13 11:08:21 -04:00
LevelX2	c70b548464	Some minor changes.	2017-09-13 17:05:37 +02:00
LevelX2	55917ccc63	* Anthroplasm - Fixed possible null pointer exception.	2017-09-13 17:05:09 +02:00
Evan Kranzler	cd58164b89	Implemented Celestial Gatekeeper	2017-09-13 10:30:35 -04:00
LevelX2	c3157bbcde	* Path of Ancestry - Fixed possible null pointer exception.	2017-09-13 14:52:47 +02:00
Evan Kranzler	69c7668bd0	Implemented Dowsing Dagger/Lost Vale	2017-09-12 16:27:10 -04:00
Evan Kranzler	a26c5a509f	updated various activated abilities	2017-09-12 12:31:00 -04:00
Evan Kranzler	9b25dd0e39	revamped how conditional and limited-use activated abilities are implemented	2017-09-12 09:33:12 -04:00
Evan Kranzler	3a6e2b080b	updated spoiler	2017-09-11 16:40:49 -04:00
Evan Kranzler	650f184ee6	Begin Mairsil fix	2017-09-11 16:26:30 -04:00
theelk801	31acee7624	Merge branch 'master' into subTypeSwitch	2017-09-09 11:16:47 -04:00
Evan Kranzler	f43950c4b8	Fixed various rule texts	2017-09-09 10:16:26 -04:00
Evan Kranzler	3cc178196e	Refactored more subtypes usages to enum	2017-09-08 11:05:58 -04:00
Evan Kranzler	252c941b4f	Refactored more subtypes usages to enum	2017-09-08 09:57:51 -04:00
igoudt	d79c57b907	Merge https://github.com/magefree/mage	2017-09-08 13:12:03 +02:00
igoudt	2355d35e04	small fixes	2017-09-08 13:11:58 +02:00
LevelX2	66c4aec499	* Conspiracy - Fixed that it doesn't revert creature types of non-permanent cards when it leaves the battlefield (fixes #3911).	2017-09-08 12:14:18 +02:00
Evan Kranzler	245bf2f2df	Refactored subtypes to enum	2017-09-07 21:18:19 -04:00
Evan Kranzler	0656f97d7c	Merge branch 'master' of https://github.com/magefree/mage into magefree-master ... # Conflicts: # Utils/mtg-cards-data.txt	2017-09-07 11:36:07 -04:00
Justin Herlehy	b6dceb28c8	Code Cleanup ... Deprecated SubTypeList methods that expect strings and List<String>. Readability cleanup for SubType Enum.	2017-09-06 20:38:11 -07:00
Evan Kranzler	e954de0012	Implemented Fathom Fleet Captain	2017-09-06 18:04:41 -04:00
Evan Kranzler	0f72c4fb22	Additional token effect text changes	2017-09-06 17:39:58 -04:00
Evan Kranzler	6fc78d1d78	Implemented Pirate's Cutlass, changed text templating for creating token effects	2017-09-06 16:21:06 -04:00
Evan Kranzler	fce99fa182	Implemented Conqueror's Galleon/Foothold	2017-09-05 19:39:04 -04:00
theelk801	1f92fbcf3e	Merge pull request #56 from magefree/master ... merge	2017-09-05 13:31:28 -04:00
Evan Kranzler	97e34dab49	Added Explore event	2017-09-05 13:27:45 -04:00
LevelX2	466e524d6e	Fixed possible exception during draft player repplacement.	2017-09-05 16:39:43 +02:00
LevelX2	0ce13bf676	* Grenzo, Havoc Raiser - Fixed that blocked the game.	2017-09-05 16:20:58 +02:00
Evan Kranzler	9e44a1f152	Implemented Huatli, Warrior Poet	2017-09-04 21:02:33 -04:00
Evan Kranzler	d0a4e5a420	Implemented Mavren Fein and Call to the Feast	2017-09-04 17:29:45 -04:00
TacomenX	518bae18df	[XLN] Deeproot Waters + Merfolk Hexproof Token	2017-09-04 01:29:20 -05:00
LevelX2	20a3f6a2c6	xmage 1.4.26V3	2017-09-03 08:21:48 +02:00
LevelX2	66c69e51a3	Started to implement a solution for effects that change words in rule text.	2017-09-03 07:31:36 +02:00
Evan Kranzler	54761f400d	fixed bug #3923	2017-09-02 13:06:13 -04:00
Evan Kranzler	a8abdba0ad	Implemented Huatli, Dinosaur Mage	2017-09-02 10:19:20 -04:00
igoudt	e2ad4a6654	Merge https://github.com/magefree/mage	2017-09-02 13:03:46 +02:00
theelk801	bda6658d79	Merge pull request #50 from magefree/master ... merge	2017-09-01 21:25:20 -04:00
Evan Kranzler	1f382a7ce7	Implemented Jace, Cunning Castaway (ultimate won't work correctly until planeswalker rule is removed) ... various other small changes as well	2017-09-01 21:20:05 -04:00
LevelX2	720351c065	Some minor user handling changes.	2017-09-02 00:46:24 +02:00
LevelX2	5bf12d227c	Some minor changes.	2017-09-01 23:50:07 +02:00
igoudt	43bb541876	Merge https://github.com/magefree/mage	2017-09-01 22:49:50 +02:00
igoudt	f0623d37c9	some cleanups	2017-09-01 22:48:42 +02:00
Evan Kranzler	d28de9e357	Implemented Shifty Doppelganger	2017-09-01 16:38:40 -04:00
LevelX2	84fe04b92d	Replaced exception handling of invalid deck submitting by a user message.	2017-09-01 20:05:26 +02:00
Evan Kranzler	029420a9a8	fixed enrage text	2017-09-01 09:57:11 -04:00
LevelX2	77f6f7b2b6	* Tawnos's Coffin - Fixed that it did not work correctly if abilities were copied by Mairsil, The Pretenderand and general rework.	2017-09-01 12:36:40 +02:00
spjspj	669ae56d6f	Allow Dinosaur to be selected in creature type dialog	2017-08-31 23:27:11 +10:00
Evan Kranzler	13c7c2f231	Implemented Treasure Map/Treasure Cove	2017-08-30 21:56:45 -04:00
Evan Kranzler	3fd7a34944	Implemented Captain Lannery Storm	2017-08-30 20:03:29 -04:00
theelk801	1f607e7429	Merge pull request #47 from magefree/master ... merge	2017-08-30 18:08:28 -04:00
Evan Kranzler	e4cf16f338	Implemented Revel in Riches, added Treasure tokens	2017-08-30 18:06:06 -04:00
theelk801	2ea174724c	Merge pull request #3901 from theelk801/master ... Implemented 4 XLN cards	2017-08-30 11:49:24 -04:00
Evan Kranzler	b2e7b02fd7	Implemented Tishana's Wayfinder	2017-08-30 11:46:16 -04:00
LevelX2	4d832326a3	* Added log message.	2017-08-30 17:31:06 +02:00
LevelX2	40689fe1b9	Fixed possible null pointer exception.	2017-08-30 17:07:57 +02:00
theelk801	6df548dc5d	Merge pull request #3900 from theelk801/master ... Implemented Infernal Denizen, Ripjaw Raptor and Sun-Crowned Hunters	2017-08-29 18:44:16 -04:00
LevelX2	cba7a510ea	* Fixed a bug if casting split cards from other players e.g with Mindclaw Shaman (fixes #3867).	2017-08-30 00:30:46 +02:00
Evan Kranzler	be2f27bfb3	added Enrage as an ability word	2017-08-29 18:22:10 -04:00
LevelX2	e909f5c801	C17 Added Portal Mage.	2017-08-28 16:50:00 +02:00
LevelX2	5660348f98	C17 Added Alms Collector.	2017-08-28 12:44:08 +02:00
LevelX2	ea4af25c77	* Goaded creatures able to attack the goading player (in multiplayer) (fixes #3891). ... * Grenzo, Havoc Raiser - Fixed trigger handling and null pointer exception.	2017-08-27 22:28:13 +02:00
Evan Kranzler	b888e8e634	Implemented Temporal Distortion	2017-08-27 11:08:47 -04:00
theelk801	ad893aee31	Merge pull request #44 from magefree/master ... merge	2017-08-27 11:08:13 -04:00
Evan Kranzler	4bf436b0f4	Fixed Duplicant getting boost from Commander in command zone (#3299)	2017-08-27 09:16:47 -04:00
LevelX2	cb15d4728d	* Dragon Tempest - Fixed a problem if damage was redirected (e.g. with Spellskite) - (fixes #3887).	2017-08-27 14:27:03 +02:00
Evan Kranzler	962ec40d4c	Fixed Nazahn not properly searching for his Hammer.	2017-08-27 08:07:57 -04:00
LevelX2	7e8dcef120	C17 added Seth's Tiger.	2017-08-27 10:57:14 +02:00
LevelX2	f35eee935c	* XMage 1.4.26V2	2017-08-27 08:04:18 +02:00
LevelX2	52897094b3	* Some chnages to chat, user and player handling.	2017-08-26 18:26:55 +02:00
LevelX2	e7a3fee8d7	* Teferi's Protection - Fixed that the damage prevention and protection from did not work correctly (fixes #3879).	2017-08-26 13:24:41 +02:00
LevelX2	cf7d718226	* Some minor changes.	2017-08-26 09:52:51 +02:00
theelk801	ed9320362d	Merge pull request #42 from magefree/master ... merge	2017-08-25 10:14:03 -04:00
LevelX2	04afe73f28	* Fixed that curses selected with Bitterheart Witch or Curse of Misfortunes could be retargeted (fixes #3858).	2017-08-24 16:08:58 +02:00
Evan Kranzler	255b81f143	fixed bug #3834	2017-08-23 21:26:39 -04:00
Evan Kranzler	c6029176d3	Implemented Varchild's War Raiders	2017-08-23 10:52:58 -04:00
Evan Kranzler	d0744486ad	small change	2017-08-23 09:40:11 -04:00
Evan Kranzler	c61651da69	Fixed bug #3777	2017-08-22 21:44:14 -04:00
Evan Kranzler	12cedf945d	Fixed bug #3835, stolen creatures that exploit themselves now trigger for the appropriate player	2017-08-22 21:34:14 -04:00
Evan Kranzler	e3faef4a52	Fixed several cards with ETB abilities that didn't use last known information properly	2017-08-22 13:35:44 -04:00
LevelX2	4c2d8cd8f8	* Improved payment handling of conditional monohybrid colored mana.	2017-08-22 17:51:48 +02:00
LevelX2	5b7fb59b52	* Sepulchral Primordial - Fixed that its ETB ability doesn't trigger if at least one opponent in range had no creature in the graveyard (fixes #3257).	2017-08-22 16:10:40 +02:00
theelk801	4d5e8d4a91	Merge branch 'master' into master	2017-08-22 09:31:16 -04:00
Evan Kranzler	8d85189262	Implemented Mairsil properly	2017-08-22 09:27:07 -04:00
LevelX2	1a4d6ea547	* Vindictive Lich - Fixed cross mode target handling.	2017-08-22 00:37:44 +02:00
LevelX2	2880b32444	* Vindictive Lich - Fixed cross mode target handling.	2017-08-22 00:27:18 +02:00
LevelX2	9ac7fe27f0	* Vindictive Lich (mode target handling not fixed yet).	2017-08-21 18:49:37 +02:00
Evan Kranzler	f33d9006c6	Implemented Mairsil but this is possibly game-breaking	2017-08-21 11:29:34 -04:00
Evan Kranzler	e0c48bfa4e	Implemented Mairsil almost	2017-08-21 10:07:40 -04:00
Evan Kranzler	ebc9b728dd	Implemented Grenzo, Havoc Raiser	2017-08-20 13:50:15 -04:00
Evan Kranzler	f4cdb77513	fixed bug #3857, recoded the C17 curses	2017-08-20 09:54:43 -04:00
LevelX2	09511cc151	* Assembled Alphas - Fixed that the triggered ability did not work.	2017-08-19 08:41:05 +02:00
LevelX2	a439f30c21	Fixed a bug that falsely ended players tournaments.	2017-08-19 07:46:47 +02:00
LevelX2	f4f23f615a	Merge origin/master	2017-08-18 00:26:07 +02:00
Evan Kranzler	53a666a580	Implemented Mathas, Fiend Seeker	2017-08-17 18:18:44 -04:00
LevelX2	c2d70fa1cc	Xmage 1.4.25V1	2017-08-18 00:12:57 +02:00
theelk801	b2270a7f10	Merge pull request #33 from magefree/master ... merge	2017-08-17 15:55:26 -04:00
LevelX2	db93e3f672	* C17 Enchantment Curses - Fixed a bug that could create game errors (index out of bounds).	2017-08-17 21:36:55 +02:00
Evan Kranzler	87635cf1b9	Implemented Disrupt Decorum, implemented goading	2017-08-17 14:56:47 -04:00
LevelX2	0affb45264	* Curse of Opulence - Fixed a bug that could create game error (index out of bounds).	2017-08-17 20:35:36 +02:00
theelk801	df02c32b0d	Merge branch 'master' into c17KindredCycle	2017-08-17 11:13:44 -04:00
LevelX2	2b8737b026	* Fixed text of planeswalker to keep to only include type not name.	2017-08-17 01:11:03 +02:00
Saga\Robert	f69374be8c	- added a Triggered Ability for ETBs or Attacks	2017-08-17 00:18:58 +02:00
Evan Kranzler	341094dc00	Implemented Edgar Markov	2017-08-15 18:08:33 -04:00
Evan Kranzler	57d6a1d995	Implemented The Ur-Dragon, added Eminence as an ability word	2017-08-15 16:03:34 -04:00
LevelX2	118665dfd4	Minor change.	2017-08-15 01:56:48 +02:00
LevelX2	1fb24116ae	xmage 1.4.26V0	2017-08-15 01:27:06 +02:00
LevelX2	4b8e9c1525	Merge pull request #3810 from Eleros/C17 ... Implemented C17 Curse cycle	2017-08-14 23:10:52 +02:00
LevelX2	6244046330	* Some minor changes.	2017-08-14 16:48:48 +02:00
Saga\Robert	478a0b8ea8	- updated available set info of Zombie and Gold tokens ... - added Curse of Vitality - added Curse of Verbosity - added Curse of Disturbance - added Curse of Opulence - added Curse of Bounty - added Curse cycle to C17	2017-08-13 17:52:48 +02:00
LevelX2	1694daa4ab	Merge pull request #3801 from theelk801/master ... Implemented Charmed Griffin, Chieftain en-Dal, Chill Haunting, Chime of Night, Cleansing, and Coiling Woodwurm	2017-08-13 16:28:10 +02:00
Saga\Robert	9a2ea73ec0	- added Rat token with Deathtouch	2017-08-12 19:19:35 +02:00
spjspj	10e4d20e47	Merge branch 'master' into master	2017-08-12 17:58:24 +10:00
spjspj	f41effe979	Implement Nazahn, Revered Bladesmith (C17)	2017-08-12 17:56:55 +10:00
Justin Herlehy	4e15194d08	Merge pull request #3784 from Eleros/feature/HASCON2017Promos ... Implemented Grimlock, Dinobot Leader // Grimlock, Ferocious King & Balan, Wandering Knight	2017-08-11 15:26:23 -07:00
theelk801	ff47290039	Merge pull request #20 from magefree/master ... merge	2017-08-11 18:20:53 -04:00
Evan Kranzler	fcd6edfe6f	Implemented Charmed Griffin, added filter, fixed Hunted Wumpus wording	2017-08-10 08:18:27 -04:00
LevelX2	a3e7aa6230	* Karn Liberated - fixed that after using its -14 ability the game does not properly set the starting player of the new game (fixes #3786).	2017-08-10 07:04:32 +02:00
theelk801	3a52ce609d	Implemented Carrion, Cephalid Pathmage, Cephalid Inkshrouder and Ceremonial Guard (#3793) ... * Implement Epicenter * Implement Infested Roothold * Implement Brown Ouphe * Implement Rust * Implement Ouphe Vandals * Implement Fatal Attraction * Implement Fighting Chance * Implement Arcbound Fiend * Implement Carry Away * Implement Caverns of Despair * Implement Amulet of Unmaking * Implement Aphetto Exterminator * Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor * Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman * Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter * Implement Brown Ouphe * Implemented Break Open * Implemented Carrion * Implemented Cephalid Pathmage * Implemented Cephalid Inkshrouder * Implemented Ceremonial Guard	2017-08-09 23:13:36 -05:00
Eleros	b770e8ba51	Merge branch 'master' into feature/HASCON2017Promos	2017-08-09 22:11:19 +02:00
Evan Kranzler	7838049c14	Implemented Carrion	2017-08-09 12:41:32 -04:00
theelk801	385e462f15	Implemented Epicenter, Infested Roothold, Brown Ouphe, Rust, Ouphe Vandals, Fatal Attraction, Fighting Chance, Arcbound Fiend, Carry Away, Caverns of Despair, Amulet of Unmaking, Aphetto Exterminator, Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound, Boa Constrictor, Bola Warrior, Brass Talon Chimera, Briar Patch, Brine Shaman, Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin (#3779) ... * Implement Epicenter * Implement Infested Roothold * Implement Brown Ouphe * Implement Rust * Implement Ouphe Vandals * Implement Fatal Attraction * Implement Fighting Chance * Implement Arcbound Fiend * Implement Carry Away * Implement Caverns of Despair * Implement Amulet of Unmaking * Implement Aphetto Exterminator * Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor * Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman * Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter	2017-08-08 21:49:14 -05:00
theelk801	8b36b16b09	Merge pull request #17 from magefree/master ... merge	2017-08-08 17:44:15 -04:00
Evan Kranzler	e47798d6c9	Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter	2017-08-08 14:28:32 -04:00
igoudt	2ca7927580	AddCardSubtypeAllEffect uses SubType enum	2017-08-08 17:11:21 +02:00
Saga\Robert	05f5b99a99	- changed Autobot and Dinosaur to fantasy types	2017-08-07 22:35:08 +02:00
igoudt	19a8f3c4c1	fix fired event for eternalize	2017-08-07 22:30:34 +02:00
igoudt	4dc3419efa	fix some subtypes for becomesBasiclandTargetEffect	2017-08-07 22:26:17 +02:00
igoudt	8d52e995e8	change BEcomesBasicLandTargetEffect to use SubType	2017-08-07 21:58:59 +02:00
Evan Kranzler	515fb58bc0	Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor	2017-08-07 14:22:09 -04:00
Saga\Robert	21b892a9b4	-added EquippedMultipleSourceCondition (to check if permanent has 2 or more Equipments attached)	2017-08-07 17:03:21 +02:00
theelk801	c989fde625	Merge pull request #16 from magefree/master ... merge	2017-08-06 21:37:50 -04:00
Saga\Robert	2a9d8edee8	- added Autobot and Dinosaur Subtypes ... - added TransformedPredicate(checks isTransformed())	2017-08-07 01:28:17 +02:00
igoudt	ead0141b5b	fix spreading seas	2017-08-06 22:58:20 +02:00
igoudt	5d99bacf73	fix subtype in game state	2017-08-06 22:11:26 +02:00
igoudt	6336f82845	remove redundant cardgraphicinfo instances	2017-08-06 17:23:03 +02:00
igoudt	f793504ba0	remove hasSubType(String s)	2017-08-06 17:22:11 +02:00
Evan Kranzler	6a49135479	Implement Carry Away	2017-08-06 09:35:02 -04:00
LevelX2	9a1ce3f449	Merge pull request #3769 from Eleros/feature/HASCON2017Promos ... Feature/hascon2017 promos	2017-08-04 22:39:20 +02:00
Evan Kranzler	d9649fd54c	Implement Common Cause	2017-08-04 15:39:10 -04:00
Evan Kranzler	65004d1a5f	Fix Mindless Null and Can't Block effect	2017-08-02 14:21:08 -04:00
ingmargoudt	2192a517ce	Merge pull request #3774 from ingmargoudt/master ... fixing choosing creature types	2017-08-02 08:06:07 +02:00
igoudt	449e82a796	fixing choosing creature types	2017-08-02 08:04:26 +02:00
Saga\Robert	2e1a820040	- added gold color ... - added gold Dragon Token - edited new set data (H17) for Sword of Dungeons and Dragons	2017-08-01 14:55:17 +02:00
LevelX2	1e3f9bffc6	* Fixed that morphed permanents (face down) had wrongly the cumulative mana costs of their face-up side instead of 0(fixes #3726).	2017-08-01 12:20:05 +02:00
LevelX2	ad12c75c20	* Cinder cloud - Fixed the check for "dies this way".	2017-07-31 20:55:29 +02:00
LevelX2	7a1245e2fe	Fixed a problem of DiesTriggeredAbility that produced null pointer exception.	2017-07-31 20:42:32 +02:00
LevelX2	7b168a9d5e	* Minds Aglow - Fixed that payed mana can be undone if X was set to a too high value.	2017-07-30 18:50:36 +02:00
LevelX2	69e239d2ed	Xmage 1.4.25V0 (update because of Log problem)	2017-07-30 08:54:37 +02:00
ciaccona007	bd4d00f031	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-29 20:08:04 -04:00
ciaccona007	d484991818	Fix problem in Permanent.destroy()	2017-07-29 19:07:25 -04:00
igoudt	89ac77e28a	clean ups, talk to interface rather than implementation	2017-07-29 23:55:11 +02:00
LevelX2	fe2ee5dfec	Xmage 1.4.25V0	2017-07-29 20:35:16 +02:00
LevelX2	6530b404c8	* Some Aftermath fixes.	2017-07-29 20:13:48 +02:00
LevelX2	0ef94a588c	* Fixed some null pointer or other exception bugs.	2017-07-29 19:13:42 +02:00
LevelX2	18cab46b05	* Improved editor search function, fixed some problems with search for split card rules.	2017-07-29 11:43:05 +02:00
LevelX2	1ddd063928	* Some Aftermath rule text fixes.	2017-07-29 11:40:51 +02:00
LevelX2	b9dff66fcb	* Kormus Bell - Fixed a bug with order land type changing effects are applied (fixes #3470).	2017-07-28 16:56:31 +02:00
LevelX2	ffd0c24c9c	Some minor changes.	2017-07-28 12:21:52 +02:00
ciaccona007	6e2679ed48	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-27 15:59:51 -04:00