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

69408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anthony Calosa
83df147d0e Merge branch 'master' into master2 
# Conflicts:
#	forge-adventure/pom.xml
#	forge-ai/pom.xml
#	forge-core/pom.xml
#	forge-game/pom.xml
#	forge-gui-android/AndroidManifest.xml
#	forge-gui-android/pom.xml
#	forge-gui-desktop/pom.xml
#	forge-gui-ios/pom.xml
#	forge-gui-mobile-dev/pom.xml
#	forge-gui-mobile/pom.xml
#	forge-gui-mobile/src/forge/Forge.java
#	forge-gui/pom.xml
#	forge-lda/pom.xml
#	pom.xml
 2024-10-15 10:29:23 +08:00
Meta
5b62a1ffb5 Fixed non-cards for rarity sorting 
import
 2024-10-14 21:56:30 -04:00
Chris H
0475f4bafa Manually update files that need to be updated 2024-10-14 21:53:45 -04:00
GitHub Actions
d366bf8ffc [maven-release-plugin] prepare for next development iteration 2024-10-14 21:53:45 -04:00
GitHub Actions
fa538bd5c9 [maven-release-plugin] prepare release forge-1.6.65 2024-10-14 21:53:45 -04:00
Fulgur14
3db4db0d07 Add files via upload 2024-10-14 19:30:33 -04:00
Chris H
932bfb9e33 Migrate DSK upcoming 2024-10-14 14:22:35 -04:00
Chris H
da712a5e49 Add Winter Cynical Opportunist (#6325) 2024-10-14 18:04:30 +00:00
TwentyToedToad
0fb2db556b Add Experimental Lab // Staff Room (#6324) 2024-10-14 17:32:34 +00:00
TwentyToedToad
b820d6b622 Update my_will_is_irresistible.txt 2024-10-14 11:58:29 -04:00
TwentyToedToad
79337dbf1f Update my_will_is_irresistible.txt 2024-10-14 11:58:29 -04:00
TwentyToedToad
1a6d0a4354 Add My Will Is Irresistible 2024-10-14 11:58:29 -04:00
Paul Hammerton
68bb0ebd39 Fix Demonic Covenant (#6326) 2024-10-14 15:49:13 +00:00
Anthony Calosa
4af8061824 Merge branch 'master' into master2 2024-10-14 20:46:23 +08:00
Paul Hammerton
cc3b2a20ce Merge pull request #6323 from paulsnoops/ydsk_formats 
Add YDSK to formats
 2024-10-14 13:24:32 +01:00
Paul Hammerton
81faad08d4 Merge pull request #6322 from paulsnoops/edition_updates 
Edition updates: SLD, YDSK
 2024-10-14 13:22:05 +01:00
Paul Hammerton
c31b26a13d Add YDSK to formats 2024-10-14 13:21:03 +01:00
Paul Hammerton
efd883ef12 Edition updates: SLD, YDSK 2024-10-14 13:17:13 +01:00
tool4ever
b6f118f89b Fear of Sleep Paralysis and support (#6287) 2024-10-14 10:55:00 +00:00
tool4ever
8f33da5b9c AI aura targeting fix (#6320) 2024-10-14 10:23:18 +00:00