external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,605 Commits 33 Branches 187 Tags
1c9cfbc4bb4d5f940b9bdc2073f19f2b80c4e49c
Commit Graph

49605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John
2a959f23d9 Add new file 2021-04-12 09:44:53 +00:00
Hythonia
bb659d39db ManaConvert keyword display 2021-04-12 10:03:03 +02:00
Hythonia
49cdd4d36d DefinedCost and DefinedManaCost 2021-04-12 10:03:02 +02:00
Hythonia
41d55cf780 Simplify ManaConvertion scripts 2021-04-12 10:03:02 +02:00
Michael Kamensky
5c5c948193 Merge branch 'card-fixes' into 'master' 
Moritte type fix

See merge request core-developers/forge!4477
 2021-04-12 04:19:37 +00:00
Michael Kamensky
0e32dc982e Merge branch 'unset-cards' into 'master' 
Just host cards

See merge request core-developers/forge!4460
 2021-04-12 04:19:30 +00:00
Michael Kamensky
9fffdb8cad Merge branch 'mannequin' into 'master' 
Makeshift Mannequin: Fix duration

See merge request core-developers/forge!4474
 2021-04-12 04:17:47 +00:00
Michael Kamensky
76a1da2d0f Merge branch 'emblazoned_golem' into 'master' 
Add Emblazoned Golem

See merge request core-developers/forge!4467
 2021-04-12 04:17:33 +00:00
Adam Pantel
ba012a4b0e Moritte type fix 2021-04-11 21:54:28 -04:00
Adam Pantel
09fd212e29 Remove // from names 2021-04-11 21:53:01 -04:00
swordshine
54fd4787fd Merge branch 'kaboom' into 'master' 
Kaboom!

See merge request core-developers/forge!4472
 2021-04-12 01:04:57 +00:00
Hans Mackowiak
023499a6c0 Player: run checkStaticAbilities before Companion to apply CDA 2021-04-12 02:03:59 +02:00
Lyu Zong-Hong
a8ad7f540b Add DeckHas hint 2021-04-12 08:01:20 +09:00
Adam Pantel
b7ee2c696b Some host cards 2021-04-11 18:35:03 -04:00
austinio7116
4528223dee 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-11 23:13:49 +01:00
austinio7116
cf729db0c0 Merge remote-tracking branch 'Core/master' into coremaster 2021-04-11 23:13:14 +01:00
austinio7116
a4deafa238 Merge branch 'khmldabranch' into 'master' 
KHM deck generation

See merge request core-developers/forge!4469
 2021-04-11 22:12:02 +00:00
austinio7116
5e88eab617 Modern LDA data 2021-04-11 22:46:47 +01:00
austinio7116
950e51e0fe Improved snow land decision making on LDA deck generator 2021-04-11 22:46:43 +01:00
austinio7116
1c1d743638 Fixes for snow covered lands in LDA deck generation 2021-04-11 22:46:38 +01:00
austinio7116
ffa7e39121 Merge remote-tracking branch 'Core/master' into coremaster 2021-04-11 22:46:01 +01:00
austinio7116
84d6a24446 Modern LDA data 2021-04-11 22:45:09 +01:00
tool4EvEr
91c92d4b64 Fix duration 2021-04-11 21:27:50 +02:00
Bug Hunter
056229e8ee Merge branch 'impetus' into 'master' 
Psychic Impetus: Fix missing param

See merge request core-developers/forge!4473
 2021-04-11 19:22:12 +00:00
tool4EvEr
c4c5f7ab6b Fix missing param 2021-04-11 21:21:39 +02:00
tool4EvEr
c7ab33f3ab Oracle adjustment 2021-04-11 21:12:48 +02:00
Michael Kamensky
3a3850ec4e Merge branch 'Williams-master-patch-09539' into 'master' 
C21 Sproutback Trudge

See merge request core-developers/forge!4455
 2021-04-11 19:04:23 +00:00
Michael Kamensky
84ed014909 Merge branch 'new-cards-2' into 'master' 
Combat Calligrapher

Closes #1795

See merge request core-developers/forge!4462
 2021-04-11 19:03:57 +00:00
Michael Kamensky
39563682f5 Merge branch 'phasedAttachment' into 'master' 
GameEntity: when attachment is phased out, treat as not attached

See merge request core-developers/forge!4470
 2021-04-11 19:03:26 +00:00