external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,657 Commits 31 Branches 187 Tags
4b13b17bba49bfaf982fde505fdfd0f081a062cc
Commit Graph

69657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
61bf589f05 Merge branch 'master' into master2 2024-09-30 11:51:41 +08:00
tool4ever
a949a988a5 Fix GameStates starting with frozen stack if RE executes (#6213) 
* Fix GameStates starting with frozen stack if RE executes

* Fix NPE when facedown
 2024-09-29 20:18:35 +00:00
Jetz
c43015f05d Merge branch 'master' into code-cleanup 
# Conflicts:
#	forge-game/src/main/java/forge/game/ForgeScript.java
 2024-09-29 15:54:17 -04:00
Jetz
2e769ac279 Bug fix in RandomReservoir accumulator 2024-09-29 11:03:12 -04:00
Anthony Calosa
f9fc5b4213 fix some icon colors 2024-09-29 22:48:54 +08:00
Agetian
ea070a85aa - Add new genetic decks (Standard, Modern) with metagame as of Bloomburrow (#6212) 2024-09-29 17:29:34 +03:00
Anthony Calosa
683f9c2158 Merge branch 'master' into master2 2024-09-29 21:47:54 +08:00
Anthony Calosa
ea9aab7c4f mobile -> enable combat arrows on 2 player 2024-09-29 20:41:20 +08:00
Anthony Calosa
ddf009fed5 update skinlist 2024-09-29 15:34:52 +08:00
Anthony Calosa
7594888f8e SKIN Update 2024-09-29 15:25:11 +08:00
tool4ever
86dc3a4d5e Some cleanup (#6211) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2024-09-28 19:04:41 +03:00
Paul Hammerton
6169285cdb Merge pull request #6183 from Ayora29/master 
Reorder card entries in 111 edition files.
 2024-09-27 19:17:47 +01:00
Ayora29
ab7037f59c Merge branch 'Card-Forge:master' into master 2024-09-27 19:49:28 +02:00
tool4ever
cb4e0e5721 Some cleanup (#6209) 2024-09-27 18:59:27 +02:00
Hans Mackowiak
ac335a6b80 Merge pull request #6204 from Agetian/master 
Add LDA information for Bloomburrow metagame (Standard, Modern)
 2024-09-27 18:57:19 +02:00
tool4ever
c5aaf75838 Update enter_the_enigma.txt (#6206) 
Closes #6202
 2024-09-27 15:22:32 +02:00
Ayora29
b104249205 Add WithDifferentPowers$ to DigEffect + "Rip, Spawn Hunter" card (#6208) 2024-09-27 15:22:16 +02:00
Fulgur14
ec7314673e 10 DSK cards 2024-09-27 14:53:52 +02:00
Simisays
69985e4c2f Update myra_the_magnificent.txt (#6203) 2024-09-27 14:22:42 +02:00
Agetian
4622441ec8 - Add LDA information for Bloomburrow metagame (Standard, Modern). 2024-09-27 14:59:43 +03:00
Anthony Calosa
1f6f14cb3c remove unused property 2024-09-27 10:41:08 +08:00
Anthony Calosa
83e28d65f6 update android pom, proguard 2024-09-27 06:37:44 +08:00
tool4ever
ba4682e038 Update drop_tower.txt 2024-09-26 18:00:47 +00:00
Jetz
474be7bd67 Fix ConcurrentModificationException 2024-09-26 12:01:17 -04:00
Anthony Calosa
352967c8b8 update proguard, fix expected stack map table for method with non-linear control flow 2024-09-26 22:40:17 +08:00
Jetz
b35981218a Merge branch 'master' into code-cleanup 
# Conflicts:
#	forge-game/src/main/java/forge/game/ability/effects/ManifestBaseEffect.java
 2024-09-26 10:21:19 -04:00
Jetz
871947a540 Guava migration - Optimize imports 2024-09-26 09:59:26 -04:00
Jetz
6a04fcd500 Guava migration - Remove migration scaffold 2024-09-26 09:36:50 -04:00
Anthony Calosa
3a41f9d492 update more dependency, update CardMockTestCase 2024-09-26 19:36:59 +08:00
Anthony Calosa
f5949b9413 Merge branch 'master' into master2 2024-09-26 16:07:00 +08:00
Anthony Calosa
67cbd1444c update info 2024-09-26 16:02:50 +08:00
tool4ever
941a1129e5 Make Myriad optional for each player again (#6191) 
* Make Myriad optional for each player again

* Fix scripts

* Fix NPE due to not removing empty shards

---------

Co-authored-by: TRT <>
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2024-09-26 08:52:08 +03:00
Anthony Calosa
a7c69da4e6 fix tests 2024-09-26 13:17:02 +08:00
Anthony Calosa
c07e3b99a3 update argsfor Java 17 2024-09-26 12:28:55 +08:00
Anthony Calosa
56400d4444 JAVA17 Update 2024-09-26 11:52:42 +08:00
Fulgur14
2ac31bf45c Rename monstruous_emergence.txt to monstrous_emergence.txt (#6197) 2024-09-25 18:19:53 +00:00
Michael Lo
786d6834ef Fix valiant cards only triggering once per game rather than once per turn (#6196) 2024-09-25 14:58:28 +00:00
Jetz
0278f5817b Guava migration - Create IterableUtil to house iterable helper methods dependent on Java predicates 2024-09-25 09:26:41 -04:00
Jetz
f636910ebb Guava migration - Rename StreamUtils -> StreamUtil for consistency 2024-09-25 09:01:46 -04:00
Jetz
1395baa2ff Guava migration - Fix build error 2024-09-25 08:59:21 -04:00
Jetz
d01c4e056b Guava migration - Remove unused imports 2024-09-25 08:48:28 -04:00
Jetz
52112e671c Guava migration - Slight cleanup 2024-09-25 08:46:07 -04:00
Ayora29
68db59f080 New dsk card : Monstrous Emergence (#6194) 2024-09-25 11:01:18 +00:00
tool4ever
fb5d9a0b56 Update valgavoths_onslaught.txt (#6187) 2024-09-25 08:02:36 +00:00
Agetian
35cd7d0f4e - Add puzzle PS_BLB4, fix GameState support for class level. (#6195) 2024-09-25 08:02:22 +00:00
Anthony Calosa
3577f57419 Merge branch 'master' into master2 2024-09-25 06:27:21 +08:00
Jetz
a57bab1dac Guava migration - Remove single use Predicate implementations 
Remove unused parameters of other predicates
 2024-09-24 09:33:23 -04:00
kevlahnota
dd5aa11742 Update a_premonition_of_your_demise.txt 2024-09-24 20:38:59 +08:00
Anthony Calosa
7725d9e042 Merge branch 'master' into master2 2024-09-24 08:56:21 +08:00
Paul Hammerton
6334d22bf0 Merge pull request #6192 from paulsnoops/cmdr_bans_23_9 
Commander Banned and Restricted September 23, 2024
 2024-09-23 17:54:06 +01:00