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

50085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bug Hunter
a17ec8c2db Merge branch 'admiral' into 'master' 
Azure Fleet Admiral: Fix typo

See merge request core-developers/forge!4497
 2021-04-13 15:56:25 +00:00
tool4EvEr
a718986e2d Fix typo 2021-04-13 17:55:57 +02:00
Michael Kamensky
242e0e7fdc Merge branch 'stx_draft_fix' into 'master' 
fix:stx booster missing sta and lesson cards.

See merge request core-developers/forge!4493
 2021-04-13 13:40:28 +00:00
Anthony Calosa
75f7cb6df7 Merge branch 'master' into 'master' 
update cards

See merge request core-developers/forge!4496
 2021-04-13 13:16:01 +00:00
Anthony Calosa
cf7d0792a2 update cards 2021-04-13 21:13:46 +08:00
Hans Mackowiak
29d260db9d Cards: use CharacteristicDefining for Alternative Cost for now 2021-04-13 10:32:16 +02:00
austinio7116
d7dfad1fe8 More Historic LDA data 2021-04-13 08:27:41 +01:00
CCTV-1
82f404e627 each draft boosters should be contain 1 sta card and 1 lesson card. 2021-04-13 14:08:56 +08:00
Anthony Calosa
c49b4c45c8 Merge branch 'kevlahnota-master-patch-11851' into 'master' 
finalize Commander 2021.txt

See merge request core-developers/forge!4492
 2021-04-13 05:11:16 +00:00
Anthony Calosa
39f3feb210 Update Commander 2021.txt 2021-04-13 05:10:27 +00:00
Michael Kamensky
4ed89e9515 Merge branch 'bangchuckersAI' into 'master' 
FlipACoinAI: add logic for Goblin Bangchuckers

Closes #1666

See merge request core-developers/forge!4487
 2021-04-13 04:40:07 +00:00
Michael Kamensky
0b6989c60c Merge branch 'update_japanese_localization' into 'master' 
Update Japanese Localization

See merge request core-developers/forge!4491
 2021-04-13 04:39:12 +00:00
Michael Kamensky
a9139c6023 Merge branch 'nametypos' into 'master' 
Make Your Mark fixes and some typos

See merge request core-developers/forge!4486
 2021-04-13 04:39:00 +00:00
Michael Kamensky
2de580236e Merge branch 'refine' into 'master' 
Gifts Ungiven and Intuition: eliminate ChooseCard line

See merge request core-developers/forge!4489
 2021-04-13 04:38:32 +00:00
Lyu Zong-Hong
e5d4979f3e Update Japanese Localization 2021-04-13 10:13:51 +09:00
Northmoc
1023cc5cb2 make_your_mark.txt remove unneeded cleanup 2021-04-12 17:15:56 -04:00
Northmoc
094cf9e400 make_your_mark.txt improve Effect behavior + add cleanup 2021-04-12 13:30:33 -04:00
Northmoc
1bc834efe8 add DeckHints 2021-04-12 13:24:32 -04:00
Northmoc
b4b039b2b0 intuition.txt eliminate ChooseCard line 2021-04-12 13:03:54 -04:00
Hans Mackowiak
d8e850673b StaticAbilityContinuous: fix GainsAbilitiesOfDefined 2021-04-12 17:56:42 +02:00
Northmoc
35d7046d69 gifts_ungiven.txt eliminate ChooseCard line 2021-04-12 11:20:36 -04:00
austinio7116
fad87abfea Historic Random Deck Generation initial data 2021-04-12 15:24:45 +01:00
Hans Mackowiak
10d10ff18d FlipACoinAI: add logic for Goblin Bangchuckers 2021-04-12 16:17:47 +02:00
Northmoc
161b99f252 elven_bow.txt remove default/bad params and desc typo 2021-04-12 09:53:58 -04:00
Northmoc
87ff260c9f dwarven_hammer.txt remove default/bad params 2021-04-12 09:51:18 -04:00
Northmoc
cc4dafa400 draugrs_helm.txt remove default/bad params 2021-04-12 09:50:22 -04:00
Northmoc
9d29904ec5 valkyries_sword.txt remove default/bad params 2021-04-12 09:48:55 -04:00
austinio7116
50be4f4ef8 Merge branch 'coremaster' into historicLDA 2021-04-12 14:46:43 +01:00
austinio7116
5f9c05080f Merge remote-tracking branch 'Core/master' into coremaster 2021-04-12 14:46:33 +01:00
Northmoc
bbfcc87a68 giants_amulet.txt tidy up 2021-04-12 09:46:00 -04:00
austinio7116
d7e9510353 Merge branch 'keeptrying' into 'master' 
Improved deck naming removing "-" and updated pioneer deckgen data

