external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,463 Commits 32 Branches 187 Tags
bb10e6e604ee5b173f99349ef20ca26249ade9a1
Commit Graph

10470 Commits

Author SHA1 Message Date
churrufli
da5b1a18bf Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-27 20:13:44 +01:00
churrufli
a546339ea2 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-27 19:58:25 +01:00
churrufli
558442a6bb Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-27 17:35:06 +01:00
Michael Kamensky
16c9cc7eac Merge branch 'lq-image-download-tweak' into 'master' 
Update server download URL parsing

Closes #858

See merge request core-developers/forge!1421
 2019-02-27 12:22:14 +00:00
Michael Kamensky
71da9ca610 Merge branch 'patch-1' into 'master' 
Remove unnecessary RNA token image URLs

See merge request core-developers/forge!1427
 2019-02-27 12:21:46 +00:00
Michael Kamensky
79ce24b682 Merge branch 'patch' into 'master' 
Update Lavinia, Azorius Renegade for multiplayer

See merge request core-developers/forge!1422
 2019-02-27 12:21:17 +00:00
Michael Kamensky
0662dc5964 Merge branch 'set-max-size-for-image-cache' into 'master' 
Set max size for image cache (Reduces memory footprint)

See merge request core-developers/forge!1423
 2019-02-27 12:19:52 +00:00
Sol
e7f7e62cbf Remove unnecessary RNA token image URLs 2019-02-27 02:48:05 +00:00
swordshine
8d3fe2088a Merge branch 'gk2' into 'master' 
GK2 edition

See merge request core-developers/forge!1424
 2019-02-27 01:21:20 +00:00
swordshine
a87adfaf16 Merge branch 'type-grouping-patch' into 'master' 
Sort Sorcery // Instant as an instant in Type sort.

See merge request core-developers/forge!1426
 2019-02-27 01:20:45 +00:00
Rob Schnautz
143a254189 Sort Sorcery // Instant as an instant in Type sort. 2019-02-27 00:31:05 +00:00
Rob Schnautz
25a3367d74 Let's do the Wurm Warp 2019-02-27 00:01:12 +00:00
Rob Schnautz
400c7d366b any time 2019-02-26 23:58:20 +00:00
Rob Schnautz
43cdbbdbee Trample reminder text. 2019-02-26 23:48:51 +00:00
Rob Schnautz
bddba4c6dc Update trample reminder text 2019-02-26 23:43:14 +00:00
Rob Schnautz
4ab79ce75d fix date 2019-02-26 22:57:38 +00:00
Rob Schnautz
42eba01a76 GK2 edition 2019-02-26 22:45:23 +00:00
tehdiplomat
f0efc2089c Ad LRU to ImageCache to get a handle on memory bloat 2019-02-26 15:40:36 -05:00
swordshine
f38ec8d4a0 - Update Lavinia, Azorius Renegade for multiplayer 2019-02-26 16:59:25 +08:00
Tim Scott
17df25399f Use pattern matching to capture directory listing from the server URL string. 
Add fallback to PNG for download if JPG is not found.

Correct quest-opponent-icons.txt.  Space reference should be "%20".
 2019-02-24 17:22:28 -06:00
churrufli
405e07a78e Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-25 00:02:01 +01:00
churrufli
6ef9f4bc7b undo translation in AddBasicLandsDialog.java 2019-02-23 19:47:52 +01:00
churrufli
73749f28da Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-22 17:23:31 +01:00
churrufli
f7134f0a54 Translating hard-coded text to res en-US.properties 2019-02-22 16:53:57 +01:00
swordshine
919aecd9a1 Merge branch 'timmermac-sting-easy' into 'master' 
Add Sting deck by timmermac

See merge request core-developers/forge!1345
 2019-02-22 12:39:32 +00:00
Churrufli
da9373a0df Merge branch 'master' into 'master' 
Translating hard-coded text to res en-US.properties

See merge request core-developers/forge!1410
 2019-02-22 06:51:50 +00:00
Churrufli
3631b8be75 Update en-US.properties 2019-02-22 06:46:32 +00:00
KrazyTheFox
1416b668a3 Add Sting deck description 2019-02-21 21:12:38 -05:00
Krazy
893cc3b08f Merge branch 'eclipse-cleanup' into 'master' 
Eclipse cleanup

Closes #844

See merge request core-developers/forge!1399
 2019-02-22 02:09:05 +00:00
churrufli
25858f625b Translating hard-coded text to res en-US.properties 2019-02-22 00:30:48 +01:00
Michael Kamensky
1244ac89fd Merge branch 'master' into 'master' 
Added puzzle PS_RNA4 - Possibility Storm: Ravnica Allegiance 04

See merge request core-developers/forge!1407
 2019-02-20 05:01:53 +00:00
Agetian
facf22c092 - Added puzzle PS_RNA4. 2019-02-20 08:01:02 +03:00
Michael Kamensky
d1895ef97e Merge branch 'patch-1' into 'master' 
Add m19 gift pack to Standard formats

See merge request core-developers/forge!1403
 2019-02-20 03:50:43 +00:00
Sol
2f466834f9 Update QuestController.java 2019-02-20 01:56:13 +00:00
Sol
3282ccf6b1 Fix NPE in QuestController.java 2019-02-20 01:49:59 +00:00
Sol
27651313a7 Update Modern.txt 2019-02-19 00:33:57 +00:00
Sol
9d762b5740 Merge branch 'master' into 'master' 
Update consecrate_consume.txt

See merge request core-developers/forge!1404
 2019-02-19 00:32:24 +00:00
T.J. Tillman
e51afbc21c Update consecrate_consume.txt 2019-02-19 00:06:21 +00:00
Sol
b544718140 Merge branch 'master' into 'master' 
Use PeekAndReveal for Sunbird's Invocation

Closes #841

See merge request core-developers/forge!1395
 2019-02-18 16:47:42 +00:00
Sol
dc4b65593e Update Brawl.txt 2019-02-18 16:00:23 +00:00
Sol
5f5b34478d Update Standard.txt 2019-02-18 15:59:02 +00:00
Sol
64e7aa902b Update M19 Gift Pack.txt 2019-02-18 15:58:32 +00:00
Blacksmith
e4d41001db Clear out release files in preparation for next release 2019-02-17 19:56:08 +00:00
Blacksmith
4ed17e1e16 [maven-release-plugin] prepare for next development iteration 2019-02-17 19:51:17 +00:00
Blacksmith
a70136c98c [maven-release-plugin] prepare release forge-1.6.21 2019-02-17 19:51:13 +00:00
Blacksmith
e42f3f3369 Update README.txt for release 2019-02-17 19:48:59 +00:00
Hans Mackowiak
3fab25ab8c Merge branch 'master' into 'master' 
Clarify Target Prompts for Applied Biomancy and Swirling Torrent

See merge request core-developers/forge!1398
 2019-02-16 13:13:09 +00:00
T.J. Tillman
452a47e573 Update swirling_torrent.txt 2019-02-16 02:42:27 +00:00
T.J. Tillman
d002ddaa5d Update applied_biomancy.txt 2019-02-16 02:42:06 +00:00
Sol
95a69f053b Merge branch 'deckconstructionrules-null-check' into 'master' 
Add null check for getDeckConstructionRules()

See merge request core-developers/forge!1397
 2019-02-16 01:37:35 +00:00