external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,580 Commits 31 Branches 187 Tags
f15e051cc4071ee0d0aaecf485a8f558ca2ff7b4
Commit Graph

42580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter
f15e051cc4 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into mobiletranslation06 
 Conflicts:
	forge-gui/res/languages/zh-CN.properties
 2019-09-23 12:45:49 +02:00
Peter
0a57342524 Updated chinese translation 2019-09-23 12:39:13 +02:00
swordshine
76a0fc6fa2 Merge branch 'ELD_Draft' into 'master' 
Preparation for ELD draft format

See merge request core-developers/forge!2155
 2019-09-23 10:17:18 +00:00
swordshine
ed42c4a675 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!2156
 2019-09-23 10:14:42 +00:00
Peter
8d3b00c3f2 Mobile: More Translations 
Added ¡ and ¿ needed to Spanish
 2019-09-23 11:53:03 +02:00
CCTV-1
9e778d9a69 update simplified chinese translation 2019-09-23 17:21:47 +08:00
austinio7116
08129db336 Preparation for ELD draft format 2019-09-23 06:18:32 +01:00
Hans Mackowiak
2aec48a64b Merge branch 'patch-4' into 'master' 
Fix getController()

See merge request core-developers/forge!2142
 2019-09-23 04:53:14 +00:00
Anthony Calosa
7d5b8d2d5e Fix getController() 
(Donate -> Illusions of Grandeur -> bounce Illusions of Grandeur, or Path to Exile taken by any player via Act of Treason etc... the effect should be on the controller)
 2019-09-23 04:53:14 +00:00
swordshine
b12db3b9a8 Merge branch 'mobiletranslation05' into 'master' 
Mobile: Translated more strings and Views

See merge request core-developers/forge!2154
 2019-09-23 01:10:57 +00:00
swordshine
00c3010319 Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2153
 2019-09-23 00:51:43 +00:00
Peter
4bf837701f Mobile: Translated more strings and Views 
Fixed duplicated Catalog label
Fixed Stack label not found
 2019-09-22 20:49:55 +02:00
swordshine
9a32e2885a Add Fires of Invention 2019-09-22 22:59:10 +08:00
swordshine
3ca2b8c4be Add Happily Ever After 2019-09-22 22:17:21 +08:00
swordshine
9f3316502a Fix The Cauldron of Eternity 2019-09-22 20:32:43 +08:00
swordshine
79d03abe8c Add Drown in the Loch 2019-09-22 20:26:08 +08:00
swordshine
d850a6685a Merge branch 'patch' into 'master' 
ELD cards

See merge request core-developers/forge!2152
 2019-09-22 11:41:33 +00:00
swordshine
8fdf76a4e5 Add three cards 2019-09-22 13:13:33 +08:00
swordshine
4988a80cdd Add Giant Opportunity 2019-09-22 12:45:34 +08:00
swordshine
bc6ab4d0b9 Merge branch 'patch' into 'master' 
Fix Kaalia of the Vast

See merge request core-developers/forge!2151
 2019-09-21 14:44:51 +00:00
swordshine
0f4c1960d9 More fixes 2019-09-21 22:27:21 +08:00
swordshine
bcccf726b5 Fix Kaalia of the Vast 2019-09-21 22:10:57 +08:00
swordshine
455c83a963 Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2149
 2019-09-21 14:10:23 +00:00
swordshine
facb93945e Add Deathless Knight 2019-09-21 19:17:28 +08:00
swordshine
70398d8d15 Add two cards 2019-09-21 18:12:11 +08:00
swordshine
23d72cb59a More ELD cards 2019-09-21 16:24:34 +08:00
swordshine
695d2324ac Fix Lovestruck Beast 2019-09-21 16:12:32 +08:00
swordshine
661c3d96aa More ELD cards 2019-09-21 16:07:28 +08:00
swordshine
18cd8d68e1 More ELD cards 2019-09-21 12:47:36 +08:00
swordshine
3887dc1440 Add Beanstalk Giant 2019-09-21 11:53:29 +08:00
swordshine
f938366d40 Update ELD edition file 2019-09-21 10:38:57 +08:00
swordshine
fc1d5543d8 More ELD cards 2019-09-21 10:21:52 +08:00
swordshine
94e81531db Merge branch 'master' into 'master' 
More ELD cards

See merge request core-developers/forge!2148
 2019-09-21 01:33:27 +00:00
swordshine
dd7b419806 Merge branch 'push_down_toStringMap_part_2' into 'master' 
Push down to string map part 2

See merge request core-developers/forge!2134
 2019-09-21 01:33:20 +00:00
swordshine
2e04ae0549 Merge branch '1144-eld-adventure-spells' into 'master' 
Resolve "ELD: Adventure Spells"

Closes #1144

See merge request core-developers/forge!2102
 2019-09-21 01:17:08 +00:00
Hanmac
9b3fa50dee Adventure: If an object becomes a copy of an object that has an Adventure, the copy also has an Adventure. 2019-09-20 18:03:06 +02:00
Hanmac
b7b1c3a437 As Foretold: fix the cmc check 2019-09-20 16:20:35 +02:00
Hanmac
1e7ed84522 CardProperty: add AdventureCard for Creature with adventure 2019-09-20 15:54:47 +02:00
Hans Mackowiak
feaa01f70c ELD: Merchant of the Vale 2019-09-20 15:54:47 +02:00
Hans Mackowiak
7a504bf3c8 Update CardFactoryUtil.java 2019-09-20 15:54:47 +02:00
Hans Mackowiak
d9dd31b263 ELD: Animating Faerie 2019-09-20 15:54:47 +02:00
Hans Mackowiak
94805103da Spell: add extra check for Adventure cards 2019-09-20 15:54:47 +02:00
Hanmac
378d0e26ab Adventure: add - separator 2019-09-20 15:54:47 +02:00
Hanmac
0c354e8a70 Adventure: add Logic to cast as Spell 2019-09-20 15:54:47 +02:00
swordshine
cb18c22649 Add Hushbringer 2019-09-20 21:29:36 +08:00
swordshine
96c840eebe More ELD cards 2019-09-20 20:54:16 +08:00
swordshine
e07504a55e Update 3 scripts 2019-09-20 20:37:06 +08:00
swordshine
dfeeff6e3b More ELD cards 2019-09-20 20:29:41 +08:00
swordshine
bc882e6593 Merge branch 'german-translation' into 'master' 
german translation update & fix some typos

See merge request core-developers/forge!2147
 2019-09-20 08:16:12 +00:00
Dagin Svezek
904822eb78 german translation update & fix some typos 2019-09-20 05:37:35 +00:00