external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,520 Commits 33 Branches 187 Tags
a5aa29f65e77ff1a186fdb3ea2bfbb0af200a39c
Commit Graph

52520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CCTV-1
c09cf436f1 fix trigger description. 2021-08-07 12:47:46 +08:00
Michael Kamensky
21d0614e62 Merge branch 'mid_edition' into 'master' 
Add Innistrad: Midnight Hunt edition file and cards

See merge request core-developers/forge!5185
 2021-08-07 04:12:06 +00:00
Michael Kamensky
6687ad0b76 Merge branch 'eldrainequest' into 'master' 
Eldraine Quest World! – by Xyx

See merge request core-developers/forge!5186
 2021-08-07 04:11:41 +00:00
Michael Kamensky
a4af507992 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.44.001

See merge request core-developers/forge!5193
 2021-08-07 03:43:08 +00:00
Michael Kamensky
1ef490bf5e - Preparing Forge for Android publish 1.6.44.001 [incremental]. 2021-08-07 06:42:00 +03:00
Michael Kamensky
1a7845117b [maven-release-plugin] prepare for next development iteration 2021-08-07 06:30:54 +03:00
Michael Kamensky
5c768baf64 [maven-release-plugin] prepare release forge-1.6.44 forge-1.6.44 2021-08-07 06:30:45 +03:00
Michael Kamensky
789ed51ca6 Merge branch 'command' into 'master' 
Resolve "Word of Command: crash when trying to play card outside of timing restriction (e. g. Chaotic Strike)"

Closes #1857

See merge request core-developers/forge!5190
 2021-08-07 03:20:56 +00:00
Michael Kamensky
307c8e5dd1 Merge branch 'prey' into 'master' 
prey_upon.txt cleanup descs

See merge request core-developers/forge!5192
 2021-08-07 03:20:36 +00:00
Northmoc
4d4c427ca9 prey_upon.txt cleanup descs 2021-08-06 20:47:01 -04:00
Northmoc
8ea2cae285 Support "winning" Fights 2021-08-06 19:52:52 -04:00
Northmoc
974e0879b0 GameAction - allow some SAs to check states if specified 2021-08-06 19:52:15 -04:00
Northmoc
dd89e0eb64 skyshroud_ambush.txt initial try 2021-08-06 19:51:16 -04:00
tool4EvEr
7838a9dfba Fix crash when empty 2021-08-07 00:22:56 +02:00
Michael Kamensky
8a64097a85 Merge branch 'wc' into 'master' 
wintermoor_commander.txt add AI logic - by Xyx

See merge request core-developers/forge!5187
 2021-08-06 17:33:12 +00:00
Snoops
8c1ad25c7d Update Jumpstart Historic Horizons.txt 2021-08-06 17:11:48 +00:00
Snoops
5be1453287 Update Jumpstart Historic Horizons.txt 2021-08-06 17:10:07 +00:00
Sol
a8e11227f9 Merge branch 'announce' into 'master' 
announcements

See merge request core-developers/forge!5188
 2021-08-06 16:17:39 +00:00
Snoops
98029331f3 Update play_with_fire.txt 2021-08-06 13:48:40 +00:00
Snoops
3417b138df Update play_with_fire.txt 2021-08-06 13:46:12 +00:00
Northmoc
ea9001f582 announcement 2021-08-06 09:44:43 -04:00
Northmoc
dc42f9caa7 announcement 2021-08-06 09:32:29 -04:00
Northmoc
bbdc74f9a4 wintermoor_commander.txt add AI logic - by Xyx 2021-08-06 09:29:37 -04:00
Snoops
697b0bd980 Update g_x_x_treefolk_reach_total_lands.txt 2021-08-06 13:18:28 +00:00
Snoops
089db5e557 Update wrenn_and_seven.txt 2021-08-06 13:17:23 +00:00
Snoops
ee870af50d Update infernal_grasp.txt 2021-08-06 13:15:24 +00:00
Northmoc
f494e8fdf9 Eldraine Quest World! – by Xyx 2021-08-06 09:13:52 -04:00
Snoops
96db343470 Update infernal_grasp.txt 2021-08-06 12:39:24 +00:00
Snoops
e880252b04 Update champion_of_the_perished.txt 2021-08-06 12:38:14 +00:00
Snoops
dfdd2c8828 Update wrenn_and_seven.txt 2021-08-06 11:10:46 +00:00
Snoops
b809b22e58 Update champion_of_the_perished.txt 2021-08-06 11:10:15 +00:00
Snoops
7d793e422c Add g_x_x_treefolk_reach_total_lands.txt 2021-08-06 10:54:42 +00:00
Snoops
2c8a074977 Add join_the_dance.txt 2021-08-06 10:53:15 +00:00
Snoops
d287f5ce28 Add wrenn_and_seven.txt 2021-08-06 10:52:38 +00:00
Snoops
73921591cf Add play_with_fire.txt 2021-08-06 10:51:29 +00:00
Snoops
a388e47a9a Add infernal_grasp.txt 2021-08-06 10:50:34 +00:00
Snoops
74aaa97ef6 Add champion_of_the_perished.txt 2021-08-06 10:49:53 +00:00
Snoops
c8b2b6b2b2 Add triskaidekaphile.txt 2021-08-06 10:48:46 +00:00
Snoops
41dea0519e Add consider.txt 2021-08-06 10:47:58 +00:00
Snoops
53887c081a Update Innistrad Midnight Hunt 2021-08-06 10:46:42 +00:00
Snoops
b1600f6c83 Add Innistrad: Midnight Hunt edition file 2021-08-06 10:33:25 +00:00
Michael Kamensky
2a7fa0f691 Merge branch 'mulligan' into 'master' 
Fix mulligan with zero cards

Closes #1945

See merge request core-developers/forge!5183
 2021-08-06 03:30:00 +00:00
Michael Kamensky
37de739a9c Merge branch 'fix_phyrexian_mana' into 'master' 
Add pure Phyrexian mana symbol for Rage Extractor

See merge request core-developers/forge!5184
 2021-08-06 03:29:42 +00:00
Lyu Zong-Hong
763d509638 Add pure Phyrexian mana symbol for Rage Extractor 2021-08-06 09:46:59 +09:00
tool4EvEr
32b4407b04 Fix mulligan with zero cards 2021-08-05 21:42:04 +02:00
leriomaggio
9f3e78459e Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-08-05 19:25:52 +01:00
Michael Kamensky
1d4f68d95f Merge branch 'fixes' into 'master' 
Fix Minimus Containment

See merge request core-developers/forge!5182
 2021-08-05 15:59:06 +00:00
tool4EvEr
bb2c967f6e Fix Minimus Containment on equipment 2021-08-05 17:48:51 +02:00
tool4EvEr
6ccb41cfa6 NPE protection 2021-08-05 17:48:27 +02:00
Michael Kamensky
118e81d046 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!5181
 2021-08-05 11:42:55 +00:00