43884 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Kamensky	596296cabf	Merge branch 'dashAltFix' into 'master' ... Dash: fix keyword after AlternativeCost See merge request core-developers/forge!2381	2020-01-06 06:35:15 +00:00
Hans Mackowiak	adcd86e7d7	Dash: fix keyword after AlternativeCost	2020-01-06 06:35:14 +00:00
Adam Pantel	308768ae50	Unneeded SubAbility on Primordial Mist	2020-01-05 23:42:31 -05:00
swordshine	235636ca4a	Merge branch 'patch' into 'master' ... Update more scripts See merge request core-developers/forge!2376	2020-01-05 08:13:41 +00:00
swordshine	359ce5e39d	Update more scripts	2020-01-05 15:54:15 +08:00
swordshine	c6e13e98b3	Merge branch 'patch-9' into 'master' ... THB 1/4 See merge request core-developers/forge!2375	2020-01-05 07:52:40 +00:00
Tim Mocny	0cc9687e39	THB 1/4	2020-01-05 07:52:39 +00:00
swordshine	3d59f1832c	Allure of the Unknown should reveal first	2020-01-05 14:09:33 +08:00
swordshine	58fdd58e9a	Update scripts	2020-01-05 13:29:50 +08:00
swordshine	ea661c4fbb	Merge branch 'translation' into 'master' ... Keep translation files in sync See merge request core-developers/forge!2374	2020-01-05 03:08:51 +00:00
Dagin	28abe52106	Keep translation files in sync	2020-01-04 20:23:05 +01:00
swordshine	e689fd8721	Merge branch 'master' into 'master' ... fix card name translation See merge request core-developers/forge!2373	2020-01-04 15:51:00 +00:00
CCTV-1	fea6c85e97	Merge remote-tracking branch 'upstream/master'	2020-01-04 22:25:17 +08:00
CCTV-1	4e80a1b818	get correct localization card name	2020-01-04 22:23:20 +08:00
Michael Kamensky	bdde3520f4	Merge branch 'patch' into 'master' ... Update Haktos the Unscarred See merge request core-developers/forge!2371	2020-01-04 10:21:08 +00:00
swordshine	165ae649b1	Merge branch 'temp' into 'master' ... Fix more localization mismatches See merge request core-developers/forge!2372	2020-01-04 05:57:59 +00:00
Adam Pantel	0536ebf1c8	Fix more localization mismatches	2020-01-03 23:21:13 -05:00
swordshine	fb176abe05	Update Haktos the Unscarred	2020-01-04 12:08:52 +08:00
swordshine	28f0232736	Merge branch 'temp' into 'master' ... Mismatched localization labels See merge request core-developers/forge!2370	2020-01-04 01:18:29 +00:00
swordshine	4c29fd8faf	Merge branch 'patch-8' into 'master' ... Update the_royal_scions.txt See merge request core-developers/forge!2368	2020-01-04 01:17:32 +00:00
swordshine	df8d289ee0	Merge branch 'patch-7' into 'master' ... Update synthetic_destiny.txt See merge request core-developers/forge!2367	2020-01-04 01:17:03 +00:00
Tim Mocny	203de48dd4	Update synthetic_destiny.txt	2020-01-04 01:17:03 +00:00
swordshine	97f763b1a0	Merge branch 'patch-6' into 'master' ... THB 12/31 See merge request core-developers/forge!2360	2020-01-04 01:15:59 +00:00
Tim Mocny	9fd8969ea5	THB 12/31	2020-01-04 01:15:58 +00:00
Adam Pantel	d70e699c81	Mismatched localization labels	2020-01-03 16:06:01 -05:00
Tim Mocny	39bf8f5313	Update the_royal_scions.txt	2020-01-03 14:58:57 +00:00
swordshine	68eb8e2510	Merge branch 'master' into 'master' ... use localization card name in translation text See merge request core-developers/forge!2357	2020-01-03 13:32:01 +00:00
Michael Kamensky	a20800cfb3	Merge branch 'patch-2' into 'master' ... Update es-ES.properties See merge request core-developers/forge!2366	2020-01-03 13:11:02 +00:00
Michael Kamensky	adce811a3d	Merge branch 'devotion-choosecolor' into 'master' ... Added a simple logic for ChooseColor based on devotion (Nyx Lotus) See merge request core-developers/forge!2365	2020-01-03 13:09:27 +00:00
Michael Kamensky	084a7ae73e	Added a simple logic for ChooseColor based on devotion (Nyx Lotus)	2020-01-03 13:09:27 +00:00
klaxnek	14a697269b	Update es-ES.properties	2020-01-03 11:35:56 +00:00
swordshine	7de8cdee90	Merge branch 'german-translation' into 'master' ... Update de-DE.properties from forum See merge request core-developers/forge!2355	2020-01-03 06:50:43 +00:00
swordshine	20333491f7	Merge branch 'patch-2' into 'master' ... it-IT.properties from forum See merge request core-developers/forge!2363	2020-01-03 06:50:34 +00:00
swordshine	d529c55277	Merge branch 'patch-3' into 'master' ... cardnames-it-IT.txt from forum See merge request core-developers/forge!2364	2020-01-03 06:50:26 +00:00
CCTV-1	9e3bb1ca72	use localization card name	2020-01-03 13:43:17 +08:00
CCTV-1	0caf41f1d6	convert indentation to spaces	2020-01-03 13:33:59 +08:00
CCTV-1	817aadb995	Merge remote-tracking branch 'upstream/master'	2020-01-03 13:32:15 +08:00
Michael Kamensky	c6016c2728	Merge branch 'patch-5' into 'master' ... Update visage_of_bolas.txt (typo in line 5) See merge request core-developers/forge!2359	2020-01-03 04:40:50 +00:00
Tim Mocny	492cab9c06	Update visage_of_bolas.txt (typo in line 5)	2020-01-03 04:40:50 +00:00
Michael Kamensky	64dd84b560	Merge branch 'lbl-error' into 'master' ... Fix lblPlayerActivatedCardChooseMode reference See merge request core-developers/forge!2362	2020-01-03 04:40:30 +00:00
Michael Kamensky	496768b566	Merge branch 'escapeRefactorFlashback' into 'master' ... Refactor Escape and AlternativeCost See merge request core-developers/forge!2361	2020-01-03 04:40:10 +00:00
Hans Mackowiak	b2fcc6e743	Refactor Escape and AlternativeCost	2020-01-03 04:40:09 +00:00
Churrufli	1584fcbb82	cardnames-it-IT.txt	2020-01-02 17:30:29 +00:00
Churrufli	2860111154	it-IT.properties	2020-01-02 17:21:24 +00:00
Dagin Svezek	cfdbb98cf9	Merge branch 'master' into 'german-translation' ... # Conflicts: # forge-gui/res/languages/de-DE.properties	2020-01-02 12:23:37 +00:00
Dagin Svezek	87ec3a528b	Update de-DE.properties from forum	2020-01-02 12:15:17 +00:00
CCTV-1	8ebabd978f	add cast check	2020-01-02 12:17:38 +08:00
CCTV-1	51fae70e24	Merge remote-tracking branch 'upstream/master'	2020-01-02 11:51:07 +08:00
CCTV-1	2f0024a8dd	rollback unsafe changes	2020-01-02 11:45:38 +08:00
Adam Pantel	cd498e408c	Fix lblPlayerActivatedCardChooseMode reference	2020-01-01 21:31:06 -05:00