external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,686 Commits 32 Branches 187 Tags
01d117b07ef9dc8c57b409d47444e06e2e11f93c
Commit Graph

51686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
Michael Kamensky
91ae1036de - Add planeswalker achievements for MH2. 2021-06-12 16:00:33 +03:00
Michael Kamensky
c20165df92 Merge branch '1842-panharmonicon-trigger-lingering' into 'master' 
Resolve "Panharmonicon trigger lingering"

Closes #1842

See merge request core-developers/forge!4708
 2021-06-12 12:57:51 +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
Michael Kamensky
c1efe047a3 Merge branch 'announcements-update' into 'master' 
Integrations to Announcements.

See merge request core-developers/forge!4870
 2021-06-12 12:49:45 +00:00
Michael Kamensky
13e57e25f6 Merge branch 'abilitytext' into 'master' 
Fix CantBlockBy ability text not updating

See merge request core-developers/forge!4871
 2021-06-12 12:49:19 +00:00
leriomaggio
5345bee294 FIXED typo in Modern Horizons edition name 2021-06-12 12:46:33 +00:00
tool4EvEr
e9b0902fe0 Fix CantBlockBy ability text not updating 2021-06-12 14:44:47 +02:00
leriomaggio
de21053398 Update ANNOUNCEMENTS.txt 2021-06-12 12:43:06 +00:00
leriomaggio
27c993831e Integrations to Announcements. 2021-06-12 13:28:35 +01:00
Sol
3dddca9c1e Merge branch 'paul_snoops-master-patch-02299' into 'master' 
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!4869
 2021-06-12 12:05:16 +00:00
Snoops
0effbb805a Update ANNOUNCEMENTS.txt 2021-06-12 10:23:16 +00:00
Michael Kamensky
20225a78cb Merge branch 'paul_snoops-master-patch-68635' into 'master' 
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!4868
 2021-06-12 09:27:48 +00:00
Snoops
c8cedbd0af Update ANNOUNCEMENTS.txt 2021-06-12 09:20:29 +00: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
Michael Kamensky
08454489b4 Merge branch 'net_decks' into 'master' 
Net decks updates

See merge request core-developers/forge!4861
 2021-06-12 08:28:02 +00:00
Michael Kamensky
71110568fc Merge branch 'askai' into 'master' 
Add Ask AI button

See merge request core-developers/forge!4867
 2021-06-12 04:18:22 +00:00
Michael Kamensky
9990f0ad1a Merge branch 'aiPW' into 'master' 
Attack Planeswalker prioritization

See merge request core-developers/forge!4866
 2021-06-12 04:17:10 +00:00
Bug Hunter
735a966312 Attack Planeswalker prioritization 2021-06-12 04:17:09 +00:00
tool4EvEr
828d4e17c9 Add Ask AI button 2021-06-11 23:25:57 +02:00
paul_snoops
233c1f6d00 Merge branch 'master' into net_decks 2021-06-11 22:24:22 +01: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
Bug Hunter
a5b7f93971 Merge branch 'fixnpe' into 'master' 
Fix CostTapType NPE

See merge request core-developers/forge!4865
 2021-06-11 10:34:21 +00:00
tool4EvEr
d853ca6615 Fix CostTapType NPE 2021-06-11 12:33:37 +02:00
Michael Kamensky
418d2bf012 Merge branch 'update_card_translations' into 'master' 
Update card translations

See merge request core-developers/forge!4862
 2021-06-11 10:07:29 +00:00
Lyu Zong-Hong
030f1f4056 Update Japanese translations 2021-06-11 16:56:17 +09:00
Churrufli
45f598e0b9 Oathbreaker Net Decks implementation 2021-06-11 09:07:41 +02:00
Hans Mackowiak
fc82dbb9aa Zabaz: add Cause to ReplaceAddCounter 2021-06-11 08:31:30 +02:00
Lyu Zong-Hong
6feb18c11c Update card translations 2021-06-11 15:10:49 +09: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
paul_snoops
df0b5362c2 Net decks updates 2021-06-10 20:09:40 +01: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
Michael Kamensky
35b71da140 Merge branch 'master' into 'master' 
Gauntlet Updates

See merge request core-developers/forge!4859
 2021-06-10 11:49:55 +00: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
Churrufli
3b2e39808e Gauntlet Updates 2021-06-10 10:41:45 +02:00
Churrufli
697a2ace20 Gauntlet Updates 2021-06-10 10:37:24 +02:00
Sol
c38c53d513 Merge branch 'fix-play-effect' into 'master' 
isBlank() is from Java 11

See merge request core-developers/forge!4858
 2021-06-10 01:58:13 +00:00
friarsol
31745fe31e isBlank() is from Java 11 2021-06-09 21:57:47 -04:00
Sol
f8e3f4dd31 Merge branch 'migrate-mh2' into 'master' 
Migrate Modern Horizons 2

See merge request core-developers/forge!4857
 2021-06-10 01:47:40 +00:00
friarsol
965ec4bc47 Migrate Modern Horizons 2 2021-06-09 21:46:33 -04:00
Sol
9cf28e7041 Update u_0_3_crab.txt 2021-06-10 01:28:52 +00:00
Sol
71f639d45e Merge branch 'garth_one_eye' into 'master' 
Add Garth One-Eye and necessary support

See merge request core-developers/forge!4856
 2021-06-10 00:43:30 +00:00