42170 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
maustin	9d9826402f	Merge remote-tracking branch 'Austin/mh1spoilers' into mh1spoilers ... # Conflicts: # forge-gui/res/cardsfolder/upcoming/yawgmoth_thran_physician.txt	2019-05-27 18:24:06 +01:00
austinio7116	de21a14a77	Added new cards to MH1 editions file	2019-05-27 18:22:55 +01:00
austinio7116	f71b4cc739	Some MH1 spoilers from forgescribe	2019-05-27 18:19:40 +01:00
austinio7116	b5920a5ac2	Merge branch 'patch-20' into 'master' ... Yawgmoth, Thran Physician See merge request core-developers/forge!1721	2019-05-27 17:15:42 +00:00
austinio7116	c1265ce8c3	Some MH1 spoilers from forgescribe	2019-05-27 18:13:57 +01:00
Charles Baker	f4d5e337a2	Yawgmoth, Thran Physician	2019-05-27 15:55:18 +00:00
Charles Baker	cba21451c1	Orim's Thunder Update	2019-05-27 04:54:23 +00:00
Agetian	1a0988336e	Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master	2019-05-26 13:01:31 +03:00
swordshine	25620ec33c	Merge branch 'patch-17' into 'master' ... Sword of Sinew and Steel See merge request core-developers/forge!1717	2019-05-26 06:14:16 +00:00
swordshine	37325b8a9e	Merge branch 'patch-16' into 'master' ... Sword of Truth and Justice See merge request core-developers/forge!1716	2019-05-26 06:13:42 +00:00
swordshine	d8593cff8f	Merge branch 'patch-15' into 'master' ... Archmage's Charm See merge request core-developers/forge!1715	2019-05-26 06:11:29 +00:00
swordshine	de0149dace	Merge branch 'patch-18' into 'master' ... Update Modern Horizons edition file See merge request core-developers/forge!1718	2019-05-26 06:07:07 +00:00
swordshine	3f632d74d7	Merge branch 'patch-14' into 'master' ... Condemn update See merge request core-developers/forge!1714	2019-05-26 06:05:49 +00:00
Charles Baker	8b561bacfd	Update Modern Horizons edition file	2019-05-26 03:06:52 +00:00
Charles Baker	427d23dfa4	Sword of Sinew and Steel	2019-05-26 03:02:21 +00:00
Charles Baker	17bb054bc4	Sword of Truth and Justice	2019-05-26 02:45:44 +00:00
Charles Baker	af935f96ce	Archmage's Charm	2019-05-26 02:28:34 +00:00
Charles Baker	94c21f7fff	Condemn update	2019-05-26 02:08:23 +00:00
swordshine	b590e9613c	Merge branch 'patch' into 'master' ... Update more scripts See merge request core-developers/forge!1713	2019-05-25 16:42:36 +00:00
swordshine	d6f32071e3	Update more scripts	2019-05-26 00:41:07 +08:00
swordshine	03e6c71b10	Merge branch 'patch' into 'master' ... Patch See merge request core-developers/forge!1712	2019-05-25 16:19:22 +00:00
swordshine	c3ff31f078	Update more scripts	2019-05-26 00:13:00 +08:00
Agetian	d8c39bd5da	Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master	2019-05-25 19:04:34 +03:00
swordshine	8ba80940da	Merge branch 'patch' into 'master' ... Update some scripts See merge request core-developers/forge!1710	2019-05-25 16:02:48 +00:00
Agetian	8101af1fa2	- Fixed Mox Tantalite.	2019-05-25 19:02:33 +03:00
swordshine	3659bd6777	Update some scripts	2019-05-26 00:02:29 +08:00
swordshine	4fc93a3f71	Merge branch 'mh1spoilers' into 'master' ... Mh1spoilers See merge request core-developers/forge!1695	2019-05-25 15:57:59 +00:00
Michael Kamensky	5563cbe3b5	Merge branch 'master' into 'master' ... Added puzzle PS_WAR3: Possibility Storm - War of the Spark 03 See merge request core-developers/forge!1709	2019-05-25 14:53:11 +00:00
Agetian	da0e89fde9	- Added puzzle PS_WAR3.	2019-05-25 17:52:20 +03:00
maustin	5dbc01b81b	Merge remote-tracking branch 'Austin/mh1spoilers' into mh1spoilers ... # Conflicts: # forge-gui/res/cardsfolder/upcoming/bazaar_trademage.txt # forge-gui/res/cardsfolder/upcoming/mother_bear.txt	2019-05-25 15:07:41 +01:00
austinio7116	46bfb76a84	Updated modern horizons edition file tokens	2019-05-25 15:05:19 +01:00
austinio7116	8a59d00423	Updated modern horizons edition file	2019-05-25 15:05:19 +01:00
austinio7116	bd23f13dbc	More spoilers from forgescribe	2019-05-25 15:05:19 +01:00
austinio7116	7ce5f9a94c	Remove unsupported Slice onto instant/sorcery for now	2019-05-25 15:01:18 +01:00
austinio7116	4306c16e57	Updated modern horizons edition file	2019-05-25 15:01:18 +01:00
austinio7116	36db4d8d14	Some of today's spoilers from forgescribe - untested	2019-05-25 15:01:18 +01:00
Michael Kamensky	ab982a7ebd	Merge branch 'master' into 'master' ... AnimateAllAi: implement an "Always" logic hook for cards that are beneficial to activate Closes #1004 See merge request core-developers/forge!1708	2019-05-25 05:06:46 +00:00
Agetian	8caf66ecea	- AnimateAllAi: implement an "Always" logic hook for cards that are generally beneficial to activate.	2019-05-25 08:05:03 +03:00
Michael Kamensky	6c6cdbe9d7	Merge branch 'master' into 'master' ... Fix a logic error in RearrangeTopOfLibrary AI Closes #1005 See merge request core-developers/forge!1707	2019-05-25 04:06:55 +00:00
Agetian	1c0f98e55a	- Fix a logic error in RearrangeTopOfLibrary AI	2019-05-25 07:05:18 +03:00
Michael Kamensky	08b426b49c	Merge branch 'master' into 'master' ... Fix Ob Nixilis's Cruelty. Closes #1003 See merge request core-developers/forge!1706	2019-05-25 04:01:12 +00:00
Agetian	9cd92946b0	- Fix Ob Nixilis's Cruelty.	2019-05-25 07:00:41 +03:00
austinio7116	13eb77fb78	Updated modern horizons edition file tokens	2019-05-24 22:59:30 +01:00
austinio7116	66eccbf287	Updated modern horizons edition file	2019-05-24 22:57:54 +01:00
austinio7116	84de707081	More spoilers from forgescribe	2019-05-24 22:51:52 +01:00
Michael Kamensky	ade5107200	Merge branch 'ai-clone-legendary' into 'master' ... Make the AI consider the NonLegendary flag on AF Clone and AF CopyPermanent Closes #999 See merge request core-developers/forge!1704	2019-05-24 16:00:49 +00:00
austinio7116	d34a216176	Remove unsupported Slice onto instant/sorcery for now	2019-05-24 16:56:36 +01:00
swordshine	c8f21c2c8a	Merge branch 'patch' into 'master' ... Update some scripts See merge request core-developers/forge!1705	2019-05-24 03:52:42 +00:00
swordshine	e020fce608	Update some scripts	2019-05-24 11:52:20 +08:00
swordshine	ca8cb7c312	Merge branch 'patch-13' into 'master' ... Umezawa's Charm See merge request core-developers/forge!1703	2019-05-24 03:45:38 +00:00