external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,905 Commits 31 Branches 187 Tags
2af4b814649e3ef04a6b55efd4cf10cded44510c
Commit Graph

54905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
2ffb92ef43 Merge branch 'cleanup' into 'master' 
Remove some redundancy

See merge request core-developers/forge!5945
 2021-12-16 06:38:21 +00:00
Michael Kamensky
2d1ed05849 Merge branch 'sld_arcane_bonus' into 'master' 
SLD and MID update

See merge request core-developers/forge!5946
 2021-12-16 06:37:50 +00:00
Michael Kamensky
4cd7ad6635 Merge branch 'hidden' into 'master' 
Gyruda: if mill is replaced only find the cards if zone is known

See merge request core-developers/forge!5947
 2021-12-16 06:37:39 +00:00
tool4EvEr
a168e5b2ed Stitcher Geralf: avoid prompting when no match 2021-12-15 23:55:50 +01:00
tool4EvEr
cc04ca9e4a Fix Shadow Kin cleanup 2021-12-15 23:47:27 +01:00
tool4EvEr
d9a6fd1cb1 Gyruda: if mill is replaced only find the cards if zone is known 2021-12-15 23:35:19 +01:00
paul_snoops
da612b6c2f grafted_identity 2021-12-15 21:40:21 +00:00
paul_snoops
65030af713 SLD update 2021-12-15 21:35:15 +00:00
tool4EvEr
68fe6ec7e3 Remove some redundancy 2021-12-15 22:14:56 +01:00
Michael Kamensky
3921224e8a Merge branch 'y22_angel' into 'master' 
Y22: Angel of Eternal Dawn and support

See merge request core-developers/forge!5939
 2021-12-15 16:12:58 +00:00
Michael Kamensky
383f5b3f20 Merge branch 'y22_cards' into 'master' 
Y22 cards 13 Dec

See merge request core-developers/forge!5942
 2021-12-14 13:47:09 +00:00
paul_snoops
d4b11579b3 Produced Combo Any 2021-12-14 12:54:08 +00:00
Michael Kamensky
98f0486744 Merge branch 'netplay' into 'master' 
Fix updatePhase

Closes #1939

See merge request core-developers/forge!5943
 2021-12-14 03:54:29 +00:00
Northmoc
4be769fff9 add cantBeNight check to Untap.java 2021-12-13 14:57:02 -05:00
tool4EvEr
f3b9adecd4 Fix updatePhase 2021-12-13 19:59:05 +01:00
paul_snoops
66521783d3 fixes 2021-12-13 17:40:19 +00:00
Michael Kamensky
c0e71ed97f Merge branch 'TRT-master-patch-63725' into 'master' 
Update forge-gui/res/cardsfolder/c/confounding_conundrum.txt

See merge request core-developers/forge!5941
 2021-12-13 17:01:11 +00:00
Bug Hunter
266605d42a Update forge-gui/res/cardsfolder/c/confounding_conundrum.txt 2021-12-13 17:01:11 +00:00
paul_snoops
2bb0ab9d4d Y22 cards 13 Dec 2021-12-13 08:58:40 +00:00
Michael Kamensky
e5f2764deb Merge branch 'rebalanced' into 'master' 
Rebalanced cards initial implementation

See merge request core-developers/forge!5932
 2021-12-13 04:35:40 +00:00
Michael Kamensky
92b47e70f7 Merge branch 'y22_12' into 'master' 
Y22: 12 Dec

See merge request core-developers/forge!5938
 2021-12-13 04:35:32 +00:00
Northmoc
81a9c7ed4b sap_vitality.txt 2021-12-12 22:38:12 -05:00
Northmoc
b5a83941a0 rimewall_protector.txt add AI 2021-12-12 22:38:03 -05:00
Northmoc
f4a63c19a2 rimewall_protector.txt 2021-12-12 22:37:34 -05:00
Northmoc
770a5bb880 bloodrage_alpha.txt 2021-12-12 22:20:54 -05:00
Northmoc
c1fc9d9dd9 puppet_raiser.txt 2021-12-12 20:12:57 -05:00
Northmoc
c1105c50aa frenzied_geistblaster.txt (squee1968) 2021-12-12 20:04:53 -05:00
Northmoc
ed5152f2a2 support "cmcGT$ Turns" in StaticAbilityCantBeCast 2021-12-12 19:57:53 -05:00
Northmoc
520169b2c7 support noNight in DayTimeEffect 2021-12-12 19:57:21 -05:00
Northmoc
80edd52ef6 add noNight GlobalRuleChange 2021-12-12 19:56:51 -05:00
Northmoc
a2f061e6d1 angel_of_eternal_dawn.txt 2021-12-12 19:56:07 -05:00
Northmoc
5c8b35b8b4 oglor_devoted_assistant.txt 2021-12-12 19:03:51 -05:00
Northmoc
84b25360e3 geistpack_alpha.txt 2021-12-12 17:54:30 -05:00
Northmoc
79bc3cee44 ominous_traveler.txt tidy 2021-12-12 17:52:50 -05:00
Northmoc
3b61aaaf61 hinterland_chef.txt 2021-12-12 17:52:23 -05:00
Bug Hunter
f72896850c Merge branch 'fix' into 'master' 
nebelgast_beguiler.txt fix Oracle

See merge request core-developers/forge!5937
 2021-12-12 21:37:51 +00:00
Northmoc
b473faba84 nebelgast_beguiler.txt fix Oracle 2021-12-12 16:32:18 -05:00
Bug Hunter
269ef0410f Merge branch 'TRT-master-patch-29668' into 'master' 
Update forge-gui/res/cardsfolder/a/atalya_samite_master.txt

See merge request core-developers/forge!5936
 2021-12-12 20:14:01 +00:00
Bug Hunter
d90b2088bd Update forge-gui/res/cardsfolder/a/atalya_samite_master.txt 2021-12-12 20:13:43 +00:00
paul_snoops
417c31f44b Rebalanced cards 2021-12-12 19:00:12 +00:00
paul_snoops
28b867a816 Rebalanced cards 2021-12-12 19:00:11 +00:00
Michael Kamensky
1ed0dda5de Merge branch 'amulet' into 'master' 
Fix RememberCostMana

Closes #1947

See merge request core-developers/forge!5931
 2021-12-12 18:21:34 +00:00
Michael Kamensky
9ea3c09e86 Merge branch 'paying' into 'master' 
CantSacrifice + CantPayLife: fix for special actions

Closes #1887

See merge request core-developers/forge!5935
 2021-12-12 18:21:03 +00:00
tool4EvEr
b99a7c2a9c Clean up 2021-12-12 18:42:08 +01:00
tool4EvEr
b0b3c5c4ae Plunge into Darkness: Fix cost 2021-12-12 18:06:19 +01:00
tool4EvEr
9db8714891 Update payLife 2021-12-12 18:05:15 +01:00
tool4EvEr
09c7e1cc22 CantSacrifice + CantPayLife: fix for special actions 2021-12-12 16:43:56 +01:00
tool4EvEr
3e10a71f30 Clean up 2021-12-12 16:09:28 +01:00
tool4EvEr
4be2d9eaac Fix RememberCostMana 2021-12-12 16:07:15 +01:00
Michael Kamensky
bd30cc3559 Merge branch 'shoal' into 'master' 
Shoal spells: fix wrong CMC

Closes #1968

See merge request core-developers/forge!5928
 2021-12-12 11:50:16 +00:00