external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,974 Commits 32 Branches 187 Tags
a5f4375ff27f2894ff94dd19a6c35cbef390b51a
Commit Graph

49974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
db0ae9253e mage_duel.txt remove bad Cost 2021-04-16 10:28:47 -04:00
Bug Hunter
5573218794 Merge branch 'Northmoc-master-patch-13728' into 'master' 
Update lorehold_pledgemage.txt

See merge request core-developers/forge!4531
 2021-04-16 14:27:55 +00:00
Northmoc
6e38f16c83 mentors_guidance.txt remove bad Cost 2021-04-16 10:26:45 -04:00
Northmoc
4f0d2370ac bold_plagiarist.txt TriggerZone 2021-04-16 10:26:44 -04:00
Tim Mocny
f49f677107 Update lorehold_pledgemage.txt 2021-04-16 14:18:53 +00:00
Michael Kamensky
cbb11ea723 Merge branch 'kardur' into 'master' 
Remove Goad from Kardur

See merge request core-developers/forge!4527
 2021-04-16 12:44:41 +00:00
Michael Kamensky
566d011e2e Merge branch 'Williams-master-patch-46381' into 'master' 
C21 Tokens

See merge request core-developers/forge!4529
 2021-04-16 12:43:34 +00:00
Michael Kamensky
1d2a62d06c Merge branch 'svarsStackInstance' into 'master' 
StackInstance only store direct SVars

See merge request core-developers/forge!4528
 2021-04-16 12:43:19 +00:00
Hans Mackowiak
743163fce7 StackInstance only store direct SVars 2021-04-16 12:43:19 +00:00
Michael Kamensky
afe5333c88 Merge branch 'filter_more_targetable_cards' into 'master' 
Filter more cards in getTargetableCards

See merge request core-developers/forge!4513
 2021-04-16 12:41:10 +00:00
John
3bf15b5a35 Update Commander 2021.txt 2021-04-16 08:10:23 +00:00
Hans Mackowiak
1c9cfbc4bb Merge branch 'card-fixes' into 'master' 
Fix Zurzoth, Akiri

See merge request core-developers/forge!4519
 2021-04-16 07:15:29 +00:00
Adam Pantel
65093b0388 Fix Zurzoth, Akiri 2021-04-16 07:15:29 +00:00
Anthony Calosa
e2320ea77c Merge remote-tracking branch 'remotes/core/master' 2021-04-16 13:30:25 +08:00
Michael Kamensky
59f414f707 Merge branch 'fixmp' into 'master' 
Fix Multiplayer LTB triggers

Closes #1324

See merge request core-developers/forge!4511
 2021-04-16 04:59:35 +00:00
Michael Kamensky
2a2c12cf77 Merge branch 'titan' into 'master' 
ChangeZoneTable for Triplicate Titan

See merge request core-developers/forge!4522
 2021-04-16 04:58:41 +00:00
Michael Kamensky
5fd34dc967 Merge branch 'twosat-master-patch-34511' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4523
 2021-04-16 04:58:26 +00:00
Michael Kamensky
65df6765da Merge branch 'shamans_trance' into 'master' 
Add Shaman's Trance

See merge request core-developers/forge!4526
 2021-04-16 04:56:57 +00:00
Northmoc
ff9729d27a CombatUtil.java add "quasi-goad" logic 2021-04-15 20:03:44 -04:00
Northmoc
9876741c50 kardur_doomscourge.txt remove Goad effect 2021-04-15 20:02:44 -04:00
Lyu Zong-Hong
a1f69f0732 Add Shaman's Trance 2021-04-16 08:22:37 +09:00
Andreas Bendel
8174b883a0 Update de-DE.properties 
added line and translation lblRandomHistoricArchetypeDecks
translated lblInvalidTargetSpecification
 2021-04-15 19:38:32 +00:00
tool4EvEr
337065271e ChangeZoneTable for Triplicate Titan 2021-04-15 21:27:31 +02:00
Anthony Calosa
01dd0e7fc4 Merge remote-tracking branch 'remotes/core/master' 2021-04-16 03:15:02 +08:00
Anthony Calosa
f3ee08ab9a Merge branch 'master' into 'master' 
add tokenscript

