41693 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
swordshine	e264a92e82	Merge branch 'patch' into 'master' ... Implement Return from Extinction See merge request core-developers/forge!1783	2019-06-05 00:59:56 +00:00
swordshine	a442122c7b	Merge branch 'false-order' into 'master' ... False Orders and Balduvian Warlord See merge request core-developers/forge!1758	2019-06-05 00:59:40 +00:00
Adam Pantel	0a3f47e721	Descriptions, Cleanup	2019-06-04 16:20:20 -04:00
apantel	9b1d500073	BlockEffect and related cards	2019-06-04 12:42:43 -04:00
swordshine	ee7f1f4136	Fix Sisay, Weatherlight Captain by Marvel, Dawnbringer	2019-06-04 22:58:27 +08:00
Michael Kamensky	6bbc8d54df	Merge branch 'master' into 'master' ... Added puzzle PS_WAR5 - Possibility Storm - War of the Spark 05 See merge request core-developers/forge!1784	2019-06-04 14:25:42 +00:00
Agetian	70b12a439a	- Added puzzle PS_WAR5.	2019-06-04 17:24:59 +03:00
swordshine	74b84f43cb	Fix Return from Extinction	2019-06-04 19:18:06 +08:00
swordshine	523d965571	Merge branch 'last-mh1-charms' into 'master' ... Add Return from Extinction, Shatter Assumptions See merge request core-developers/forge!1770	2019-06-04 10:51:58 +00:00
Michael Kamensky	859c02c881	Merge branch 'patch' into 'master' ... Add Valiant Changeling See merge request core-developers/forge!1782	2019-06-04 10:39:50 +00:00
swordshine	454d644947	Fix a typo	2019-06-04 18:14:02 +08:00
swordshine	8b7b50b85d	Add Valiant Changeling	2019-06-04 18:12:00 +08:00
swordshine	4d325d3fa2	Merge branch 'patch' into 'master' ... Update String of Disappearances See merge request core-developers/forge!1781	2019-06-04 08:15:29 +00:00
swordshine	1c7e1a226f	Update String of Disappearances	2019-06-04 16:15:07 +08:00
swordshine	5055d42279	Merge branch 'some-missing-mh1-cards' into 'master' ... Add String of Disappearances, Aria of Flame See merge request core-developers/forge!1765	2019-06-04 08:11:21 +00:00
pfirpfel	aa320fccea	Add Aria of Flame, String of Disappearances	2019-06-04 10:05:21 +02:00
swordshine	b437347791	Merge branch 'patch' into 'master' ... Update some scripts See merge request core-developers/forge!1779	2019-06-04 07:58:28 +00:00
Michael Kamensky	f8402c2fa5	Merge branch 'master' into 'master' ... Fixed Casualties of War description. See merge request core-developers/forge!1780	2019-06-04 07:58:27 +00:00
Agetian	fce5293eba	- Fixed Casualties of War description.	2019-06-04 10:58:03 +03:00
swordshine	d9168ba658	Update some scripts	2019-06-04 15:57:58 +08:00
swordshine	4f2515994f	Merge branch 'mhspoilers2' into 'master' ... scripts by nikivan plus Glacial Revelation See merge request core-developers/forge!1774	2019-06-04 07:47:58 +00:00
Michael Kamensky	83b3564f9e	Merge branch 'master' into 'master' ... Added AI hint for Thundering Ceratok. See merge request core-developers/forge!1778	2019-06-04 07:26:02 +00:00
Agetian	cb1b6cf2f0	- Added AI hint for Thundering Ceratok.	2019-06-04 10:25:39 +03:00
Michael Kamensky	4a2721a151	Merge branch 'master' into 'master' ... Card description patch See merge request core-developers/forge!1777	2019-06-04 07:19:03 +00:00
Agetian	0a18874567	- Card description patch.	2019-06-04 10:18:36 +03:00
Michael Kamensky	aad506da0c	Merge branch 'master' into 'master' ... - Some more minor card/AI fixes. See merge request core-developers/forge!1776	2019-06-04 07:15:01 +00:00
Agetian	c412b726a1	- Some more minor card/AI fixes.	2019-06-04 10:14:33 +03:00
Michael Kamensky	6441300d55	Merge branch 'master' into 'master' ... Fix RemoveCounterAi logic for Price of Betrayal and other cases, various minor card fixes See merge request core-developers/forge!1775	2019-06-04 07:08:17 +00:00
Agetian	635ebf1d67	- Assorted minor card fixes.	2019-06-04 10:07:18 +03:00
Agetian	43117e8c98	- Fix RemoveCounterAi logic for Price of Betrayal	2019-06-04 10:05:37 +03:00
austinio7116	5b0bcc8d10	Added glacial revelation	2019-06-04 06:35:40 +01:00
austinio7116	834301d382	Ayula, Queen Among Bears by nikivan	2019-06-04 06:29:00 +01:00
maustin	6b06b1df9d	Merge remote-tracking branch 'Austin/mhspoilers2' into mhspoilers2	2019-06-04 06:26:49 +01:00
austinio7116	8c3967afec	Marit Lage's Slumber by nikivan	2019-06-04 06:26:24 +01:00
austinio7116	85068deb3b	Merge branch 'last-mh1-slivers' into 'master' ... Add Spiteful Sliver, Scuttling Sliver See merge request core-developers/forge!1769	2019-06-04 05:20:31 +00:00
Charles Baker	d44ac939e9	WIP: Giver of Runes	2019-06-04 01:33:26 +00:00
swordshine	ec9e725823	Merge branch 'patch-30' into 'master' ... Winding Way See merge request core-developers/forge!1772	2019-06-04 00:44:01 +00:00
swordshine	ba882998a6	Merge branch 'patch-29' into 'master' ... Update ephemerate script clean up. See merge request core-developers/forge!1771	2019-06-04 00:43:21 +00:00
swordshine	41306dd95a	Merge branch 'master' into 'master' ... Moving hard-coded text to en-US.properties file See merge request core-developers/forge!1768	2019-06-04 00:41:46 +00:00
swordshine	9dcdcd787d	Merge branch 'mh1-cards-3' into 'master' ... Add Springbloom Druid, Soul-Strike Technique, Settle Beyond Reality See merge request core-developers/forge!1767	2019-06-04 00:39:33 +00:00
Charles Baker	0abffed28f	Winding Way	2019-06-03 23:29:07 +00:00
Charles Baker	2acbf4d576	Update ephemerate.txt	2019-06-03 22:34:59 +00:00
Churrufli	318a6eea8f	Update es-es.properties	2019-06-03 22:01:18 +00:00
Charles Baker	7c3783c935	Update ephemeral script clean up.	2019-06-03 21:25:50 +00:00
pfirpfel	8d35381454	Add Return from Extinction, Shatter Assumptions	2019-06-03 21:58:41 +02:00
pfirpfel	c30828acd3	Add Spiteful Sliver, Scuttling Sliver	2019-06-03 21:15:02 +02:00
Churrufli	b886cbadd2	Update en-US.properties	2019-06-03 18:30:57 +00:00
Churrufli	f3286e6474	Update de-DE.properties	2019-06-03 18:25:28 +00:00
churrufli	83817e21b6	Moving hard-coded text to en-US.properties file	2019-06-03 20:15:13 +02:00
pfirpfel	41e7bdba1d	Add Springbloom Druid, Soul-Strike Technique, Settle Beyond Reality	2019-06-03 20:03:03 +02:00