external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,018 Commits 31 Branches 187 Tags
2e81a939b9aa4ddf66925c20a8ba18f1586b6fc9
Commit Graph

39018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamin W. Collins
2e81a939b9 fix deck import exception message 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-10-18 18:11:45 -06:00
Jamin W. Collins
fda3e81d9a ignore deck lines that start with // 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-10-18 17:56:21 -06:00
swordshine
50c827495a Merge branch 'patch' into 'master' 
- Fixed Blood Operative

See merge request core-developers/forge!1029
 2018-10-18 04:16:20 +00:00
swordshine
8e018f9c51 - Fixed Blood Operative 2018-10-18 12:15:44 +08:00
swordshine
2828e5717c Merge branch 'patch' into 'master' 
Fixed Sentinel Tower

See merge request core-developers/forge!1028
 2018-10-18 02:58:01 +00:00
swordshine
42c3fd09db Fixed Sentinel Tower 2018-10-18 10:57:00 +08:00
swordshine
6202ae294b Merge branch 'necraFix' into 'master' 
Necravolver fix

See merge request core-developers/forge!1026
 2018-10-18 01:07:44 +00:00
Hanmac
25f7231e49 Necravolver fix 2018-10-17 21:47:09 +02:00
Michael Kamensky
05ba511748 Merge branch 'master' into 'master' 
Update some scripts

See merge request core-developers/forge!1024
 2018-10-17 04:22:16 +00:00
swordshine
f4261cf5a9 Merge branch 'guildofravnica' into 'master' 
Updated GRN standard deck generation data

See merge request core-developers/forge!1025
 2018-10-17 03:51:48 +00:00
austinio7116
a55b94b796 Removed old duplicate 2018-10-16 21:43:34 +01:00
austinio7116
05c326607c Updated deck generation data 
(cherry picked from commit 3be0655)
 2018-10-16 21:39:08 +01:00
maustin
f65f282974 Merge branch 'coremaster' into guildofravnica 2018-10-16 21:38:20 +01:00
Michael Kamensky
5aff78e5c4 Merge branch 'GRN-add-guildgates-to-draft-ranking' into 'master' 
Add guildgates back to GRN draft ranking

See merge request core-developers/forge!1023
 2018-10-16 18:31:52 +00:00
swordshine
9c4d234b7a - Karador cannot play Dryad Arbor 2018-10-16 22:44:35 +08:00
pfirpfel
460ccd78e0 Add guildgates back to GRN draft ranking 2018-10-16 14:51:32 +02:00
swordshine
1ea4810a89 - Update description 2018-10-16 19:37:22 +08:00
Michael Kamensky
51ce712623 Merge branch 'update-legacy-bannings' into 'master' 
Update legacy bannings

See merge request core-developers/forge!1022
 2018-10-16 09:28:53 +00:00
pfirpfel
17cb065079 Update legacy bannings 2018-10-16 10:39:11 +02:00
Michael Kamensky
eb528fd4d7 Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_GRN2, improved puzzle PS_GRN1.

See merge request core-developers/forge!1021
 2018-10-16 05:21:02 +00:00
Michael Kamensky
fb7ac6ea21 Added puzzle PS_GRN2, improved puzzle PS_GRN1. 2018-10-16 05:21:02 +00:00
Michael Kamensky
d12e6430a6 Merge branch 'epicRework' into 'master' 
Epic rework

See merge request core-developers/forge!1018
 2018-10-16 04:12:53 +00:00
swordshine
efc021339a Merge branch 'patch-3' into 'master' 
Update kraul_harpooner.txt not up to targeting

See merge request core-developers/forge!1019
 2018-10-16 03:56:21 +00:00
swordshine
2e0a0c5560 Merge branch 'migrate-full-cost' into 'master' 
Convert FullCost to PermanentCreature

See merge request core-developers/forge!1020
 2018-10-16 03:56:08 +00:00
