Commit Graph

18628 Commits

Author SHA1 Message Date
Michael Kamensky
5c46556537 Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!4908
2021-06-21 03:01:16 +00:00
Brock Fanning
70a6a9bda5 Endurance send to bottom of library 2021-06-20 22:05:25 -04:00
Michael Kamensky
a5c30cadb4 Merge branch 'add_remaining_commander_cards' into 'master'
Add remaining missing cards in Commander sets

See merge request core-developers/forge!4907
2021-06-20 10:56:44 +00:00
Bug Hunter
fcdc8d691d Merge branch 'glinting-creeper-blocking-fix' into 'master'
Fix for Glinting Creeper blocking ability and text

See merge request core-developers/forge!4905
2021-06-20 09:00:59 +00:00
Lyu Zong-Hong
6daf4ac78d Add remaining commander cards 2021-06-20 17:22:49 +09:00
CCTV-1
ad72b44e12 translate new strings 2021-06-20 11:52:45 +08:00
Lyu Zong-Hong
cb0259c946 Add AI:RemoveDeck:All flag 2021-06-20 12:07:38 +09:00
Lyu Zong-Hong
6e5d79a8e0 Add Cruel Entertainment 2021-06-20 12:00:28 +09:00
Brock Fanning
7d8ea744c3 Fix for Glinting Creeper blocking 2021-06-19 20:55:41 -04:00
Michael Kamensky
8a96bbb3d4 Merge branch 'update_oracle_mh2' into 'master'
Update oracle mh2

See merge request core-developers/forge!4901
2021-06-19 14:54:47 +00:00
Brock Fanning
4ad137a23d Fix syntax in Vermin Gorger 2021-06-19 07:11:58 -04:00
Michael Kamensky
f9651796f8 Merge branch 'seal' into 'master'
Fix Seal of the Guildpact

See merge request core-developers/forge!4902
2021-06-19 09:38:46 +00:00
tool4EvEr
84f2d2ead2 Fix Seal of the Guildpact 2021-06-19 07:28:56 +02:00
Lyu Zong-Hong
84882cd4fa Update Ranar the Ever-Watchful and other similar cards 2021-06-19 13:55:02 +09:00
Lyu Zong-Hong
0d592c4096 Update types 2021-06-19 13:40:33 +09:00
Lyu Zong-Hong
c7d7130344 Update oracle for MH2 release 2021-06-19 12:47:36 +09:00
Bug Hunter
b1f13cf2f0 Update forge-gui/res/cardsfolder/m/moritte_of_the_frost.txt 2021-06-18 12:47:00 +00:00
Lyu Zong-Hong
afa6c9986a Use VAssignGenericAmount dialog to assign mana combo 2021-06-18 17:58:52 +09:00
Michael Kamensky
c7e489b477 Merge branch 'ui_update_divided_as_you_choose' into 'master'
[UI] Use VAssignGenericAmount dialog to assign DividedAsYouChoose values

See merge request core-developers/forge!4897
2021-06-18 03:10:35 +00:00
Lyu Zong-Hong
dfecf5d40a Use VAssignGenericAmount dialog to assign DividedAsYouChoose values 2021-06-18 11:21:23 +09:00
Andreas Bendel
db3919ab90 Update de-DE.properties
translated lblAssignCombatDamageAsChoose and lblAssignCombatDamageToCreature
2021-06-17 19:11:54 +00:00
Michael Kamensky
5193447625 Merge branch 'sld_update' into 'master'
SLD update

See merge request core-developers/forge!4895
2021-06-17 18:56:21 +00:00
paul_snoops
42c5b890a7 SLD update 2021-06-17 19:24:00 +01:00
tool4EvEr
b5e55a3a47 Minor card fixes 2021-06-17 17:05:16 +02:00
Michael Kamensky
5e39a2979b Merge branch 'update_damage_replacement_cards' into 'master'
Update some damage replacement related cards

See merge request core-developers/forge!4893
2021-06-17 09:48:53 +00:00
Alumi
20dc234ec1 Update Illusionary Terrain and Vision Charm 2021-06-17 09:48:30 +00:00
Lyu Zong-Hong
cd29194824 Update some damage replacement related cards 2021-06-17 15:44:12 +09:00
tool4EvEr
28ee56baea Small Card fixes 2021-06-16 20:02:56 +02:00
tool4EvEr
da1dbfc9cf Add AI hint 2021-06-16 16:19:34 +02:00
Michael Kamensky
c7d7f5c622 Merge branch 'paycheat' into 'master'
Fix casting SA while refusing to pay CostSacrifice

See merge request core-developers/forge!4881
2021-06-16 03:15:52 +00:00
Sol
50221ef138 Update Modern.txt 2021-06-16 01:38:54 +00:00
Michael Kamensky
6fadafa19a Merge branch 'net_decks' into 'master'
Small net decks update

See merge request core-developers/forge!4886
2021-06-15 17:45:19 +00:00
paul_snoops
68d78acc00 Small net decks update 2021-06-15 17:29:29 +01:00
tool4EvEr
9dada96de3 Clean up 2021-06-15 17:25:00 +02:00
tool4EvEr
f584c581d8 Improve AI hint 2021-06-15 16:46:22 +02:00
tool4EvEr
001106ea7b Small fixes 2021-06-15 16:36:33 +02:00
leriomaggio
6f14d1d37a Remapping as per Alumi suggestions in Discord chat
In short, these are the new changes:
- new Boxed set category separated from Reprint
- Reprint now only includes masters editions
- Commander now only includes commander sets
- Multiplayer sets (new) now includes Game Night and Archenemy and
  Planechase
- Game Night mapped to multiplayer
- Myster Boost mapped to Draft innovation
2021-06-15 08:47:25 +01: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
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
leriomaggio
cd4ce0d3ab Draft Update Editions' Type and Date w/ Scryfall
All Types and Release Date of Forge editions have been updated
according to Scryfall oracle database.
In more details, Scryfall categories have been remapped
so to have the less impact on previous types, whilst
allowing for a better and consistent editions grouping.

This is still WIP and classes (names and matches) can still be
subject to change.
2021-06-13 18:35:09 +01: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