See merge request core-developers/forge!4484
 2021-04-12 13:45:09 +00:00
austinio7116
1a1057f56f Improved deck naming removing "-" and updated pioneer deckgen data 2021-04-12 13:45:09 +00:00
austinio7116
93ff8cfe1b Added Historic Random Deck Generation 2021-04-12 14:36:57 +01:00
Northmoc
4d05e085ef raiders_karve.txt fix TrigDesc 2021-04-12 09:24:25 -04:00
Northmoc
d2d96d2ece make_your_mark.txt 2021-04-12 09:23:59 -04:00
austinio7116
78762cd479 Reverted accidental test change 2021-04-12 13:40:44 +01:00
austinio7116
cdaa37c5fd Initial basic fix for LDA module to ensure it builds without errors - also removed some unneeded imports which the Maven checks were blocking on 2021-04-12 13:39:49 +01:00
austinio7116
76140fb555 Reverted accidental test change 2021-04-12 13:37:54 +01:00
austinio7116
352c5ea3d3 Corrected version in pom 2021-04-12 13:36:01 +01:00
austinio7116
f167d4fa3b Merge branch 'ldabuildonly2' of https://git.cardforge.org/Austin/forge into ldabuildonly2 2021-04-12 13:32:36 +01:00
austinio7116
7528cd3b58 Merge branch 'master' into 'ldabuildonly2' 
# Conflicts:
#   forge-gui/src/main/java/forge/gamemodes/limited/ArchetypeDeckBuilder.java
 2021-04-12 12:31:42 +00:00
austinio7116
cab8d0fb97 Merge branch 'coremaster' into ldabuildonly2 
# Conflicts:
#	forge-gui/src/main/java/forge/gamemodes/limited/ArchetypeDeckBuilder.java
 2021-04-12 13:11:52 +01:00
austinio7116
c7d9c174fd Merge remote-tracking branch 'Core/master' into coremaster 2021-04-12 13:02:52 +01:00
Michael Kamensky
b7787c8cf6 Merge branch 'Williams-master-patch-65541' into 'master' 
C21 Revival Experiment

See merge request core-developers/forge!4480
 2021-04-12 11:29:27 +00:00
Anthony Calosa
4d218e3624 Merge branch 'master' into 'master' 
unused import

See merge request core-developers/forge!4482
 2021-04-12 10:22:46 +00:00
Anthony Calosa
89fab45eb7 unused import 2021-04-12 18:21:54 +08:00
Anthony Calosa
9bca338cc2 Merge branch 'kevlahnota-master-patch-58825' into 'master' 
Update Commander 2021.txt

See merge request core-developers/forge!4481
 2021-04-12 10:16:33 +00:00
Anthony Calosa
36c3c43f86 Merge branch 'master' into 'master' 
Simplify ManaConversion scripts, remove Flash/Ice Cave technical debt

See merge request core-developers/forge!4479
 2021-04-12 10:14:23 +00:00
Anthony Calosa
d9f762c485 Update Commander 2021.txt 2021-04-12 10:04:33 +00:00
John
3d206d1fb1 Update revival_experiment.txt 2021-04-12 09:46:24 +00:00