external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,401 Commits 31 Branches 187 Tags
c87a2bff23dba6a53f81c324ffdb19c48aea5f24
Commit Graph

7363 Commits

Author SHA1 Message Date
Chris H
c87a2bff23 Manually update Pom files and release changes to be ready for next release 2018-01-15 13:57:46 -05:00
Agetian
b58a561863 - Updating CHANGES.txt. 2018-01-15 16:02:01 +03:00
Agetian
06c13804a4 Merge branch 'master' of git.cardforge.org:core-developers/forge into rix-cards 2018-01-15 16:01:13 +03:00
Agetian
bf8e88f76b - Added Golden Guardian [RIX]. Will eventually need to be reworked to use AF DelayedTrigger. 2018-01-15 16:00:52 +03:00
Sol
f76428b668 Merge branch 'two-explores' into 'master' 
Fix Jadelight Ranger description

See merge request core-developers/forge!100
 2018-01-15 04:31:41 +00:00
Chris H
f9f83660f5 Fix Jadelight Ranger description 2018-01-14 17:55:24 -05:00
Michael Kamensky
ddfd97c395 Merge branch 'upcoming_rix2' into 'master' 
Added token image for rekindling phoenix

See merge request core-developers/forge!99
 2018-01-14 16:49:32 +00:00
austinio7116
f658ba29c9 Added token image for rekindling phoenix 2018-01-14 15:12:39 +00:00
Sol
57cf22af43 Merge branch 'newcard' into 'master' 
Fixed a card

See merge request core-developers/forge!98
 2018-01-14 14:48:51 +00:00
swordshine
2ac3829b6f - Wormfang Drake should not exile an opponent's creature 2018-01-14 18:07:14 +08:00
swordshine
29e3cf4a79 - Fixed the the plural merfolk in the typelist 2018-01-14 18:03:11 +08:00
austinio7116
02b8d39791 Ability description fix for Kumena 2018-01-14 09:58:32 +00:00
austinio7116
7663df024c Added Induced Amnesia - cleaned up unneeded define 2018-01-14 00:32:17 +00:00
austinio7116
ec72e9f7d7 Added Induced Amnesia 2018-01-14 00:20:55 +00:00
Hanmac
7c10272d03 Fix: added References to tilonallis_summoner 2018-01-13 22:17:36 +01:00
Hanmac
3c3c64a11a AtEOT: add AtEOTCondition & AtEOTDesc 2018-01-13 17:11:23 +01:00
Chris H
4a799cf45f Migrate RIX to appropriate card letter folders 2018-01-13 10:21:23 -05:00
Sol
16acf2d46c Merge branch 'rix-cards' into 'master' 
Added Flood of Recollection [RIX]

See merge request core-developers/forge!91
 2018-01-13 14:35:16 +00:00
swordshine
826f37e4b9 - Added Cherished Hatchling 2018-01-13 22:15:55 +08:00
swordshine
39654e498c - Updated more scripts 2018-01-13 21:56:05 +08:00
swordshine
e3432ced3c - More oracle updates 2018-01-13 21:25:20 +08:00
swordshine
917ae1daab - Updated the Dinosaur type for a few cards 2018-01-13 21:15:50 +08:00
swordshine
999f990870 - Added Awakened Amalgam by Marek14 2018-01-13 16:39:37 +08:00
swordshine
e050a62b0c - Added Slaughter the Strong 2018-01-13 16:21:59 +08:00
Agetian
1cd278afcf - Added Flood of Recollection [RIX]. 2018-01-13 09:05:09 +03:00
Michael Kamensky
4c29790b6c Merge branch 'patch-5' into 'master' 
Sort Conspiracy before Eldrazi

See merge request core-developers/forge!85
 2018-01-13 04:50:30 +00:00
Sol
3efc4807cf Merge branch 'RIX' into 'master' 
- Added cost for Timestream Navigator

See merge request core-developers/forge!90
 2018-01-13 03:24:17 +00:00
swordshine
a3b543cdd2 - Removed the extra line in the script 2018-01-13 11:04:12 +08:00
swordshine
a12eedfa93 - Added cost for Timestream Navigator 2018-01-13 10:30:20 +08:00
Rob Schnautz
7b5d2fc053 Fix DECK_EDITION tooltip 2018-01-12 22:42:51 +00:00
austinio7116
090a47b17f Corrected issues in editions file and rankings for RIX 2018-01-12 18:08:46 +00:00
Rob Schnautz
4c6aa708c1 Sort Conspiracy before Eldrazi 2018-01-12 17:51:14 +00:00
Michael Kamensky
c1870b4ef8 Merge branch 'patch-5' into 'master' 
Fix slowness issue when removing cards from decks.

See merge request core-developers/forge!84
 2018-01-12 16:17:03 +00:00
Sol
dab7d5030e Merge branch 'rix-planeswalker-decks' into 'master' 
- Added RIX planeswalker decks as quest mode precons.

See merge request core-developers/forge!82
 2018-01-12 15:40:23 +00:00
Sol
120a314a96 Merge branch 'assorted-fixes' into 'master' 
- Renamed a couple cards in the RIX definition file.

See merge request core-developers/forge!80
 2018-01-12 14:35:58 +00:00
Rob Schnautz
bd4305dd13 Fix slowness issue when removing cards from decks. 2018-01-12 14:24:40 +00:00
swordshine
95122ffcf8 - Updated Commune with Dinosaurs 2018-01-12 16:24:04 +08:00
Agetian
49f789c404 - Removed a couple empty lines. 2018-01-12 10:43:04 +03:00
Agetian
9cf447d422 - Added RIX planeswalker decks as quest mode precons. 2018-01-12 10:36:47 +03:00
Agetian
1dc10b57c6 - Surge of Memories -> Flood of Recollection 2018-01-12 09:58:33 +03:00
Michael Kamensky
fa0fc14c25 Revert "Merge branch 'patch-4' into 'master'" 
This reverts merge request !77
 2018-01-12 06:46:57 +00:00
Agetian
22cdb7e721 Merge branch 'master' of git.cardforge.org:core-developers/forge into assorted-fixes 2018-01-12 09:32:07 +03:00
Agetian
d215657641 - Renamed Shrine Altisaur to Temple Altisaur in the definition file 2018-01-12 09:30:21 +03:00
Sol
36d6342e77 Merge branch 'fix-reckless-rage-desc' into 'master' 
Fix reckless rage description

See merge request core-developers/forge!78
 2018-01-12 04:04:48 +00:00
Chris H
ea8f990172 Fix reckless rage description 2018-01-11 23:02:19 -05:00
Rob Schnautz
8003ade509 Fix slowness when removing a card from a deck by only getting the key once instead of twice. 2018-01-12 03:51:36 +00:00
maustin
ae042d98f4 Merge remote-tracking branch 'origin/upcoming_rix2' into upcoming_rix2 2018-01-11 21:53:07 +00:00
austinio7116
649faa3371 Fixed Zacama's IsCast property 2018-01-11 21:52:35 +00:00
Michael Kamensky
dce2ebbafb Update release_to_the_wind.txt (spell description fix). 2018-01-11 20:24:07 +00:00
austinio7116
c80d703acf Added Release to the Wind (RIX) 2018-01-11 19:54:27 +00:00