56242 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
tool4EvEr	9aadb72005	Fix Sideboard filter	2022-03-08 20:08:49 +01:00
TRT	58197e7daa	applyTextChangeEffects: fix replacing Self	2022-03-08 13:40:45 +01:00
Michael Kamensky	1c68fcb7c4	Merge branch 'explo' into 'master' ... Fix Explosive Singularity not being castable when no untapped creature See merge request core-developers/forge!6370	2022-03-08 11:16:29 +00:00
Anthony Calosa	39c456c204	Merge branch 'master' into 'master' ... Revert path for Android See merge request core-developers/forge!6371	2022-03-08 10:04:37 +00:00
Anthony Calosa	9b543986f1	Revert path for Android ... - on newer API it can't access the texture except text...	2022-03-08 18:03:09 +08:00
TRT	fda2b9ef7d	Fix Explosive Singularity not being castable when no untapped creature	2022-03-08 09:37:07 +01:00
Hans Mackowiak	38787b1539	Merge branch 'master' into '1111-dismantle-rework' ... # Conflicts: # forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java	2022-03-08 08:18:34 +00:00
Hans Mackowiak	d283b03e69	CounterPutEffect: make counterType support , seperator	2022-03-08 07:32:44 +01:00
Anthony Calosa	4634bdf50a	Merge branch 'master' into 'master' ... cleanup See merge request core-developers/forge!6369	2022-03-08 06:03:44 +00:00
Anthony Calosa	f6f8ecf011	cleanup	2022-03-08 14:00:19 +08:00
Michael Kamensky	245931d83b	Merge branch 'master' into 'master' ... [Mobile] Update netcode, fix swapped players See merge request core-developers/forge!6368	2022-03-08 04:45:33 +00:00
Michael Kamensky	5ae515760b	Merge branch 'twosat-master-patch-73013' into 'master' ... Update de-DE.properties See merge request core-developers/forge!6367	2022-03-08 04:45:00 +00:00
Michael Kamensky	01a9f0e684	Merge branch 'rampCheck' into 'master' ... ManaEffectAi: check for untap effects to increase ramping See merge request core-developers/forge!6365	2022-03-08 04:44:35 +00:00
Bug Hunter	4b2ecc34d3	ManaEffectAi: check for untap effects to increase ramping	2022-03-08 04:44:33 +00:00
Michael Kamensky	7ea9870e5b	Merge branch 'net_decks' into 'master' ... New Current Metagame Categories See merge request core-developers/forge!6364	2022-03-08 04:44:08 +00:00
Anthony Calosa	e176a4791d	remove extra field	2022-03-08 10:45:48 +08:00
Anthony Calosa	368acd1c59	[Mobile] Update netcode, fix swapped players ... -update CObjectInputStream to use DecompressibleInputStream method	2022-03-08 10:43:53 +08:00
Anthony Calosa	64488ed813	[Mobile] Fix path for fallback_skin	2022-03-08 10:27:50 +08:00
Andreas Bendel	33a77f900c	Update de-DE.properties ... some translations	2022-03-07 20:20:34 +00:00
Paul Hammerton	5101fe1c1c	Merge branch 'bandr_7_march_22' into 'master' ... Banned and Restricted Announcement: 7 March 2022 See merge request core-developers/forge!6366	2022-03-07 18:23:44 +00:00
paul_snoops	f9ba586f50	Banned and Restricted Announcement: 7 March 2022	2022-03-07 18:22:04 +00:00
paul_snoops	c3b1c6665e	New Current Metagame Categories	2022-03-07 13:07:23 +00:00
Anthony Calosa	3b6b6376d8	Merge branch 'master' into 'master' ... fix layout text for award See merge request core-developers/forge!6363	2022-03-07 00:28:26 +00:00
Anthony Calosa	7c30cdf6ec	fix layout	2022-03-07 08:26:44 +08:00
Anthony Calosa	e2a7fefafe	Merge branch 'master' into 'master' ... adjust SaveLoadScene layout See merge request core-developers/forge!6362	2022-03-07 00:19:51 +00:00
Anthony Calosa	976a463d9f	adjust SaveLoadScene layout	2022-03-07 08:17:10 +08:00
Michael Kamensky	5142549c0d	[maven-release-plugin] prepare for next development iteration	2022-03-06 20:30:40 +03:00
Michael Kamensky	587539290c	[maven-release-plugin] prepare release forge-1.6.48 forge-1.6.48	2022-03-06 20:30:23 +03:00
Michael Kamensky	2c2bea91d8	Merge branch 'master' into 'master' ... Update ANNOUNCEMENTS. See merge request core-developers/forge!6361	2022-03-06 17:25:44 +00:00
Michael Kamensky	4c61f0b0e5	- Update ANNOUNCEMENTS.	2022-03-06 20:24:59 +03:00
Michael Kamensky	d7c59cdb92	Merge branch 'master' into 'master' ... Add puzzles PS_NEO1, PS_NEO2, prepare ANNOUNCEMENTS.txt. See merge request core-developers/forge!6360	2022-03-06 17:05:48 +00:00
Michael Kamensky	47f2756a39	- Add puzzles PS_NEO1, PS_NEO2 ... - Update ANNOUNCEMENTS.txt	2022-03-06 20:04:44 +03:00
Michael Kamensky	fc6ba8d73b	Merge branch 'purging' into 'master' ... Fix Purging Scythe damaging players See merge request core-developers/forge!6358	2022-03-06 16:41:55 +00:00
Michael Kamensky	a6345325b4	Merge branch 'swallow' into 'master' ... Fix Swallow Whole putting P1P1 on player See merge request core-developers/forge!6359	2022-03-06 16:41:37 +00:00
tool4EvEr	1ae507f378	Fix Swallow Whole putting P1P1 on player	2022-03-06 17:09:05 +01:00
tool4EvEr	430cabf3b6	Fix Purging Scythe damaging players	2022-03-06 13:53:38 +01:00
Michael Kamensky	a11bf3b99c	Merge branch 'johnwilliams7-master-patch-30601' into 'master' ... Update Pro Tour Promos.txt See merge request core-developers/forge!6352	2022-03-06 12:44:53 +00:00
Anthony Calosa	1933fde126	Merge branch 'master' into 'master' ... update See merge request core-developers/forge!6357	2022-03-06 12:44:16 +00:00
Michael Kamensky	87c3411259	Merge branch 'reveal' into 'master' ... RevealAi: fix missing trigger See merge request core-developers/forge!6349	2022-03-06 12:44:01 +00:00
Anthony Calosa	cc459479ee	update	2022-03-06 20:42:11 +08:00
Anthony Calosa	e93211dca2	Merge branch 'master' into 'master' ... [Mobile] Fix startup if no internet See merge request core-developers/forge!6356	2022-03-06 12:34:38 +00:00
Anthony Calosa	2c0fb81335	[Mobile] Fix startup if no internet	2022-03-06 20:32:49 +08:00
Anthony Calosa	fbb8fed858	Merge branch 'kevlahnota-master-patch-84929' into 'master' ... unused import See merge request core-developers/forge!6355	2022-03-06 11:37:23 +00:00
Anthony Calosa	bb1a7ee22f	unused import	2022-03-06 11:37:06 +00:00
Anthony Calosa	0ea1795ef3	Merge branch 'master' into 'master' ... update some translations See merge request core-developers/forge!6353	2022-03-06 11:21:46 +00:00
Anthony Calosa	edf9ade77a	update some translations	2022-03-06 19:20:12 +08:00
John Williams	cec3ea278f	Update Pro Tour Promos.txt	2022-03-06 10:48:37 +00:00
Anthony Calosa	b73fbc7659	Merge branch 'master' into 'master' ... [Adventure] Minor Speedup See merge request core-developers/forge!6351	2022-03-06 10:46:56 +00:00
Anthony Calosa	e6157fc707	minor speedup	2022-03-06 18:43:05 +08:00
Anthony Calosa	aab3488539	Merge branch 'master' into 'master' ... cleanup See merge request core-developers/forge!6350	2022-03-06 10:27:24 +00:00