35728 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
austinio7116	ec72e9f7d7	Added Induced Amnesia	2018-01-14 00:20:55 +00:00
austinio7116	f95ada602c	Added Induced Amnesia	2018-01-14 00:19:04 +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
Michael Kamensky	722c16e925	Merge branch 'rix-rename' into 'master' ... Migrate RIX to appropriate card letter folders See merge request core-developers/forge!95	2018-01-13 15:45:18 +00: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
Sol	413c14a1dc	Merge branch 'RIX' into 'master' ... Rix See merge request core-developers/forge!94	2018-01-13 14:34:57 +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
Michael Kamensky	a09086bfc2	Merge branch 'RIX' into 'master' ... Updated the chooseCard effect for Slaughter the Strong See merge request core-developers/forge!93	2018-01-13 13:08:20 +00:00
swordshine	2ac38e6639	- one more update	2018-01-13 20:02:59 +08:00
swordshine	3dc54790cc	- Updated the chooseCard effect for Slaughter the Strong	2018-01-13 19:50:14 +08:00
Agetian	ce780c5175	Merge branch 'master' of git.cardforge.org:core-developers/forge	2018-01-13 12:25:02 +03:00
Michael Kamensky	35a76b4a43	Merge branch 'RIX' into 'master' ... - Added Slaughter the Strong See merge request core-developers/forge!92	2018-01-13 09:22:02 +00: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
Agetian	208089a5cd	Merge remote-tracking branch 'upstream/master'	2018-01-13 08:16:02 +03:00
Michael Kamensky	0c66c256b3	Merge branch 'sort-deck-folders' into 'master' ... Sort the folder list in the deck editor See merge request core-developers/forge!88	2018-01-13 05:13:59 +00:00
Agetian	66e8154243	Merge remote-tracking branch 'upstream/master'	2018-01-13 08:04:48 +03:00
Michael Kamensky	ff4db64802	Merge branch 'patch-6' into 'master' ... Patch for Issue #8, coded by @friarsol See merge request core-developers/forge!86	2018-01-13 04:51:09 +00: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
Sol	a97125d733	Merge branch 'patch-7' into 'master' ... Fix DECK_EDITION tooltip See merge request core-developers/forge!89	2018-01-13 00:21:43 +00:00
Rob Schnautz	7b5d2fc053	Fix DECK_EDITION tooltip	2018-01-12 22:42:51 +00:00
Jamin W. Collins	0e587c5b3a	Sort the folder list in the deck editor ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-01-12 12:09:27 -08:00
Michael Kamensky	6ea9a07a3d	Merge branch 'upcoming_rix2' into 'master' ... Corrected issues in editions file and rankings for RIX See merge request core-developers/forge!87	2018-01-12 18:32:24 +00:00
austinio7116	090a47b17f	Corrected issues in editions file and rankings for RIX	2018-01-12 18:08:46 +00:00
Rob Schnautz	f79b326010	Patch for Issue #8, coded by @friarsol	2018-01-12 18:06:02 +00:00
Rob Schnautz	4c6aa708c1	Sort Conspiracy before Eldrazi	2018-01-12 17:51:14 +00:00
Agetian	7ac66a298b	Merge branch 'schnautzr/forge-patch-4'	2018-01-12 19:57:48 +03:00
Rob Schnautz	9e1baa9521	Add more spaces (non-functional)	2018-01-12 16:43:23 +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
Rob Schnautz	a9b068c89e	fixed those spaces.	2018-01-12 16:13:07 +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
Michael Kamensky	d8b7214a2b	Merge branch 'RIX' into 'master' ... - Updated Commune with Dinosaurs See merge request core-developers/forge!83	2018-01-12 08:25:55 +00:00
swordshine	95122ffcf8	- Updated Commune with Dinosaurs	2018-01-12 16:24:04 +08:00
Agetian	3b1b0bc92f	- Update Commune with Dinosaurs to work with any Dinosaur card instead of just Creature.Dinosaur.	2018-01-12 11:20:58 +03: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	3d11422191	Merge branch 'revert-72e78226' into 'master' ... Revert "Merge branch 'patch-4' into 'master'" See merge request core-developers/forge!81	2018-01-12 06:48:03 +00:00
Michael Kamensky	fa0fc14c25	Revert "Merge branch 'patch-4' into 'master'" ... This reverts merge request !77	2018-01-12 06:46:57 +00:00