35754 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Rob Schnautz	df33b9388f	Update ColumnDef.java	2018-01-12 05:41:09 +00:00
Rob Schnautz	ac53f16098	Sort Conspiracies before Eldrazi	2018-01-12 05:39:12 +00: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
Sol	72e7822616	Merge branch 'patch-4' into 'master' ... Fix slowness when removing a card from a deck by only getting the key once instead of twice. See merge request core-developers/forge!77	2018-01-12 04:04:29 +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
Sol	3795232b2c	Merge branch 'assorted-fixes' into 'master' ... - Fix capitalization in the name of The City's Blessing token. See merge request core-developers/forge!74	2018-01-12 02:20:45 +00:00
Sol	dda26098f4	Merge branch 'upcoming_rix2' into 'master' ... Fixed Zacama's IsCast Property See merge request core-developers/forge!76	2018-01-12 02:19:29 +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	cea0c3f628	Merge branch 'upcoming_rix2' into 'master' ... Added Release to the Wind (RIX) See merge request core-developers/forge!75	2018-01-11 20:25:06 +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
Agetian	f0418b8d2a	- Name the Blessing token as it is named on the physical card.	2018-01-11 18:42:27 +03:00
Agetian	f363ae0f1e	- Fix capitalization in the name of The City's Blessing token.	2018-01-11 18:31:49 +03:00
Michael Kamensky	24d3801316	Merge branch 'upcoming_rix2' into 'master' ... Added Tilonallis Summoning with Swordshine's fixes See merge request core-developers/forge!73	2018-01-11 15:29:45 +00:00
Sol	2a3f2c6dbd	Merge branch 'fix-cantequip-crash' into 'master' ... - Fix a crash when trying to equip a creature with an equipment that has CantEquip (e.g. O-Naginata) See merge request core-developers/forge!70	2018-01-11 14:54:21 +00:00
Michael Kamensky	318a6e2924	Merge branch 'RIX' into 'master' ... - Fixed a few cards See merge request core-developers/forge!72	2018-01-11 14:15:07 +00:00
austinio7116	800311fed8	Added Tilonallis Summoning with Swordshine's fixes	2018-01-11 14:05:17 +00:00
swordshine	e49d45bf4f	- Update more scripts	2018-01-11 21:59:33 +08:00
swordshine	356bd9c635	- Fixed P/T of two cards	2018-01-11 21:07:53 +08:00
Michael Kamensky	b400ea6d33	Merge branch 'upcoming_rix2' into 'master' ... Corrected creature type of Forefunner of the Heralds See merge request core-developers/forge!71	2018-01-11 11:28:34 +00:00