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
65,761 Commits 31 Branches 187 Tags
6d70d76efd9c76f4b9fc3d1353db00ac0c48fb0c
Commit Graph

65761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
b83963b285 adjust labels 2023-06-04 11:41:59 +08:00
Anthony Calosa
995e5a2ef6 Merge pull request #3197 from jjayers99/master 
Adventure - Fix shard count mishandling
 2023-06-04 11:14:54 +08:00
Anthony Calosa
4eec93a3d8 increase text 2023-06-04 11:13:37 +08:00
Anthony Calosa
379344dc84 update 2023-06-04 11:07:33 +08:00
jjayers99
9bef8cacf5 Revert "Revert "Adventure - shard count fix"" 
This reverts commit d0d329918d.
 2023-06-03 22:21:06 -04:00
jjayers99
d952ff5f15 Adventure - fix mana shard handling 2023-06-03 22:20:35 -04:00
jjayers99
0391d56439 Merge branch 'master' of https://github.com/jjayers99/forge-updates 2023-06-03 22:18:16 -04:00
jjayers99
d0d329918d Revert "Adventure - shard count fix" 
This reverts commit 6888f8627d.
 2023-06-03 22:17:50 -04:00
TabletopGeneral
5b7c1162fe Merge branch 'Card-Forge:master' into master 2023-06-03 22:16:04 -04:00
jjayers99
6888f8627d Adventure - shard count fix 2023-06-03 22:15:10 -04:00
Anthony Calosa
b2d154e0eb Merge pull request #3195 from tool4ever/tweakresolve 
Follow-up tweak for when triggers are checked during resolve
 2023-06-04 09:29:17 +08:00
Hans Mackowiak
ae15121c4a Update fallaji_excavation.txt (#3196) 2023-06-03 21:25:43 +00:00
tool4EvEr
ab33b81047 Clean up 2023-06-03 22:22:44 +02:00
tool4EvEr
2ec35f7629 Follow-up tweak for when triggers are checked during resolve 2023-06-03 22:20:31 +02:00
Simisays
f6e2ea719c Update gimli_mournful_avenger.txt 2023-06-03 19:57:00 +02:00
tool4ever
f189d6ff67 Update frodo_determined_hero.txt 2023-06-03 17:47:10 +00:00
tool4ever
e3f2212456 Update gimli_mournful_avenger.txt 2023-06-03 17:45:36 +00:00
Anthony Calosa
11986e1412 update booster reward 2023-06-04 01:37:21 +08:00
Anthony Calosa
c37083a3d6 Merge pull request #3193 from jjayers99/master 
Adventure card inventory update fix
 2023-06-03 21:59:01 +08:00
jjayers99
c31537d66e Adventure card inventory update fix 2023-06-03 09:40:49 -04:00
Simisays
003426b8c4 Update fangorn_tree_shepherd.txt 2023-06-03 15:17:27 +02:00
Simisays
09a853abb0 update 2023-06-03 14:59:42 +02:00
Simisays
b49cb6a0c0 update 2023-06-03 14:56:03 +02:00
tool4ever
65d385d531 Fix DeckHints only finding SimpleKeyword (#3191) 
* Fix DeckHints only finding SimpleKeyword

* Reveal clash correctly

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-06-03 13:58:23 +03:00
Simisays
ac3174b756 Update gimli_counter_of_kills.txt 2023-06-03 12:42:35 +02:00
Simisays
8ecf334c50 update 2023-06-03 12:41:56 +02:00
Simisays
49d75bcf17 update 2023-06-03 07:53:22 +02:00
Agetian
da71b9480d - Added puzzle PS_MOM3. (#3190) 2023-06-03 08:25:56 +03:00
Anthony Calosa
968be94d55 Merge pull request #3188 from Simisays/GrolnokRework 
Grolnok dungeon rework + new enemies
 2023-06-03 02:55:55 +08:00
Anthony Calosa
6304a0d460 Merge pull request #3189 from kevlahnota/newmaster2 
update winlose
 2023-06-03 02:39:42 +08:00
Anthony Calosa
314b4e8fa7 update winlose 2023-06-03 02:29:35 +08:00
Simisays
424e6891bb Update grove_6.tmx 2023-06-02 19:32:59 +02:00
Simisays
3499760d8b Merge remote-tracking branch 'upstream/master' into GrolnokRework 2023-06-02 19:17:47 +02:00
Anthony Calosa
fbccb97e4e Merge pull request #3184 from Klisz/gandalfthewhite 
LTR: gandalf_the_white.txt
 2023-06-03 00:56:27 +08:00
Anthony Calosa
45107544fe Merge pull request #3180 from Simisays/LTR2 
LTR 10 Cards
 2023-06-03 00:56:06 +08:00
Anthony Calosa
deaf391c5c Merge pull request #3171 from jjayers99/master 
Adventure events initial implementation
 2023-06-03 00:55:36 +08:00
Simisays
20f92d9934 update 2023-06-02 18:50:59 +02:00
Simisays
945416dcfa update 2023-06-02 17:43:58 +02:00
Simisays
49130e5bd5 update 2023-06-02 15:39:44 +02:00
Simisays
ff75bee0c2 update 2023-06-02 15:31:46 +02:00
Simisays
510e8265f3 Add files via upload 2023-06-02 13:06:34 +02:00
tool4ever
3883dde561 Update params (#3186) 2023-06-02 11:00:58 +02:00
Klisz
a95c3976d9 Create gandalf_the_white.txt 2023-06-01 18:05:55 -06:00
jjayers99
538dec0b3a Removing extra import 2023-06-01 19:45:50 -04:00
Paul Hammerton
642d24a940 Merge pull request #3183 from paulsnoops/ltr_update 
Edition updates: LTR, LTC, PF23
 2023-06-01 21:53:21 +01:00
paulsnoops
2fce760b17 Edition updates: LTR, LTC, PF23 2023-06-01 21:45:36 +01:00
Anthony Calosa
84f0ba12c6 Merge pull request #3182 from tool4ever/clean6 
Some script updates
 2023-06-02 04:33:58 +08:00
jjayers99
2392be77fd Adventure - Portal activation logic, area effect triggers 2023-06-01 15:16:09 -04:00
tool4EvEr
c1d40f05c6 Some script updates 2023-06-01 20:05:10 +02:00
Simisays
d5246c966c LTR 9 cards (#3176) 2023-06-01 17:55:19 +00:00