external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,905 Commits 31 Branches 187 Tags
bd7da33e779cbc1c35939bb7368e302b10a4918c
Commit Graph

37905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hanmac
2e196fc41b CardTaits: make cardtraits inside LKI has the same id's as the in the original object\nReplaceMoved now works with Blood Moon and Blood Sun 2018-02-10 18:50:22 +01:00
Jamin W. Collins
844a7b5d76 Disambiguate class name in error StorageReader errors 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-10 10:28:39 -07:00
Michael Kamensky
ce343ffcdb Merge branch 'mobile-release' into 'master' 
- Preparing Forge for Android publish v1.6.6.004 [incremental/bugfixes]

See merge request core-developers/forge!195
 2018-02-10 16:17:12 +00:00
Agetian
25972aaa29 - Preparing Forge for Android publish v1.6.6.004 [incremental/bugfixes] 2018-02-10 19:11:33 +03:00
Seravy
0fe8c1f121 AI will activate ~DestroyAll~ abilities during combat if it would lose the game, or it would take too much damage (Nevinnyrral's Disk, Pernicious Deed) 2018-02-10 13:30:22 +01:00
austinio7116
cb37cf0889 Refresh of Frontier Cube to include RIX 2018-02-10 09:36:49 +00:00
Michael Kamensky
b5721a7e36 Merge branch 'OkkFix' into 'master' 
Had wrong card name in Oracle text

See merge request core-developers/forge!192
 2018-02-10 03:35:54 +00:00
Michael Kamensky
93b40ad867 Merge branch 'descriptions' into 'master' 
Descriptions

See merge request core-developers/forge!193
 2018-02-10 03:35:40 +00:00
Rob Schnautz
a3e5e40385 description, premium Spearbreaker Behemoth 2018-02-10 01:17:19 +00:00
Rob Schnautz
e13ed6f46e description, premium Paleoloth 2018-02-10 01:15:18 +00:00
Rob Schnautz
65dffbbe3a description 2018-02-10 01:12:15 +00:00
Rob Schnautz
16dafc9c57 description 
(cherry picked from commit 909ee41e066207a9c3e4d943fd190e229765be66)
 2018-02-10 01:06:35 +00:00
Rob Schnautz
bcd2f95e4d description 
(cherry picked from commit f274dbe74e3fcda7e97c40df996b8b1533c04673)
 2018-02-10 01:06:16 +00:00
Rob Schnautz
51ae7fee7e description 2018-02-10 00:55:19 +00:00
Rob Schnautz
2eb276f995 description, premium Treasury Thrull 2018-02-10 00:51:03 +00:00
Rob Schnautz
6a98f9947a description 2018-02-10 00:48:28 +00:00
Rob Schnautz
66cbd1a30e description 2018-02-10 00:45:17 +00:00
Rob Schnautz
c8d1b56d9e description, premium Phyrexian Hydra 2018-02-10 00:44:44 +00:00
Rob Schnautz
457ce2958e description, premium Doomwake Giant 2018-02-10 00:44:01 +00:00
Rob Schnautz
b7b6d5672e description, premium Conundrum Sphinx 2018-02-10 00:15:14 +00:00
Rob Schnautz
7dac6197e3 premium Djinn of Wishes 2018-02-10 00:12:03 +00:00
Rob Schnautz
ea40b439ee description, premium Resolute Archangel 2018-02-10 00:05:32 +00:00
Rob Schnautz
7061f7f26a premium Flameblast Dragon 2018-02-10 00:00:30 +00:00
Rob Schnautz
de1342a5d7 description, premium Jace's Mindseeker 2018-02-09 23:57:44 +00:00
Rob Schnautz
2f976dbeb3 description, premium Hellkite Charger 2018-02-09 23:51:56 +00:00
Seravy
e37e242bae Had wrong card name in Oracle text 2018-02-10 00:13:48 +01:00
Michael Kamensky
78c676e858 Merge branch 'assorted-fixes' into 'master' 
- Updating CHANGES.txt.

See merge request core-developers/forge!191
 2018-02-09 18:31:48 +00:00
Agetian
9e74ef9e37 - Updating CHANGES.txt. 2018-02-09 21:30:37 +03:00
Michael Kamensky
1740be22ae Merge branch 'InvasionWorld' into 'master' 
Invasion world

See merge request core-developers/forge!189
 2018-02-09 18:23:10 +00:00
Hanmac
35c499a074 Crafty Cutpurse: make it use a Control Layer for the Token Create Effect 2018-02-09 17:07:48 +01:00
Seravy
048093522a Revert "Fixes compile/run bugs in IntelliJ" 
This reverts commit 36917c0d18

(cherry picked from commit 1cf40f45ad9f39f98dd3232d0ae01e9c0c31329d)
 2018-02-09 10:34:39 +00:00
Seravy
66c696bfec rotam ->rotation amount. 2018-02-09 11:26:04 +01:00
Seravy
5dc5082c4e Added MAX to option variable name. 2018-02-09 10:58:07 +01:00
Seravy
42f79630e6 Deleted commented parts as suggested 2018-02-09 10:43:43 +01:00
Seravy
f8ccf0a91e Adding suggested simplification 2018-02-09 10:25:35 +01:00
Seravy
b924c1a80c W -> w 2018-02-09 10:04:59 +01:00
Michael Kamensky
42a6340a95 Merge branch 'assorted-fixes' into 'master' 
- Updating CHANGES.txt.

See merge request core-developers/forge!188
 2018-02-09 05:20:46 +00:00
Agetian
8b2b1d453d - Updating CHANGES.txt. 2018-02-09 08:19:35 +03:00
Michael Kamensky
e70207fbac Merge branch 'assorted-fixes' into 'master' 
- Updating CHANGES.txt.

See merge request core-developers/forge!186
 2018-02-09 05:19:02 +00:00
Agetian
846db416ec - Updating CHANGES.txt. 2018-02-09 08:18:33 +03:00
Michael Kamensky
84288aafe9 Merge branch 'patch-5' into 'master' 
Duel Decks: Elves vs. Inventors

See merge request core-developers/forge!185
 2018-02-09 04:48:36 +00:00
Rob Schnautz
d2d4318659 Add new file 2018-02-09 04:17:32 +00:00
Michael Kamensky
324c3000a0 Merge branch 'assorted-fixes' into 'master' 
- File name fix, updating CHANGES.txt.

See merge request core-developers/forge!184
 2018-02-09 03:48:11 +00:00
Agetian
fc6d1d2ab8 - Filename fix. 
- Updating CHANGES.txt.
 2018-02-09 06:47:28 +03:00
Michael Kamensky
7fb12fa5b3 Merge branch 'mtgo-editions' into 'master' 
Five editions from MTGO

See merge request core-developers/forge!182
 2018-02-09 03:37:07 +00:00
Michael Kamensky
791e53a935 Merge branch 'amonkhet' into 'master' 
Amonkhet quest world

See merge request core-developers/forge!181
 2018-02-09 03:36:24 +00:00
Sol
3a705c3e5f Merge branch 'patch-5' into 'master' 
comment out boosters until later to prevent corruption of quest files when shop…

See merge request core-developers/forge!183
 2018-02-09 01:58:20 +00:00
Rob Schnautz
ca61291995 comment out boosters until later to prevent corruption of quest files when shop tries to generate a booster 2018-02-09 01:45:57 +00:00
Rob Schnautz
a875557000 Commander Theme Decks 2018-02-09 01:38:33 +00:00
Rob Schnautz
517590883c Duel Decks: Mirrodin Pure vs. New Phyrexia 2018-02-09 01:19:35 +00:00