external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,558 Commits 32 Branches 187 Tags
901b7159479e616d792b25dd00556a9ccb2fb38a
Commit Graph

5440 Commits

Author SHA1 Message Date
tool4EvEr
f447ab64ce Cleanup some cards 2021-06-14 20:45:52 +02:00
Michael Kamensky
32891863ad Merge branch 'pumpAI' into 'master' 
getPumpedCreature: Fix new ID for copy

Closes #1885

See merge request core-developers/forge!4876
 2021-06-13 12:49:47 +00:00
tool4EvEr
ff801fe747 Small fixes 2021-06-13 11:31:00 +02:00
tool4EvEr
73016d1fe0 Fix new ID for copy 2021-06-13 11:23:12 +02:00
Michael Kamensky
4e1c6cb678 [maven-release-plugin] prepare for next development iteration 2021-06-12 16:30:00 +03:00
Michael Kamensky
7e1fd332e0 [maven-release-plugin] prepare release forge-1.6.42 2021-06-12 16:29:51 +03:00
Michael Kamensky
58f369e6e5 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-12 16:25:34 +03:00
Michael Kamensky
368c2f9796 [maven-release-plugin] prepare for next development iteration 2021-06-12 16:13:39 +03:00
Michael Kamensky
d658df35d6 [maven-release-plugin] prepare release forge-1.6.41 2021-06-12 16:13:31 +03:00
Michael Kamensky
4b6edee3e6 Merge branch 'master' into 'master' 
Add Planeswalker achievements for MH2 by Marek14

See merge request core-developers/forge!4872
 2021-06-12 13:01:44 +00:00
Hans Mackowiak
9bdd4b9351 StaticAbilityPanharmonicon: add LastStateBattlefield to Trigger RunParams for stuff that destroys in sequence 2021-06-12 12:57:51 +00:00
tool4EvEr
e9b0902fe0 Fix CantBlockBy ability text not updating 2021-06-12 14:44:47 +02:00
Michael Kamensky
844098a302 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-12 11:28:43 +03:00
Sol
dbe1683ba9 Merge branch 'zabaz' into 'master' 
Zabaz: add Cause to ReplaceAddCounter

See merge request core-developers/forge!4863
 2021-06-11 12:29:46 +00:00
tool4EvEr
d853ca6615 Fix CostTapType NPE 2021-06-11 12:33:37 +02:00
Hans Mackowiak
fc82dbb9aa Zabaz: add Cause to ReplaceAddCounter 2021-06-11 08:31:30 +02:00
Michael Kamensky
c07f3ea34d Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-11 07:50:33 +03:00
Michael Kamensky
8948210e0a Merge branch 'fixland' into 'master' 
Fix playLand ETB check failing if lands changed by another effect

See merge request core-developers/forge!4860
 2021-06-11 03:47:55 +00:00
tool4EvEr
a9b60a87e0 Fix playLand ETB check failing if lands changed by another effect 2021-06-10 18:10:42 +02:00
Sol
694317a50f Merge branch 'fixes' into 'master' 
More small fixes

See merge request core-developers/forge!4855
 2021-06-10 15:36:25 +00:00
tool4EvEr
a856834693 Refactor guard 2021-06-10 17:29:26 +02:00
leriomaggio
5bc4122a31 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-06-10 10:53:02 +01:00
friarsol
31745fe31e isBlank() is from Java 11 2021-06-09 21:57:47 -04:00
leriomaggio
18febc5af0 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-06-09 19:33:01 +01:00
tool4EvEr
084476b8b0 Clean up 2021-06-09 18:43:34 +02:00
leriomaggio
22b1abece5 Updated API call to CardDB with getCardFromEditions w/ LatestPrint 
Probably the specs of the policy hard coded could be removed, but requires more investigation before doing it.
 2021-06-09 17:43:11 +01:00
leriomaggio
2c2f6f6f31 Updated API call to CardDB with getCardFromEditions w/ OldPrint 2021-06-09 17:40:29 +01:00
Lyu Zong-Hong
f9abb8ca75 Add Garth One-Eye and necessary support 2021-06-09 23:07:55 +09:00
tool4EvEr
083674071b Reset xPaid after ability resolved 2021-06-09 11:40:01 +02:00
tool4EvEr
96ccf0afc6 More small fixes 2021-06-09 09:43:02 +02:00
tool4EvEr
cc8753b563 Small fixes 2021-06-08 23:17:55 +02:00
Michael Kamensky
5a0a63940d Merge branch 'typefix' into 'master' 
Fix missing type

See merge request core-developers/forge!4849
 2021-06-08 03:31:57 +00:00
tool4EvEr
3ab7fcf224 Fix NPE with Grakmaw when run from ChooseType 2021-06-07 22:40:16 +02:00
tool4EvEr
4f4fe04683 Fix missing type 2021-06-07 22:08:21 +02:00
Michael Kamensky
32df7f3eae Merge branch 'fixsuspend' into 'master' 
Suspend Fixes

See merge request core-developers/forge!4828
 2021-06-06 03:29:09 +00:00
Bug Hunter
4b3839b143 Suspend Fixes 2021-06-06 03:29:08 +00:00
Michael Kamensky
d5aaa4dc45 Merge branch 'repeateach' into 'master' 
RepeatPlayers - Swap out other remembered while resolving

See merge request core-developers/forge!4834
 2021-06-06 03:27:03 +00:00
Bug Hunter
999e4f81ee RepeatPlayers - Swap out other remembered while resolving 2021-06-06 03:27:02 +00:00
Michael Kamensky
c38d2f531c Merge branch 'carth' into 'master' 
MH2: Carth the Lion

See merge request core-developers/forge!4760
 2021-06-06 03:26:09 +00:00
Bug Hunter
b10ce1b884 Carth support 2021-06-06 03:26:07 +00:00
tool4EvEr
e6280377ce Fix crash with City in a Bottle & Facedown 2021-06-05 20:22:30 +02:00
Michael Kamensky
1633dedee3 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-05 17:34:06 +03:00
Michael Kamensky
9ae41c67a2 Merge branch 'replace_damage_missing_cards' into 'master' 
Implement remaining damage prevention/redirection cards

See merge request core-developers/forge!4832
 2021-06-05 14:28:35 +00:00
Michael Kamensky
1f2cc92533 Merge branch 'phasing' into 'master' 
Phasing Fixes

Closes #531

See merge request core-developers/forge!4808
 2021-06-05 14:27:11 +00:00
Northmoc
889173a682 move PutCounter cost earlier 2021-06-05 08:02:27 -04:00
Lyu Zong-Hong
ab31c8fa9d Implement missing cards with dividable shields for damage replacement effects 2021-06-05 18:20:02 +09:00
Lyu Zong-Hong
f95fb7d08b Choose source for prevent/redirect next N damage effect 2021-06-05 18:20:01 +09:00
Michael Kamensky
f53e4495de Merge branch 'thrasta' into 'master' 
MH2: Thrasta and "Trample over planeswalkers"

See merge request core-developers/forge!4824
 2021-06-05 03:17:27 +00:00
tool4EvEr
dccf161d54 Fix Untap of card that should't after phasing in 2021-06-04 20:27:44 +02:00
tool4EvEr
c648a8ccbc Stop counting phased out cards 2021-06-04 20:27:43 +02:00