Commit Graph

9604 Commits

Author SHA1 Message Date
austinio7116
7ac6bccf9f Fixed issues with Aminatou's Augury 2018-08-07 06:44:34 +01:00
Michael Kamensky
49db080e06 Merge branch 'aminatousaugury' into 'master'
Aminatous Augury

See merge request core-developers/forge!841
2018-08-07 04:10:48 +00:00
Agetian
09bfe089de - Added puzzles PS_M193 and PS_M194. 2018-08-07 07:00:45 +03:00
kms70847
347707f74e Resolves https://git.cardforge.org/core-developers/forge/issues/641.
Updates the card file syntax for Replicate so it uses a colon, just like Kicker, Entwine, etc.
2018-08-06 21:43:18 -04:00
austinio7116
03d66b9ea1 Aminatous Augury 2018-08-06 19:35:18 +01:00
Michael Kamensky
a9ade92946 Merge branch 'master' into 'master'
M19 and C18 Planeswalker/Alt Wincon achievements by Marek.

See merge request core-developers/forge!840
2018-08-06 16:45:46 +00:00
Agetian
3c4b81f2ac - M19 alt wincon achievement (initial commit). 2018-08-06 19:40:27 +03:00
Agetian
5c0e70aa36 - C18 planeswalker achievements (initial commit). 2018-08-06 15:45:17 +03:00
Agetian
d5248e2d26 - M19 planeswalker achievements: initial commit. 2018-08-06 15:43:29 +03:00
Hanmac
a98fdff570 Estrid the Masked: fixed Untap Effect 2018-08-06 13:25:09 +02:00
Hanmac
08d984a699 TokenEffect: Add AttachTo effect for Estrid 2018-08-05 22:08:15 +02:00
Anthony Calosa
bb34d29a44 Update prismatic_lace.txt 2018-08-05 12:33:23 +00:00
austinio7116
e59cd59ea2 Updated Commander card-based deck generation data to include recent sets and data from other sources. 2018-08-05 05:55:54 +01:00
Michael Kamensky
1d02087128 Merge branch 'morec18newcards' into 'master'
Nesting Dragon update to trigger names to avoid text changing effects with "dragon"

See merge request core-developers/forge!835
2018-08-05 03:27:15 +00:00
austinio7116
c106d856c0 Nesting Dragon update to trigger names to avoid text changing effects with "dragon" 2018-08-04 22:17:57 +01:00
Michael Kamensky
8d2668257c Merge branch 'morec18newcards' into 'master'
Tuvasa, the Sunlit and Nesting Dragon

See merge request core-developers/forge!830
2018-08-04 12:05:27 +00:00
NikolayHD
7c32151d1f Fix incorrect file path when extracting downloaded .zip 2018-08-04 14:50:41 +03:00
Michael Kamensky
0a2dd16d83 - As much as I like Paths.get, it breaks Android. Reverting. 2018-08-04 13:01:37 +03:00
austinio7116
9815161bb0 Nesting Dragon (thanks inb63) 2018-08-04 10:39:46 +01:00
austinio7116
3d422076ad Tuvasa, the Sunlit 2018-08-04 10:34:22 +01:00
Michael Kamensky
ddb99c4cb5 Merge branch 'morec18newcards' into 'master'
Loyal Apprentice, Sower of Discord and updated Lieutenant filters

See merge request core-developers/forge!826
2018-08-04 05:51:49 +00:00
austinio7116
9127dc5d1e Fix for loyal unicorn's damage prevention 2018-08-04 06:36:12 +01:00
austinio7116
0876633990 Sower of Discord 2018-08-04 06:33:56 +01:00
Michael Kamensky
943e9836cd Merge branch 'quest_load_resilience' into 'master'
Improve resilience for Quest Loading

