45880 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
swordshine	aab0dea4c0	Merge branch 'ZN5' into 'master' ... ZNR 5 Sep See merge request core-developers/forge!3111	2020-09-08 02:25:09 +00:00
Tim Mocny	dcd63ca847	ZNR 5 Sep	2020-09-08 02:25:08 +00:00
Sol	3b966bfee3	Merge branch 'time_to_party' into 'master' ... Adding initial handling for Party See merge request core-developers/forge!3112	2020-09-08 00:48:10 +00:00
swordshine	c56d7b88e7	Merge branch 'master' into 'master' ... update simplified chinese translation See merge request core-developers/forge!3113	2020-09-08 00:21:46 +00:00
swordshine	07f4fad4db	Merge branch 'ZNR7' into 'master' ... ZNR 7 Sep See merge request core-developers/forge!3115	2020-09-08 00:21:31 +00:00
Tim Mocny	725ec728a3	ZNR 7 Sep	2020-09-08 00:21:31 +00:00
CCTV-1	04f27f2fa7	update simplified chinese translation	2020-09-07 18:25:04 +08:00
Michael Kamensky	83c770df40	Merge branch 'eldsecret' into 'master' ... Borderless 'walkers and showcase frames OK for draft boosters See merge request core-developers/forge!3095	2020-09-07 04:49:42 +00:00
Tim Mocny	d5be9d80e7	Borderless 'walkers and showcase frames OK for draft boosters	2020-09-07 04:49:42 +00:00
Michael Kamensky	1bf1d65640	Merge branch 'quest-ui-improvements' into 'master' ... Quest Mode spell shop UI fixes and improvements See merge request core-developers/forge!3097	2020-09-07 04:47:43 +00:00
friarsol	c58e4d30b3	Better way to handle AllCreatureTypes	2020-09-06 22:08:59 -04:00
Sol	c250cdfda8	Merge branch 'tokenimg_txt' into 'master' ... Purge typos from token-images.txt See merge request core-developers/forge!3098	2020-09-07 01:57:15 +00:00
Sol	d544fd0ddf	Merge branch 'iml-gitignore' into 'master' ... GitIgnore - Filter *.iml independent of path See merge request core-developers/forge!2990	2020-09-07 01:51:30 +00:00
Sol	6fad881f69	Merge branch 'hornstack' into 'master' ... horn_of_deafening.txt StackDescription$ SpellDescription See merge request core-developers/forge!3099	2020-09-07 01:51:10 +00:00
Sol	d143b4a451	Merge branch 'finalerev' into 'master' ... finale_of_revelation.txt only your graveyard if X≥10 See merge request core-developers/forge!3101	2020-09-07 01:47:49 +00:00
Sol	eee2c0763d	Merge branch 'teferitt' into 'master' ... teferis_time_twist.txt add Cleanup See merge request core-developers/forge!3102	2020-09-07 01:42:33 +00:00
Sol	988ff8e2fb	Merge branch 'trusty' into 'master' ... trusty_retriever.txt fix second mode See merge request core-developers/forge!3103	2020-09-07 01:41:08 +00:00
Sol	f94abc426a	Merge branch 'typo' into 'master' ... dawn_to_dusk.txt fix TgtPrompt See merge request core-developers/forge!3104	2020-09-07 01:40:27 +00:00
Sol	2299ac4788	Merge branch 'patch-12' into 'master' ... Update Secret Lair Drop Series.txt (Yargle Day) See merge request core-developers/forge!3105	2020-09-07 01:38:27 +00:00
Sol	333a38433c	Merge branch 'ZNR4' into 'master' ... ZNR 4 Sep See merge request core-developers/forge!3110	2020-09-07 01:36:59 +00:00
Tim Mocny	8abe6b1796	ZNR 4 Sep	2020-09-07 01:36:59 +00:00
Sol	f32e636e27	Merge branch 'tokentypo' into 'master' ... Token haste fix See merge request core-developers/forge!3094	2020-09-07 01:36:07 +00:00
Sol	75582e5505	Merge branch 'ZNRnissa' into 'master' ... nissa_of_shadowed_boughs.txt See merge request core-developers/forge!3106	2020-09-07 01:34:12 +00:00
Tim Mocny	28f6e5d831	nissa_of_shadowed_boughs.txt	2020-09-07 01:34:12 +00:00
Sol	35dcfc486b	Merge branch 'ZNR3' into 'master' ... ZNR 3 Sep See merge request core-developers/forge!3109	2020-09-07 01:33:34 +00:00
Tim Mocny	c65b001a4d	ZNR 3 Sep	2020-09-07 01:33:33 +00:00
Sol	a1a3c780e4	Merge branch 'shopimages' into 'master' ... Quest Mode Spell Shop See merge request core-developers/forge!3096	2020-09-07 01:31:47 +00:00
Sol	e449eb8fba	Merge branch 'patch-6' into 'master' ... Update de-DE.properties See merge request core-developers/forge!3100	2020-09-07 01:22:55 +00:00
Sol	fd174bc6c8	Merge branch 'ZNR2' into 'master' ... ZNR 2 Sep See merge request core-developers/forge!3108	2020-09-07 01:21:00 +00:00
Tim Mocny	c226a928bc	ZNR 2 Sep	2020-09-07 01:20:59 +00:00
Sol	d32e0552b1	Merge branch 'ZNR1' into 'master' ... ZNR 1 Sep See merge request core-developers/forge!3107	2020-09-07 01:16:33 +00:00
Tim Mocny	2ce207fcd7	ZNR 1 Sep	2020-09-07 01:16:33 +00:00
friarsol	7d341bd5e2	Only you control and fix Changelings better	2020-09-06 13:16:29 -04:00
friarsol	a81e15ca31	Adding initial handling for Party	2020-09-05 23:09:23 -04:00
Sol	6ee974893d	Update worlds.txt	2020-09-05 03:05:59 +00:00
John	7474264620	Update Secret Lair Drop Series.txt (Yargle Day)	2020-09-01 16:31:42 +00:00
Northmoc	2279c9cf05	dawn_to_dusk.txt fix TgtPrompt	2020-08-31 14:20:28 -04:00
Northmoc	219f51a6c3	trusty_retriever.txt fix second mode	2020-08-31 14:12:40 -04:00
Northmoc	5659c9ad1b	teferis_time_twist.txt add Cleanup	2020-08-31 13:09:04 -04:00
Northmoc	3b7aaad406	finale_of_revelation.txt only your graveyard if X 10 or more	2020-08-31 12:59:18 -04:00
Michael Kamensky	ecb47ad848	- Fix imports.	2020-08-31 08:06:45 +03:00
Andreas Bendel	6a88882c3f	Update de-DE.properties	2020-08-29 20:58:31 +00:00
Northmoc	126af172f4	horn_of_deafening.txt StackDescription$ SpellDescription	2020-08-29 15:42:27 -04:00
Northmoc	45356f69d8	typos	2020-08-29 15:00:24 -04:00
Michael Kamensky	627670614a	- Internationalization support for Select All.	2020-08-29 15:23:06 +03:00
Michael Kamensky	da7c9ba474	- Add the Select All button to spell shop inventory when the UI allows it (landscape mode, running on desktop), part 2.	2020-08-29 09:06:03 +03:00
Michael Kamensky	9110d11d5c	- Add the Select All button to spell shop inventory when the UI allows it (landscape mode, running on desktop).	2020-08-29 09:05:41 +03:00
Michael Kamensky	9e9e7187d1	- Fix quest spell shop crashing due to threading issues when applying advanced filters (patch contributed by Nefigah).	2020-08-29 09:05:05 +03:00
Northmoc	63d7b44b15	add ELD, IKO, M21 boosters	2020-08-28 17:13:52 -04:00
Northmoc	a606f729ee	: not ;	2020-08-28 15:05:39 -04:00