external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,640 Commits 31 Branches 187 Tags
d36651a779e001d9b68b51a45fb598c8161952a3
Commit Graph

40640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
austinio7116
d36651a779 Final RNA deckgen data 
(cherry picked from commit f526f96)
 2019-04-04 07:21:18 +01:00
Michael Kamensky
245a95b336 Merge branch 'master' into 'master' 
PS_RNAR: Added some cards to the human library.

See merge request core-developers/forge!1500
 2019-04-04 05:01:51 +00:00
Agetian
22e2a42807 - PS_RNAR: Added some cards to the human library. 2019-04-04 08:01:13 +03:00
Michael Kamensky
1c1d91c149 Merge branch 'master' into 'master' 
Added puzzle PS_RNAR (Possibility Storm - Ravnica Allegiance Preview Card Puzzle Revisited)

See merge request core-developers/forge!1499
 2019-04-04 04:52:31 +00:00
Agetian
a8a2d7bbeb - Added puzzle PS_RNAR (Possibility Storm - Ravnica Allegiance Preview Card Puzzle Revisited) 2019-04-04 07:51:57 +03:00
Michael Kamensky
02064e05df Merge branch 'patch' into 'master' 
Fixed All Hallow's Eve

See merge request core-developers/forge!1497
 2019-04-04 03:57:49 +00:00
Michael Kamensky
c00add6050 Merge branch 'clear-image-cache' into 'master' 
Token Viewer 1.0 + Clear Image Cache button

Closes #876

See merge request core-developers/forge!1496
 2019-04-04 03:57:39 +00:00
Sol
04dfdac71c Merge branch 'patch-1' into 'master' 
Update infernal_reckoning.txt

See merge request core-developers/forge!1498
 2019-04-04 02:35:01 +00:00
Sol
8d4566af3e Update infernal_reckoning.txt 2019-04-04 01:56:37 +00:00
swordshine
3cc3ef0b13 Fixed All Hallow's Eve 2019-04-02 16:03:59 +08:00
Chris H
f5a4360339 TokenViewer doesn't crash now.. Just need it to display 2019-03-31 22:48:57 -04:00
Michael Kamensky
cb8ad8221e Merge branch 'master' into 'master' 
Support for three color lands' sounds

See merge request core-developers/forge!1494
 2019-03-31 05:25:19 +00:00
Chris H
a050f7c26c TokenViewer Deck "editor" 2019-03-30 22:09:16 -04:00
Alessandro Coli
0a709a6cf4 Support for three color lands 2019-03-30 15:59:44 +01:00
Alessandro Coli
a9124743ef Support for three color lands 2019-03-30 15:58:49 +01:00
Sol
42f6cdbb46 Merge branch 'patch-1' into 'master' 
Fix elf knight token name

See merge request core-developers/forge!1493
 2019-03-30 01:14:35 +00:00
Sol
17e7883996 Fix elf knight token name 2019-03-30 01:13:14 +00:00
Michael Kamensky
91a8d1761a Merge branch 'fix-spellskite' into 'master' 
Spellskite should grab its magnet target from DefinedMagnet (fixes Spellskite not working)

Closes #925

See merge request core-developers/forge!1492
 2019-03-28 16:41:32 +00:00
Agetian
9c39d159e9 - Spellskite should grab its magnet target from DefinedMagnet. 2019-03-28 17:34:53 +03:00
Michael Kamensky
59abbfd51f Merge branch 'patch-1' into 'master' 
Update assemble_the_rank_and_vile.txt

Closes #917

See merge request core-developers/forge!1491
 2019-03-28 11:28:33 +00:00
Hans Mackowiak
953de7d6f1 Update assemble_the_rank_and_vile.txt 2019-03-28 11:28:33 +00:00
Rob Schnautz
51e9e2b692 Merge branch 'patch-1' into 'master' 
Update token-images.txt

See merge request core-developers/forge!1490
 2019-03-27 13:24:54 +00:00
