Anthony Calosa
|
21540668c3
|
Merge branch 'master' into master2
|
2024-09-16 19:42:48 +08:00 |
|
kevlahnota
|
79b1c3c9fd
|
Update PlayerControllerHuman.java
show more info on choice list on non network game
|
2024-09-16 19:38:30 +08:00 |
|
Hans Mackowiak
|
7b9e2a6735
|
ManifestDread as separate Effect (#6151)
|
2024-09-16 12:36:31 +02:00 |
|
Anthony Calosa
|
c04055fff0
|
Merge branch 'master' into master2
|
2024-09-16 16:19:52 +08:00 |
|
Fulgur14
|
6e3c17a2a8
|
18 mostly leaked DSK/DSC cards (plus one token) (#6131)
|
2024-09-16 10:17:22 +02:00 |
|
kevlahnota
|
512b3208ae
|
Merge pull request #6156 from Card-Forge/kevlahnota-patch-1
fix netplay crash
|
2024-09-16 16:09:33 +08:00 |
|
kevlahnota
|
c4d943750c
|
fix netplay crash
-closes issue #6145
|
2024-09-16 16:04:19 +08:00 |
|
Fulgur14
|
a63f87e5be
|
Update all_shall_smolder_in_my_wake.txt (#6155)
|
2024-09-16 09:58:15 +02:00 |
|
Anthony Calosa
|
9fc93847b3
|
Merge branch 'master' into master2
|
2024-09-16 13:52:07 +08:00 |
|
kevlahnota
|
cb325996c9
|
prevent NPE
|
2024-09-16 13:34:48 +08:00 |
|
tool4ever
|
419ca27328
|
Update commander_liara_portyr.txt (#6152)
|
2024-09-16 06:53:15 +03:00 |
|
Anthony Calosa
|
116720a10f
|
update compiler release
|
2024-09-16 08:43:03 +08:00 |
|
Jetz
|
ae251372c1
|
Guava migration - Cleanup
|
2024-09-15 18:18:27 -04:00 |
|
Jetz
|
8189f134eb
|
Merge branch 'master' into code-cleanup
# Conflicts:
# forge-ai/src/main/java/forge/ai/AiAttackController.java
# forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
# forge-core/src/main/java/forge/item/IPaperCard.java
# forge-game/src/main/java/forge/game/ForgeScript.java
# forge-game/src/main/java/forge/game/ability/effects/ManifestBaseEffect.java
# forge-game/src/main/java/forge/game/card/CardState.java
# forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
# forge-game/src/main/java/forge/game/trigger/Trigger.java
|
2024-09-15 18:11:24 -04:00 |
|
Jetz
|
1644e7427e
|
Guava migration - Replace select usages of Iterables.transform
|
2024-09-15 17:33:18 -04:00 |
|
Jetz
|
76aa19622e
|
Guava migration - Replace select usages of Iterables.filter
|
2024-09-15 17:16:24 -04:00 |
|
Chris H
|
b85b6cac6e
|
Update victor_valgavoths_seneschal.txt
|
2024-09-15 16:37:35 -04:00 |
|
tool4ever
|
cbfcbfa8c5
|
Fix Mutate + Unexpectedly Absent (#6150)
|
2024-09-15 17:05:14 +00:00 |
|
Fulgur14
|
0ab14fdb37
|
2 DSC cards + 6 schemes (#6136)
|
2024-09-15 14:21:51 +00:00 |
|
tool4ever
|
91e952da63
|
Fix optional shuffle into Library cases (#6147)
|
2024-09-15 14:21:39 +00:00 |
|
Anthony Calosa
|
ef6716c5f6
|
update exec-plugin
|
2024-09-15 21:19:16 +08:00 |
|
Anthony Calosa
|
99c235eb62
|
Merge branch 'master' into master2
|
2024-09-15 18:33:40 +08:00 |
|
Paul Hammerton
|
653bf46404
|
Merge pull request #6148 from paulsnoops/edition_updates
Edition updates: DSC
|
2024-09-15 11:31:24 +01:00 |
|
Paul Hammerton
|
148a13c9cf
|
Edition updates: DSC
|
2024-09-15 11:28:19 +01:00 |
|
Fulgur14
|
a60f3f84e0
|
2 DSK cards, some DSC cards, 5 Schemes (#6122)
|
2024-09-15 09:18:24 +00:00 |
|
tool4ever
|
f1ff92801f
|
Fix Undying not triggering when dying from SBA (#6146)
|
2024-09-15 08:15:54 +00:00 |
|
Anthony Calosa
|
dd11d04452
|
Merge branch 'master' into master2
|
2024-09-15 16:09:52 +08:00 |
|
Fulgur14
|
445508d3ab
|
5 DSC Schemes (#6134)
* Update amped_raptor.txt
* Add files via upload
* Update i_call_for_slaughter.txt
* Update reality_is_mine_to_control.txt
* Update you_exist_only_to_amuse.txt
* Update your_nightmares_are_delicious.txt
* Update your_nightmares_are_delicious.txt
---------
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
|
2024-09-15 07:24:43 +03:00 |
|
Anthony Calosa
|
372c3cf25e
|
Merge branch 'master' into master2
|
2024-09-15 11:48:45 +08:00 |
|
Glorax
|
813588b897
|
Update coordinated_clobbering.txt (#6144)
|
2024-09-14 20:48:39 +00:00 |
|
tool4ever
|
21c34b552d
|
Fix Frankenstein's Monster (#6143)
|
2024-09-14 19:47:40 +02:00 |
|
Anthony Calosa
|
b6a0540b9b
|
Merge branch 'master' into master2
|
2024-09-14 22:21:14 +08:00 |
|
tool4ever
|
d303bb122c
|
Update your_own_face_mocks_you.txt
|
2024-09-14 10:17:37 +00:00 |
|
Paul Hammerton
|
12f937e4ca
|
Merge pull request #6142 from paulsnoops/edition_updates
Edition updates: DSC, DSK
|
2024-09-14 10:52:50 +01:00 |
|
Paul Hammerton
|
df868df7cd
|
Edition updates: DSC, DSK
|
2024-09-14 10:49:45 +01:00 |
|
Renato Filipe Vidal Santos
|
2db3e4d7ba
|
Update ogre_battlecaster.txt (#6140)
|
2024-09-14 09:40:23 +00:00 |
|
Paul Hammerton
|
78a134b2df
|
Fix Break Down the Door, Wickerfolk Thresher (#6141)
|
2024-09-14 07:51:24 +00:00 |
|
Anthony Calosa
|
74eebf4081
|
move signer to tools
|
2024-09-14 08:43:13 +08:00 |
|
Anthony Calosa
|
edc3af50af
|
Merge branch 'master' into master2
|
2024-09-14 08:08:00 +08:00 |
|
Anthony Calosa
|
ca9f2dad48
|
update manifest, add uber-apk-signer
|
2024-09-14 07:58:48 +08:00 |
|
Anthony Calosa
|
1918770d3f
|
update to sdk 33, update v2 signer-modded
|
2024-09-14 07:55:01 +08:00 |
|
Renato Filipe Vidal Santos
|
52ae896280
|
Update season_of_gathering.txt (#6139)
|
2024-09-13 19:37:07 +00:00 |
|
Fulgur14
|
2ac557c46e
|
23 DSK cards (+one Scheme) (#6112)
|
2024-09-13 19:36:58 +00:00 |
|
Fulgur14
|
d8c45e7d62
|
Seized from Slumber (DSK) (#6137)
This should be the last new card, all unimplemented cards are now in the project.
|
2024-09-13 20:01:44 +03:00 |
|
Paul Hammerton
|
5143f3ade0
|
Merge pull request #6138 from paulsnoops/edition_updates
Edition updates: DSC, DSK
|
2024-09-13 17:30:48 +01:00 |
|
Paul Hammerton
|
33e733559e
|
fix_test
|
2024-09-13 17:27:43 +01:00 |
|
Paul Hammerton
|
a2d653a0fc
|
Edition updates: DSC, DSK
|
2024-09-13 17:22:12 +01:00 |
|
Anthony Calosa
|
368ef9d903
|
Merge branch 'master' into master2
|
2024-09-13 21:20:01 +08:00 |
|
Fulgur14
|
e76eb919d9
|
Violent Urge (DSK) (#6132)
|
2024-09-13 08:16:38 +03:00 |
|
Anthony Calosa
|
b9a36bd039
|
Merge branch 'master' into master2
|
2024-09-13 09:31:25 +08:00 |
|