Commit Graph

52339 Commits

Author SHA1 Message Date
John Williams
eeb3d594a1 Update Secret Lair Drop Series.txt 2021-08-23 09:22:09 +00:00
Michael Kamensky
ca6351a6ed Merge branch 'fix_possiblecard_removeaideck' into 'master'
Fix possiblecard with removeaideck

See merge request core-developers/forge!5251
2021-08-23 05:16:11 +00:00
Michael Kamensky
585cc9a955 Merge branch 'Meerkov-master-patch-37226' into 'master'
Unban Absorb Identity for AI

See merge request core-developers/forge!5248
2021-08-23 05:09:07 +00:00
Michael Kamensky
b7d4d91d01 Merge branch 'Meerkov-master-patch-70676' into 'master'
Unban AI from using abunas_chant

See merge request core-developers/forge!5249
2021-08-23 05:08:54 +00:00
Michael Kamensky
c9b204a29d Merge branch 'images' into 'master'
Card Renderer: do not display hidden cards

See merge request core-developers/forge!5250
2021-08-23 05:08:35 +00:00
Michael Kamensky
25fa631344 Merge branch 'fixDelayedDestroySacrifice' into 'master'
cards: fix cards with DelayedTrigger Sacrifice and Destory

See merge request core-developers/forge!5247
2021-08-23 05:06:55 +00:00
Anthony Calosa
f59d1d106d Update PlayEffect.java 2021-08-22 22:44:35 +00:00
Anthony Calosa
5764e95529 Update CopyPermanentEffect.java 2021-08-22 22:42:47 +00:00
TRT
bc1a91186f Card Renderer: do not display hidden cards 2021-08-22 21:14:21 +02:00
Meerkov
fa697d0e60 Unban AI from using abunas_chant 2021-08-22 16:48:02 +00:00
Meerkov
2948d816d0 Unban Absorb Identity for AI 2021-08-22 16:41:08 +00:00
Hans Mackowiak
4c231ace0f cards: fix cards with DelayedTrigger Sacrifice and Destory 2021-08-22 17:56:59 +02:00
Hans Mackowiak
949e338a29 Merge branch 'protection' into 'master'
Fix protection from colorless

See merge request core-developers/forge!5246
2021-08-22 15:01:52 +00:00
TRT
12e9728e01 Fix protection from colorless 2021-08-22 16:55:26 +02:00
Michael Kamensky
512048b185 Merge branch 'timestamp' into 'master'
Fix new timestamp on ETB

Closes #1955

See merge request core-developers/forge!5245
2021-08-22 03:39:13 +00:00
TRT
731803f620 Fix new timestamp on ETB 2021-08-21 22:15:28 +02:00
Anthony Calosa
b80efd103e Merge branch 'master' into 'master'
update textbox tint

See merge request core-developers/forge!5244
2021-08-21 06:29:32 +00:00
Anthony Calosa
b9205b4b1e update textbox tint 2021-08-21 14:20:47 +08:00
Michael Kamensky
2f78d910e1 Merge branch 'manafix' into 'master'
Fix generating mana from negative amount

See merge request core-developers/forge!5243
2021-08-21 03:54:37 +00:00
TRT
7b60877cae Fix generating mana from negative amount 2021-08-20 21:53:39 +02:00
Anthony Calosa
64c4d5cfd0 Merge branch 'master' into 'master'
Update land watermarks

See merge request core-developers/forge!5242
2021-08-20 11:25:59 +00:00
Anthony Calosa
2c3df8842f remove unused variables 2021-08-20 19:25:10 +08:00
Michael Kamensky
341edbc653 Merge branch 'johnwilliams7-master-patch-59848' into 'master'
Update Wizards Play Network 2021.txt

See merge request core-developers/forge!5241
2021-08-20 11:24:42 +00:00
Anthony Calosa
d62a6333a3 Update land watermarks 2021-08-20 19:11:18 +08:00
John Williams
2b6431744f Update Wizards Play Network 2021.txt 2021-08-20 09:53:11 +00:00
Michael Kamensky
1e5b3d09d1 Merge branch 'npe' into 'master'
Fix NPE for UntilCommand from ReplacementEffect