Closes #1803

See merge request core-developers/forge!4521
 2021-04-15 19:09:34 +00:00
Anthony Calosa
ba08c09607 fix triplicate titan 2021-04-15 19:09:29 +00:00
Anthony Calosa
aecfd12911 remove accidental commit 2021-04-16 03:07:54 +08:00
Anthony Calosa
c081e48467 fix triplicate titan 2021-04-16 03:05:40 +08:00
tool4EvEr
237b0324c1 Clean up 2021-04-15 20:26:28 +02:00
tool4EvEr
5aaf39f40b LTB triggers for opponents 2021-04-15 20:20:52 +02:00
austinio7116
7a4ed29945 Merge branch 'historicsanctionfix' into 'master' 
Historic GA fix

See merge request core-developers/forge!4520
 2021-04-15 17:59:59 +00:00
austinio7116
84014ce9b5 Historic GA fix 2021-04-15 18:56:25 +01:00
austinio7116
08c8e84d72 Merge branch 'ldabuildonly2' into 'master' 
LDA module build fixes

See merge request core-developers/forge!4476
 2021-04-15 16:55:40 +00:00
tool4EvEr
43171879a0 Fix logic 2021-04-15 18:54:58 +02:00
tool4EvEr
2f7a30f920 Fix Multiplayer LTB triggers 2021-04-15 18:54:57 +02:00
Anthony Calosa
27a93b318d Merge branch 'master' into 'master' 
update zip decompression

Closes #1802

See merge request core-developers/forge!4518
 2021-04-15 15:27:08 +00:00
Anthony Calosa
816bb2008a update zip decompression 
closes #1802
 2021-04-15 23:18:40 +08:00
Anthony Calosa
8eb430dffd Merge branch 'kevlahnota-master-patch-49827' into 'master' 
Update CardArchetypeLDAGenerator.java

See merge request core-developers/forge!4517
 2021-04-15 10:08:11 +00:00
Anthony Calosa
641b5af8eb Update CardArchetypeLDAGenerator.java 2021-04-15 10:06:33 +00:00
Anthony Calosa
38ef1e4ed9 Merge branch 'revert-ed5f5d3c' into 'master' 
Revert "Update LDAModelGenetrator.java"

See merge request core-developers/forge!4516
 2021-04-15 09:48:01 +00:00
Anthony Calosa
123c41b4e3 Revert "Update LDAModelGenetrator.java" 
This reverts commit ed5f5d3c6b
 2021-04-15 09:47:31 +00:00
Anthony Calosa
7001f17c88 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4514
 2021-04-15 09:42:53 +00:00
Anthony Calosa
1f10191bc7 Merge branch 'kevlahnota-master-patch-10151' into 'master' 
Update LDAModelGenetrator.java

See merge request core-developers/forge!4515
 2021-04-15 09:42:23 +00:00
Anthony Calosa
ed5f5d3c6b Update LDAModelGenetrator.java 2021-04-15 09:42:04 +00:00
CCTV-1
a03bb7a353 translate new string. 2021-04-15 16:49:58 +08:00
Lyu Zong-Hong
44d4eae8a1 Filter more cards in getTargetableCards 2021-04-15 16:15:59 +09:00
Michael Kamensky
22ffcf5660 Merge branch 'historicLDA' into 'master' 
Historic Archetype Random Deck Generation

See merge request core-developers/forge!4488
 2021-04-15 06:30:19 +00:00
Michael Kamensky
f40ea6cc8d Merge branch 'rainbow' into 'master' 
Fix DelayedTriggers running when card owner left game

See merge request core-developers/forge!4512
 2021-04-15 06:30:05 +00:00
Hans Mackowiak
adfcb2b4bf Merge branch 'facedownYedoraMutate' into 'master' 
Card: changed some logic with facedown and copy states

See merge request core-developers/forge!4506
 2021-04-15 05:59:29 +00:00
Hans Mackowiak
8d42be3bac Card: changed some logic with facedown and copy states 2021-04-15 05:59:28 +00:00