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

69691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
ca2110c2c2 Merge branch 'master' into master2 2024-09-21 09:16:36 +08:00
tool4ever
11a7f7b271 Script cleanup (#6180) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2024-09-20 19:29:27 +03:00
Renato Filipe Vidal Santos
a67ab2818b Fixes gleaned from notes: pass #3 (#6179) 2024-09-20 14:59:41 +00:00
Anthony Calosa
c1f9c766b2 Merge branch 'master' into master2 2024-09-20 20:19:12 +08:00
tool4ever
7a192a6873 Fix Valiant triggers failing if another player targets first (#6178) 2024-09-20 11:53:07 +02:00
Anthony Calosa
25435c847b update sign tool 2024-09-20 06:55:14 +08:00
Anthony Calosa
f53bc65f96 Merge branch 'master' into master2 2024-09-19 22:06:29 +08:00
Jetz
c91334029a Guava migration - Refactor edition type checks 2024-09-19 09:20:02 -04:00
Hans Mackowiak
869db7febb Impending NonCreature as StaticAbility (#6177) 2024-09-19 10:36:13 +03:00
tool4ever
86294108eb Update grist_voracious_larva_grist_the_plague_swarm.txt 2024-09-19 09:27:56 +02:00
Renato Filipe Vidal Santos
ac807c4766 Fixes gleaned from notes: pass #2, Cataclysm-like and other "choose to keep" effects. (#6165) 
* Add files via upload

* Update slaughter_the_strong.txt

* Update incriminate.txt

* Update a-incriminate.txt

* Update phyrexian_dreadnought.txt

* Update killing_wave.txt

* Update global_ruin.txt

* Update barrins_spite.txt

* Update szats_will.txt

* Update soul_shatter.txt

* Update slaughter_the_strong.txt

* Update shadowgrange_archfiend.txt

* Update professor_onyx.txt

* Update phyrexian_dreadnought.txt

* Update myrkuls_edict.txt

* Update gixs_command.txt

* Update flare_of_malice.txt

* Update demonic_hordes.txt

* Update crackling_doom.txt

* Update revival_experiment.txt

* Update perilous_predicament.txt

* Update regnas_sanction.txt

* Update catch_release.txt

* Update regnas_sanction.txt

* Update regnas_sanction.txt

---------

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2024-09-19 06:56:29 +03:00
Anthony Calosa
fd4ba1397a Merge branch 'master' into master2 2024-09-18 21:41:52 +08:00
kevlahnota
e09c09b924 Merge pull request #6173 from tool4ever/fix18 
Fix RE choice for different sources
 2024-09-18 19:18:44 +08:00
tool4EvEr
ee3c8173e1 Fix RE choice for different sources 2024-09-18 09:37:11 +02:00
tool4ever
daf1a891c0 Update zndrsplts_judgment.txt 2024-09-18 07:11:28 +00:00
tool4ever
b396e780cf Fix scripts (#6169) 2024-09-18 10:08:58 +03:00
Fulgur14
7b94f07fa8 DSK cards from misplaced PR (#6157) 2024-09-18 07:25:08 +02:00
Glorax
dd0bd28d2c Erratic Apparition fix (#6170) 2024-09-18 07:24:43 +02:00
Fulgur14
95dd06e55f Ancient Cellarspawn - incomplete, might need support (#6123) 
* Ancient Cellarspawn - incomplete, might need support

* Support Ancient Cellarspawn

---------

Co-authored-by: TRT <>
 2024-09-18 08:18:06 +03:00
Anthony Calosa
0dde987367 update jaxb-api -> fix illegal access warning 2024-09-18 10:56:36 +08:00
Anthony Calosa
fd7da13f15 Merge branch 'master' into master2 2024-09-18 06:01:03 +08:00
Glorax
922a0c21be Overgrown Zealot fix (#6167) 2024-09-17 20:48:07 +00:00
Glorax
05bf665f52 Spineseeker Centipede fix (#6166) 2024-09-17 20:21:05 +00:00
Anthony Calosa
5099d0f24f set landscape sensor from android 11 onwards 2024-09-17 20:16:29 +08:00
Anthony Calosa
bbc3d5639c update maven, dependency plugins 2024-09-17 20:05:37 +08:00
Anthony Calosa
de9823ab71 Merge branch 'master' into master2 2024-09-17 16:12:19 +08:00
Paul Hammerton
90d550facc Merge pull request #6163 from paulsnoops/dsk_formats 
Format updates for DSK & DSC
 2024-09-17 08:56:04 +01:00
Paul Hammerton
120d435424 Format updates for DSK & DSC 2024-09-17 08:51:21 +01:00
Paul Hammerton
e204ea751d Merge pull request #6162 from paulsnoops/edition_updates 
Edition updates: SCH, SLD
 2024-09-17 08:35:55 +01:00
Paul Hammerton
5d389ad62c Edition updates: SCH, SLD 2024-09-17 08:32:45 +01:00
Anthony Calosa
0c248d76eb Merge branch 'master' into master2 2024-09-17 15:13:11 +08:00
kevlahnota
663bde22ac Add ReplacementEffectView, StaticAbility View for Netplay Dialog 2024-09-17 14:58:43 +08:00
tool4ever
0a4cff5adc Update suspended_sentence.txt 2024-09-17 07:38:06 +02:00
Fulgur14
7c7c1fda01 Fulgur14 patch 191321 (#6158) 2024-09-16 20:13:43 +00:00
tool4ever
4c7c7edbf1 Update only_i_know_what_awaits.txt 2024-09-16 15:34:27 +00:00
Jetz
7ab333a60a Guava migration - ItemPool collector 2024-09-16 09:10:21 -04:00
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