Chris H
a80396ae97 Convert FullCost to PermanentCreature 2018-10-15 22:18:23 -04:00
Sol
ac3370e83a Update kraul_harpooner.txt not up to targeting 2018-10-16 01:55:49 +00:00
Hanmac
6c2dfcffff Epic rework 2018-10-15 22:05:13 +02:00
Michael Kamensky
1304227020 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.17.001 [incremental].

See merge request core-developers/forge!1017
 2018-10-15 16:52:28 +00:00
Agetian
81776f88a6 - Preparing Forge for Android publish 1.6.17.001 [incremental]. 2018-10-15 19:51:45 +03:00
Blacksmith
32b336274e Clear out release files in preparation for next release 2018-10-15 15:47:03 +00:00
Blacksmith
b11830a12a [maven-release-plugin] prepare for next development iteration 2018-10-15 15:42:16 +00:00
Blacksmith
a8fbfce51f [maven-release-plugin] prepare release forge-1.6.17 forge-1.6.17 2018-10-15 15:42:12 +00:00
Blacksmith
87f10ea742 Update README.txt for release 2018-10-15 15:40:05 +00:00
Michael Kamensky
c5769cbcc7 Merge branch 'update-brawl-GRN' into 'master' 
Brawl GRN format update

See merge request core-developers/forge!1015
 2018-10-15 14:27:44 +00:00
Michael Kamensky
ece1ae6747 Merge branch 'update-standard-banlist-GRN' into 'master' 
Update standard ban list

See merge request core-developers/forge!1016
 2018-10-15 14:27:40 +00:00
pfirpfel
8780b18ca5 Update standard ban list: remove cards that rotated 2018-10-15 13:32:19 +02:00
pfirpfel
361927c100 Brawl GRN format update 2018-10-15 13:27:47 +02:00
Michael Kamensky
31f2063226 Merge branch 'patch-2' into 'master' 
Update teferi_hero_of_dominaria.txt

See merge request core-developers/forge!1014
 2018-10-15 04:26:42 +00:00
Sol
308c6bbccf Update forge-gui/res/cardsfolder/t/teferi_hero_of_dominaria.txt 2018-10-15 02:02:07 +00:00
Sol
1955b453fd Update teferi_hero_of_dominaria.txt 2018-10-14 12:30:13 +00:00
swordshine
3143751550 Merge branch 'fix-lich' into 'master' 
Fix Underrealm Lich revealing a card going to hand.

See merge request core-developers/forge!1013
 2018-10-14 08:15:38 +00:00
Agetian
8653338f56 - Underrealm Lich should not reveal a card going to hand. 2018-10-14 08:57:06 +03:00
Michael Kamensky
7142751ef3 Merge branch 'add-jump-start-to-flashback' into 'master' 
Improve flashback zone display

See merge request core-developers/forge!1012
 2018-10-14 03:40:12 +00:00
Chris H
3889c75e32 Improve flashback zone display 2018-10-13 19:14:19 -04:00
Sol
35372b53b8 Merge branch 'patch-1' into 'master' 
Update sworn_companions.txt

See merge request core-developers/forge!1011
 2018-10-13 19:47:24 +00:00
Sol
279c7ed97b Update sworn_companions.txt 2018-10-13 19:46:12 +00:00
Michael Kamensky
6535deee48 Merge branch 'master' into 'master' 
Temporarily revert a change in CostPartMana to avoid breaking Convoke, Improvise, and Delve.

Closes #740

See merge request core-developers/forge!1010
 2018-10-13 18:04:18 +00:00
Agetian
46c764d5ab - Temporarily revert a change in CostPartMana to avoid breaking Convoke, Improvise, and Delve. 2018-10-13 21:02:47 +03:00
Michael Kamensky
e6a348fa31 Merge branch 'master' into 'master' 
Fixed Sumala Woodshaper not revealing cards to the controller (the "look at" part of DB Dig).

See merge request core-developers/forge!1009
 2018-10-13 17:14:06 +00:00
Agetian
c952354f56 - Fixed Sumala Woodshaper not revealing cards to the controller (the "look at" part of DB Dig). 2018-10-13 20:13:25 +03:00