See merge request core-developers/forge!5239
2021-08-20 07:27:49 +00:00
Michael Kamensky
ac42912c77 Merge branch 'master' into 'master'
Add Forge SetLogo for Desktop and Mobile

See merge request core-developers/forge!5240
2021-08-20 07:27:31 +00:00
Anthony Calosa
b355d7fc84 Add Forge SetLogo for Desktop and Mobile
Common, Uncommon, Rare, Mythic and Special Forge logos
2021-08-20 13:22:09 +08:00
Anthony Calosa
3f65f56b31 Merge remote-tracking branch 'remotes/core/master' 2021-08-20 13:11:15 +08:00
TRT
3c32828138 Fix costs 2021-08-19 22:31:36 +02:00
TRT
dd6999eaa7 Fix NPE when adding Command from ReplacementEffect 2021-08-19 20:08:23 +02:00
Michael Kamensky
28c3cd9d6d Merge branch 'twosat-master-patch-92667' into 'master'
Update de-DE.properties

See merge request core-developers/forge!5238
2021-08-19 15:49:34 +00:00
Andreas Bendel
a6c08ae72c Update de-DE.properties
retranslated AllowCustomCardsInDecks
added missing d in Bildspeicher in line 1057
2021-08-19 14:49:39 +00:00
Anthony Calosa
6d13ecaa22 Merge remote-tracking branch 'remotes/core/master' 2021-08-19 20:37:50 +08:00
Anthony Calosa
0b17072d45 Merge branch 'kevlahnota-master-patch-39000' into 'master'
Update ImageKeys.java

See merge request core-developers/forge!5237
2021-08-19 12:34:23 +00:00
Anthony Calosa
e1a3c722cd Update ImageKeys.java 2021-08-19 12:33:07 +00:00
Anthony Calosa
8a4f78849f Merge branch 'master' into 'master'
Net Decks Archive Updates

See merge request core-developers/forge!5236
2021-08-19 12:30:15 +00:00
Churrufli
87ccfe1889 Net Decks Archive Updates 2021-08-19 12:17:45 +02:00
Anthony Calosa
e513a61fda Merge remote-tracking branch 'remotes/core/master' 2021-08-19 11:46:12 +08:00
Michael Kamensky
d8d94b7833 Merge branch 'fixes' into 'master'
Fix Shifting Shadow trigger

See merge request core-developers/forge!5235
2021-08-18 13:00:39 +00:00
tool4EvEr
e88f8c9672 Clean up 2021-08-18 14:36:24 +02:00
tool4EvEr
f44eca100a Fix Shifting Shadow trigger 2021-08-18 13:26:50 +02:00
Anthony Calosa
f7daf44775 Merge remote-tracking branch 'remotes/core/master' 2021-08-18 14:51:09 +08:00
Michael Kamensky
22857352c1 Merge branch 'fix-fatpacks' into 'master'
Fix broken bundles

See merge request core-developers/forge!5234
2021-08-18 03:37:11 +00:00
friarsol
b2488d9779 Fix broken bundles 2021-08-17 23:10:43 -04:00
Michael Kamensky
d377e88b02 Merge branch 'Xyx-master-patch-68244' into 'master'
Update tempt_with_discovery.txt: RepeatOptionalMessage$ fixed (their -> your).

See merge request core-developers/forge!5233
2021-08-17 15:20:37 +00:00
Jochem H
354c9ccb4f Update tempt_with_discovery.txt: RepeatOptionalMessage$ fixed (their -> your). 2021-08-17 10:09:54 +00:00
Anthony Calosa
ea446db71e Merge branch 'kevlahnota-master-patch-69962' into 'master'
Update ImageKeys.java

See merge request core-developers/forge!5232
2021-08-17 09:11:55 +00:00
Anthony Calosa
96f8dc0791 Update ImageKeys.java 2021-08-17 09:11:10 +00:00
Anthony Calosa
3b058e20ec Merge remote-tracking branch 'remotes/core/master' 2021-08-17 05:47:09 +08:00