Hans Mackowiak
9447561d53 Update token-images.txt 2019-03-27 13:24:54 +00:00
Michael Kamensky
928f903028 Merge branch 'master' into 'master' 
Added puzzle PS_RNA9 (Possibility Storm - Ravnica Allegiance 09).

See merge request core-developers/forge!1489
 2019-03-27 06:12:42 +00:00
Agetian
bc4826ed77 - Added puzzle PS_RNA9. 2019-03-27 09:11:49 +03:00
Michael Kamensky
88a674240d Merge branch 'tokenscripts' into 'master' 
resolve #926

Closes #926

See merge request core-developers/forge!1488
 2019-03-27 04:02:20 +00:00
Michael Kamensky
1d4b9d68ed Merge branch 'deck-descriptions' into 'master' 
Deck descriptions

See merge request core-developers/forge!1487
 2019-03-27 04:02:08 +00:00
Adam Pantel
c1dfbc04e4 Fix missing type in tokenscripts 2019-03-26 19:22:27 -04:00
Rob Schnautz
fa80df585f Merge branch 'master' into 'deck-descriptions' 2019-03-26 15:33:03 +00:00
Rob Schnautz
2cfbf8df30 back matter 2019-03-26 15:25:45 +00:00
Rob Schnautz
ad6e9acbe1 back matter 2019-03-25 21:44:42 +00:00
Rob Schnautz
3f450e813d back matter 2019-03-25 19:51:29 +00:00
Rob Schnautz
9c62a0e2ab back matter 2019-03-25 19:37:08 +00:00
Rob Schnautz
5dc883e932 back matter 2019-03-25 18:52:34 +00:00
Rob Schnautz
94ab23f09f back matter 2019-03-25 18:46:25 +00:00
Rob Schnautz
286e5721f7 back matter 2019-03-25 18:35:24 +00:00
Rob Schnautz
eb5899ac15 back matter 2019-03-25 18:24:47 +00:00
Rob Schnautz
a1fca42b57 back matter 2019-03-25 17:53:53 +00:00
Rob Schnautz
16314d5ebc Merge branch 'MED-patch' into 'master' 
Mythic Edition patch

See merge request core-developers/forge!1485
 2019-03-25 16:53:08 +00:00
Rob Schnautz
d5fe891440 Fix MCI code and card numbers (MPS points to Kaladesh Inventions) 2019-03-25 16:50:28 +00:00
Rob Schnautz
13d99e209b Fix MCI code (MPS points to Kaladesh Inventions) 2019-03-25 16:48:26 +00:00
Rob Schnautz
9946155c71 Merge branch 'cherry-pick-ff7def5f' into 'master' 
Amonkhet Invocations patch

See merge request core-developers/forge!1484
 2019-03-25 16:43:49 +00:00
Rob Schnautz
6a6ca3f403 Fix MCI code (MPS points to Kaladesh Inventions) 
(cherry picked from commit ff7def5f5afd7a07991caf2549f5fb92f9a85186)
 2019-03-25 16:42:43 +00:00
Michael Kamensky
1c0d95b930 Merge branch 'draft-bugs' into 'master' 
Resolve #921, #922

Closes #921 and #922

See merge request core-developers/forge!1478
 2019-03-25 03:53:44 +00:00
Michael Kamensky
271b940723 Merge branch 'quest-pets-redux' into 'master' 
Always create an empty map for tokenNormalized

See merge request core-developers/forge!1483
 2019-03-25 03:52:52 +00:00
Michael Kamensky
8eecccff0b Merge branch 'aura-corner-case' into 'master' 
resolve #923

Closes #923

See merge request core-developers/forge!1479
 2019-03-25 03:52:43 +00:00
Adam Pantel
18f32a1657 Fix draft duplicates bug 2019-03-24 21:32:48 -04:00
Adam Pantel
5cd5020595 Fix draft bots running conspiracies 2019-03-24 21:32:14 -04:00
Chris H
5aee626661 Always create an empty map for tokenNormalized 2019-03-24 21:00:31 -04:00
Rob Schnautz
f2dae53c11 back matter, premium cards 2019-03-24 19:53:36 +00:00