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
Anthony Calosa
82318426a8
Merge branch 'kevlahnota-master-patch-26283' into 'master'
...
Update J21.txt
See merge request core-developers/forge!5231
2021-08-16 21:44:49 +00:00
Anthony Calosa
9f2911d492
Update J21.txt
2021-08-16 21:44:14 +00:00
Anthony Calosa
511eef9b22
Merge remote-tracking branch 'remotes/core/master'
2021-08-17 01:19:56 +08:00
Anthony Calosa
6545470f09
Merge branch 'twosat-master-patch-40221' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!5230
2021-08-16 17:19:04 +00:00
Andreas Bendel
1bb2326a1d
Update de-DE.properties
...
corrected german translation reffering Preferred Card Art
in this case card art should not be translated as Kartenkunst, Kartenbild is better
not erverything can be translated literally (both ways)
2021-08-16 17:16:58 +00:00
Anthony Calosa
73065e54d7
Merge remote-tracking branch 'remotes/core/master'
2021-08-17 00:22:32 +08:00
Michael Kamensky
6a009977f8
Merge branch 'master' into 'master'
...
Support Set lookup for J21 and other future sets.
See merge request core-developers/forge!5229
2021-08-16 15:12:04 +00:00
Anthony Calosa
7d80a663a4
Merge remote-tracking branch 'remotes/core/master'
2021-08-16 22:39:03 +08:00
Hans Mackowiak
e4625c6306
Update ComputerUtilCost.java : Cherry Pick NPE fix
2021-08-16 11:34:17 +00:00
Anthony Calosa
6a99ee00f1
Simulation test don't need setlookup
2021-08-16 13:42:05 +08:00
Anthony Calosa
4c09b11b63
remove redundant code
2021-08-16 12:48:19 +08:00
Anthony Calosa
3d322e47ee
Support Set lookup for J21 and other future sets.
...
Forge loads all files found on the setlookup folder.
Example J21.txt (J21 set code) contains a list of set codes (sorted from Newest to Oldest beforehand) to lookup for images on other sets.
2021-08-16 12:06:20 +08:00
Michael Kamensky
dfd448a323
Merge branch 'master' into 'master'
...
Set X cost for AnimateAI, add a couple AlwaysOnDiscard logic hints
See merge request core-developers/forge!5227
2021-08-15 11:46:17 +00:00
Michael Kamensky
c1043e3b9d
- Delete an accidentally committed file.
2021-08-15 14:45:47 +03:00
Michael Kamensky
13747b8fd6
- Set X cost for AnimateAi
2021-08-15 14:43:43 +03:00
Michael Kamensky
b5ade0c7bc
- More AlwaysOnDiscard AI logic hints.
2021-08-15 14:40:47 +03:00
Michael Kamensky
4f8055cfdc
Merge branch 'master' into 'master'
...
Improve the CostDiscard logic a little for cases where CARDNAME itself is discarded.
See merge request core-developers/forge!5226
2021-08-15 06:41:36 +00:00
Michael Kamensky
207d8fc97c
Merge branch 'fix_ai_x_cannot_be_zero' into 'master'
...
Adds check for AI when X cost is not allowed to be zero
See merge request core-developers/forge!5224
2021-08-15 06:33:42 +00:00
Michael Kamensky
43c68ddfcb
- Improve the CostDiscard logic a little for cases where CARDNAME itself is discarded.
2021-08-15 09:29:55 +03:00
