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
51,054 Commits 33 Branches 187 Tags
12be76899a7e68ad0ff394d024128e96e2c72f53
Commit Graph

51054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
43c39ec231 Merge branch 'update_quest_worlds' into 'master' 
Revert worlds.txt back to use only sets intended by the author

See merge request core-developers/forge!4884
 2021-06-15 05:24:01 +00:00
Lyu Zong-Hong
9da49cfce1 Revert worlds.txt back to use only sets intended by the author 2021-06-15 14:05:50 +09:00
Michael Kamensky
a3e302eee1 Merge branch 'stuff' into 'master' 
Cleanup some cards

See merge request core-developers/forge!4879
 2021-06-15 03:30:36 +00:00
Michael Kamensky
5c8fbd3c7e Merge branch 'fix' into 'master' 
couple little MH2 fixes

See merge request core-developers/forge!4880
 2021-06-15 03:29:59 +00:00
Michael Kamensky
414aa96463 Merge branch 'afr_14' into 'master' 
AFR - 14 June

See merge request core-developers/forge!4882
 2021-06-15 03:29:49 +00:00
Michael Kamensky
4a25ad9c6a Merge branch 'taxi' into 'master' 
Fix Dermotaxi

See merge request core-developers/forge!4883
 2021-06-15 03:28:26 +00:00
tool4EvEr
56eda948d6 Fix Dermotaxi 2021-06-15 02:32:13 +02:00
Northmoc
4df7433dfa tashas_hideous_laughter.txt 2021-06-14 18:32:56 -05:00
Northmoc
9cb95f8f35 flumph.txt 2021-06-14 18:32:56 -05:00
tool4EvEr
1c0c0ad38d Fix casting SA while refusing to pay CostSacrifice 2021-06-15 01:28:46 +02:00
Northmoc
84af4d6344 terminal_agony.txt fix cost 2021-06-14 15:37:54 -05:00
Northmoc
d92e2123a2 combine_chrysalis.txt +YouCtrl 2021-06-14 15:35:35 -05:00
tool4EvEr
f447ab64ce Cleanup some cards 2021-06-14 20:45:52 +02:00
Michael Kamensky
4049a3eea3 Merge branch 'fixnpe' into 'master' 
Fix NPE when AI can only attack PW without Ultimates

See merge request core-developers/forge!4877
 2021-06-14 04:18:34 +00:00
tool4EvEr
36f3165688 Fix NPE 2021-06-13 23:19:34 +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
Michael Kamensky
77d88b66e8 Merge branch 'smallfixes' into 'master' 
Small fixes sequel

See merge request core-developers/forge!4875
 2021-06-13 10:59:19 +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
733962a935 Merge branch 'fixing' into 'master' 
Small fixes

See merge request core-developers/forge!4874
 2021-06-13 03:54:56 +00:00
tool4EvEr
3f3a90b360 Clean StackDescriptions 2021-06-12 22:22:18 +02:00
tool4EvEr
ec739b40de Fix Fumarole 2021-06-12 22:16:11 +02:00
tool4EvEr
50d3e8cef4 Clean up 2021-06-12 21:58:45 +02:00
tool4EvEr
fa095007cf Small fixes 2021-06-12 21:29:59 +02:00
Michael Kamensky
db3bde4bbb Merge branch 'master' into 'master' 
Prepare Forge for Android publish 1.6.42.001 [incremental].

See merge request core-developers/forge!4873
 2021-06-12 13:42:42 +00:00
Michael Kamensky
37bb9279f1 - Prepare Forge for Android publish 1.6.42.001 [incremental]. 2021-06-12 16:41:22 +03: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 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