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
70,471 Commits 32 Branches 187 Tags
ef9d807b6eefff77c1ea28a2359c4147f37e116c
Commit Graph

70471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
63bf2b1a3d clear bookmarks 
- closes #6685
 2024-12-15 00:53:03 +08:00
Paul Hammerton
19023a97ed Merge pull request #6686 from paulsnoops/fix-pio-rnk 
Fix split cards in PIO draft rank file
 2024-12-14 11:33:03 +00:00
Paul Hammerton
b7d6186fd1 Fix split cards in PIO draft rank file 2024-12-14 11:29:18 +00:00
Chris H
5c7fb36907 Need to use special slot for the cards to load in the edition properly (#6684) 2024-12-14 09:31:29 +03:00
Paul Hammerton
b208dc4498 Update draft rankings: FDN, PIO 2024-12-13 14:52:29 -05:00
Chris H
7be429dc36 Pioneer masters booster slots 2024-12-13 09:11:36 -05:00
Paul Hammerton
d8ea4b5e06 Merge pull request #6680 from Card-Forge/dsk-booster-fixes 
Mark DSK dual lands as Land rarity
 2024-12-13 11:01:50 +00:00
Chris H
91a7ef124d Mark DSK dual lands as Land rarity 2024-12-12 22:29:37 -05:00
Justin C
9aeef28bc3 Fix for Bloodbraid Challenger P/T (#6679) 2024-12-12 08:09:10 +01:00
Chris H
e854566425 Mark gainlands as L rarity in Foundations file (#6678) 2024-12-11 11:26:48 +01:00
Justin C
e8067d872d Removed unused variable. Some documentation fixes. (#6675) 2024-12-10 20:24:20 +03:00
Agetian
770f51e891 - Fix draft rankings not showing in Adventure Mode on the first pick of the draft. (#6674) 2024-12-09 22:08:58 +03:00
Jetz
5a3409a8fa unused import 2024-12-09 08:54:23 -05:00
Jetz
931e734bc0 Merge remote-tracking branch 'origin/master' into code-cleanup 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ComputerUtil.java
#	forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
#	forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
#	forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
 2024-12-09 08:52:36 -05:00
Anthony Calosa
40ee86167b fix typo 2024-12-08 08:47:37 +08:00
Anthony Calosa
7482856dad prevent NPE on AdventureDeckEditor onClose event 2024-12-08 08:45:57 +08:00
Anthony Calosa
4698c2d014 prevent NPE 2024-12-08 08:34:49 +08:00
Paul Hammerton
4172256ded Merge pull request #6673 from paulsnoops/edition-updates 
Edition updates: DCI, INR, PMEI, PRES
 2024-12-07 12:08:06 +00:00
Paul Hammerton
303a3ebf58 Edition updates: DCI, INR, PMEI, PRES 2024-12-07 12:03:03 +00:00
tool4ever
a9c5839217 Refactor SpellAbilityView canPlay (#6671) 2024-12-06 19:58:52 +00:00
Justin C
6c1f4c7ffe Fix for noted types for Volo's journal (#6665) 2024-12-06 15:13:22 +01:00
Agetian
95e5b7afca Improve AI for First Responder, improve evaluation for self-sac abilities e.g. Sakura-Tribe Elder. (#6668) 2024-12-06 12:45:51 +01:00
Hans Mackowiak
9370e6fa61 Update remove-stale-branches.yml 
Bump version
 2024-12-06 05:46:16 +01:00
kevlahnota
ea244ec39b Update CardFaceSymbols.java 
fix CR -> ColorlessHybrid
 2024-12-06 06:03:10 +08:00
Hans Mackowiak
933ff78b64 Update osseous_sticktwister.txt 
fix AI for now until my PR is ready
 2024-12-05 16:04:05 +01:00
Jetz
6c10351d93 Merge remote-tracking branch 'origin/master' into code-cleanup 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/PlayAi.java
#	forge-core/src/main/java/forge/util/collect/FCollection.java
#	forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
 2024-12-05 08:27:25 -05:00
Jetz
fa94754c91 Some Java 11 migrations 2024-12-05 08:05:17 -05:00
Anthony Calosa
13fbfe866e Merge remote-tracking branch 'origin/master' 2024-12-05 21:00:57 +08:00
Anthony Calosa
ebffb83932 prevent NPE on old skin/theme 2024-12-05 21:00:39 +08:00
tool4ever
45c9442330 Fix ConcurrentModificationException (#6664) 2024-12-05 13:15:46 +01:00
Anthony Calosa
b858b48fde remove Collections.synchronized 2024-12-05 16:39:10 +08:00
kevlahnota
d06673e401 Update FCollectionTest.java 
prior to the threadsafeiterable restoration
 2024-12-05 12:50:53 +08:00
kevlahnota
f637bd970b update check for ItemManagerConfig 2024-12-05 11:49:34 +08:00
kevlahnota
32ba304d11 Update AdventureDeckEditor.java 
fix bulk sell menu appearing on other catalogpages
 2024-12-05 11:32:45 +08:00
Paul Hammerton
6867a0eaba Merge pull request #6663 from paulsnoops/edition-updates 
Edition updates: INR, PIO
 2024-12-04 19:32:44 +00:00
Paul Hammerton
9c4333d608 Edition updates: INR, PIO 2024-12-04 19:28:51 +00:00
Agetian
32fc681726 - Add puzzle PS_FDN2. (#6662) 2024-12-04 21:18:18 +03:00
Anthony Calosa
8e16456b2e update comments 2024-12-04 22:12:22 +08:00
Anthony Calosa
36f0021cae revert threadsafeiterable 2024-12-04 22:04:29 +08:00
kevlahnota
a0cad5fa48 fix FCollection (#6657) 2024-12-04 14:45:05 +01:00
Jetz
db2764f1ce Fix Build Errors 2024-12-04 08:27:37 -05:00
Jetz
44cf7dbbea Merge remote-tracking branch 'origin/master' into code-cleanup 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/AiAttackController.java
#	forge-ai/src/main/java/forge/ai/AiCardMemory.java
#	forge-ai/src/main/java/forge/ai/AiController.java
#	forge-core/src/main/java/forge/card/ICardDatabase.java
#	forge-core/src/main/java/forge/item/generation/BoosterGenerator.java
#	forge-core/src/main/java/forge/util/FileSection.java
#	forge-core/src/main/java/forge/util/collect/FCollection.java
#	forge-game/src/main/java/forge/game/card/CardProperty.java
#	forge-game/src/main/java/forge/game/combat/Combat.java
#	forge-game/src/main/java/forge/game/spellability/SpellAbility.java
#	forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
#	forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
#	forge-gui-mobile/src/forge/itemmanager/ItemManager.java
#	forge-gui/src/main/java/forge/deck/DeckgenUtil.java
#	forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java
 2024-12-04 08:15:30 -05:00
Chris H
a337fd2aed Pay cost verbiage 2024-12-03 21:55:54 -05:00
Paul Hammerton
9fc971c2fb Merge pull request #6659 from paulsnoops/pio_formats 
Add PIO to Explorer, Historic & Timeless formats
 2024-12-03 09:38:39 +00:00
Paul Hammerton
22ed570cb9 Merge pull request #6658 from paulsnoops/edition-updates 
Edition updates: PF25, PIO, PMEI
 2024-12-03 09:34:34 +00:00
Paul Hammerton
14ef18ae96 Add PIO to Explorer, Historic & Timeless formats 2024-12-03 09:34:25 +00:00
Paul Hammerton
a94dc8d94f Edition updates: PF25, PIO, PMEI 2024-12-03 09:27:41 +00:00
tool4EvEr
e6deda205c Fully unlocked room traits should still be the same (for once per turn) 2024-12-03 06:30:16 +01:00
tool4ever
739a4ef0bd Fix RollDice (#6653) 2024-12-02 20:44:11 +00:00
tool4ever
560f660925 Update revitalizing_repast_old_growth_grove.txt 2024-12-02 12:51:51 +00:00