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

69691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TwentyToedToad
aedd3bc521 Add Housemeld (YDSK) (#6341) 2024-10-17 09:01:46 +02:00
TwentyToedToad
7c3f8b57f0 Add Fear of Ridicule (YDSK) (#6343) 2024-10-17 08:56:28 +02:00
TwentyToedToad
9d8df142b4 Add Replicating Terror (YDSK) (#6344) 2024-10-17 08:55:06 +02:00
TwentyToedToad
c3aa31cb98 Add Welcome the Darkness (YDSK) (#6346) 2024-10-17 08:53:50 +02:00
TwentyToedToad
fbde7dca06 Add Anugished Recollection (YDSK) (#6347) 2024-10-17 08:52:45 +02:00
TwentyToedToad
dc6be93b25 Add Wary Zone Guard (YDSK) (#6353) 2024-10-17 08:48:07 +02:00
TwentyToedToad
b5246c42cf Add Mangled Soulrager (YDSK) (#6364) 2024-10-17 08:35:55 +02:00
TwentyToedToad
47a8b72b2e Add Polterheist (YDSK) (#6365) 2024-10-17 08:33:46 +02:00
Jetz72
54ecbeef6e Fix IndexOutOfBoundsException in generateParticipants (#6359) 
Co-authored-by: Jetz <Jetz722@gmail.com>
 2024-10-17 08:03:11 +03:00
Simisays
db0e188fab Sorin tweaks (#6373) 
* update

* Update enemies.json
 2024-10-17 08:01:58 +03:00
Anthony Calosa
e2a6dfabe8 update version digits 2024-10-17 12:35:11 +08:00
Anthony Calosa
89c699b94d update android pom 2024-10-17 11:34:37 +08:00
Anthony Calosa
0420ad4ef2 Merge branch 'master' into master2 
# Conflicts:
#	README.md
#	forge-gui-android/pom.xml
#	forge-gui-android/src/main/AndroidManifest.xml
 2024-10-17 10:48:20 +08:00
Hans Mackowiak
f5b30a6826 removed version from AndroidManifest 2024-10-16 21:12:02 -04:00
Hans Mackowiak
94f1835462 ~ fix version pattern for android.manifest merger 2024-10-16 21:12:02 -04:00
Hans Mackowiak
0c5f7962e2 ~ update android-maven-plugin 2024-10-16 21:12:02 -04:00
Hans Mackowiak
23be0c568d AndroidManifest 2024-10-16 21:12:02 -04:00
VishalKeerthan
0edd7d9d87 Update README.md 2024-10-16 21:09:13 -04:00
VishalKeerthan
c05760bab8 Update README.md 2024-10-16 21:09:13 -04:00
Anthony Calosa
143f2d883f update start button colors 2024-10-17 05:42:26 +08:00
Anthony Calosa
c07329db42 Merge branch 'master' into master2 2024-10-17 05:33:20 +08:00
TwentyToedToad
28744ff211 Add Fear of Change (#6327) 2024-10-16 17:12:10 +02:00
Paul Hammerton
ed7ba03b5a Merge pull request #6363 from paulsnoops/slp_edition 
Edition updates: SLP
 2024-10-16 15:52:36 +01:00
Paul Hammerton
ffda686533 Edition updates: SLP 2024-10-16 15:37:11 +01:00
Paul Hammerton
f727371a12 Merge pull request #6360 from Ayora29/fix_token_names 
Fix token name in C21
 2024-10-16 15:28:30 +01:00
Anthony Calosa
be8b77bf06 update button colors 2024-10-16 22:04:44 +08:00
fanch
cbefaf1984 Fix token name g_4_4_phyrexian_beast -> g_4_4_fungus_beast_trample 2024-10-16 15:15:09 +02:00
Anthony Calosa
d66a7ba604 Merge branch 'master' into master2 2024-10-16 20:45:48 +08:00
Hans Mackowiak
a1f425a803 Merge pull request #6337 from nwg5817/rewardRaritySort 
Adventure: Reward Scene Sort by Rarity
 2024-10-16 13:13:32 +02:00
Hans Mackowiak
a07cee4e76 Merge pull request #6335 from nwg5817/boosterQoL 
Adventure: Minor Booster Pack QoL Changes
 2024-10-16 13:12:36 +02:00
Anthony Calosa
94d5fc62bd replace ${alpha-version} -> ${revision} 2024-10-16 18:16:19 +08:00
Anthony Calosa
059d7aae1b Merge branch 'master' into master2 2024-10-16 18:16:03 +08:00
tool4ever
9d04766d13 Script fixes (#6356) 2024-10-16 11:35:40 +02:00
Paul Hammerton
4d04e49bd9 Merge pull request #6357 from churrufli/netdecks161024 
Net Decks Archive Updates
 2024-10-16 10:21:47 +01:00
Churrufli
92ee722db6 Net Decks Archive Updates (Standard, Modern, Legacy, Vintage, Pioneer, Pauper) 2024-10-16 11:12:14 +02:00
Anthony Calosa
fe83488c21 Merge branch 'master' into master2 2024-10-16 15:12:56 +08:00
Fulgur14
d65dedb92a Update demonic_covenant.txt (#6355) 2024-10-16 08:32:43 +02:00
Anthony Calosa
9c44efc629 Merge branch 'master' into master2 2024-10-16 09:05:08 +08:00
Chris H
5f53b8995e Update tunnel_surveyor.txt 2024-10-15 20:47:04 -04:00
JMAilan
38d8761fe3 Merge branch 'master' into rewardRaritySort 2024-10-15 11:46:19 -04:00
JMAilan
965dd136bb Merge branch 'master' into boosterQoL 2024-10-15 11:36:57 -04:00
Meta
0a08650393 Booster QoL 
Remove open confirmation and disable leaving inventory scene when opening boosters.

Change Booster Pack Inventory Name

Old:
Booster Pack: WAR

New:
War of the Sparks Booster

Final

Tweak
 2024-10-15 11:26:00 -04:00
tool4ever
83dd00e294 Update furious_spinesplitter.txt 
Closes #6332
 2024-10-15 12:41:39 +00:00
Anthony Calosa
ed58a68128 Merge branch 'master' into master2 2024-10-15 19:16:13 +08:00
Anthony Calosa
a565eff5fb update phase for upload since signv2 will run on verify phase and it should finish first before uploading 2024-10-15 19:14:45 +08:00
tool4ever
ce70a3949f Update head_games.txt 2024-10-15 10:51:57 +00:00
tool4ever
8f7b782d6b Update experimental_lab_staff_room.txt 2024-10-15 10:47:26 +00:00
Agetian
1466346d72 - Add DSK alt wincon achievement by Marek. (#6331) 2024-10-15 09:50:38 +03:00
Anthony Calosa
8fc3b45b12 quick fix for black texture 2024-10-15 10:55:56 +08:00
Jetz
2d6952f126 Swap out lingering use of Iterables.any 2024-10-14 22:51:16 -04:00