See merge request core-developers/forge!827
2018-08-04 04:50:30 +00:00
Agetian
600e8629f4 - Fixed a missing comment symbol in forge.profile.properties.example. 2018-08-04 07:47:26 +03:00
tehdiplomat
ab77d97e59 Improve resilience for Quest Loading 2018-08-03 21:19:14 -04:00
Blacksmith
c05464585e Clear out release files in preparation for next release 2018-08-03 22:14:41 +00:00
Blacksmith
87c0ab7b7d [maven-release-plugin] prepare for next development iteration 2018-08-03 22:08:24 +00:00
Blacksmith
aea32aee62 [maven-release-plugin] prepare release forge-1.6.14 2018-08-03 22:08:21 +00:00
Blacksmith
6e8e28a615 Update README.txt for release 2018-08-03 22:06:33 +00:00
Blacksmith
9ca15ae635 Clear out release files in preparation for next release 2018-08-03 21:20:17 +00:00
Blacksmith
bb5102e311 [maven-release-plugin] prepare for next development iteration 2018-08-03 21:13:58 +00:00
Blacksmith
4d9b98bc94 [maven-release-plugin] prepare release forge-1.6.13 2018-08-03 21:13:55 +00:00
Blacksmith
1e1640b292 Update README.txt for release 2018-08-03 21:11:47 +00:00
austinio7116
1b47dce3e0 Consistent filter for Lieutenant cards to include Card.IsCommander+YouOwn+YouCtrl 2018-08-03 18:55:45 +01:00
austinio7116
6a340b9004 Loyal Apprentice 2018-08-03 07:25:47 +01:00
Michael Kamensky
e250077839 Merge branch 'fix_unzipped_path' into 'master'
Fix incorrect file path when extracting downloaded .zip

See merge request core-developers/forge!809
2018-08-03 04:05:27 +00:00
Agetian
604010fbce - Fixed trigger description on Octopus Umbra. 2018-08-03 07:03:57 +03:00
Michael Kamensky
4b4bab6086 Merge branch 'morec18newcards' into 'master'
Nylea's Collossus, Octopus Umbra and Varina

See merge request core-developers/forge!823
2018-08-03 04:02:41 +00:00
Michael Kamensky
7c38b97540 Merge branch 'brudiclad3' into 'master'
Brudiclad, Telchor Engineer

See merge request core-developers/forge!822
2018-08-03 03:57:20 +00:00
austinio7116
1fa768bb81 Nylea's Colossus 2018-08-03 00:01:16 +01:00
austinio7116
eda2ba4adf A couple of scripts uploaded by Cryptix and inb63 2018-08-02 23:19:08 +01:00
Michael Kamensky
001a51a070 Merge branch 'master' into 'master'
Fix for Quest Reward Multiplier Issue

See merge request core-developers/forge!820
2018-08-02 03:50:49 +00:00
austinio7116
ac4d476ab3 Merge branch 'c18editions2' into 'master'
C18 scripts created by the ForgeScribe neural network that look correct on…

See merge request core-developers/forge!806
2018-08-01 22:12:09 +00:00
austinio7116
c41c3bd161 Brudiclad, Telchor Engineer
(cherry picked from commit 9b83f7b)
2018-08-01 22:03:01 +01:00
Wario
e2e0123d2b Update QuestWinLoseController.java 2018-08-01 20:37:58 +00:00
Michael Kamensky
7e0ebef57b Merge branch 'commanderNinjutsu' into 'master'
CardFactoryUtil: add Commander Ninjutsu variant

See merge request core-developers/forge!819
2018-08-01 16:47:50 +00:00
Agetian
653cbd7345 - Added a missing reference to Gyrus, Waker of Corpses. 2018-08-01 19:43:21 +03:00
Michael Kamensky
3e980f30aa Merge branch 'c18fixedcards' into 'master'
Gyrus, Waker of Corpses and Retrofitter Foundry

See merge request core-developers/forge!817
2018-08-01 16:42:36 +00:00
Wario
33d7596cac Update QuestWinLoseController.java 2018-08-01 12:25:11 +00:00