external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,661 Commits 31 Branches 187 Tags
fe2c3c90d62aab8f44478e9968182c97a13fbd77
Commit Graph

3783 Commits

Author SHA1 Message Date
CCTV-1
313112a488 translate some text 2020-01-25 10:50:39 +08:00
CCTV-1
07c4e1b57b fix translation lable typo,incorrect use of symbolLookup. 2020-01-24 09:41:38 +08:00
CCTV-1
dda23854a3 translate some text 2020-01-22 12:51:44 +08:00
CCTV-1
625673e167 Merge remote-tracking branch 'upstream/master' 2020-01-22 12:48:25 +08:00
Hans Mackowiak
30f80f75df Remove no cycling rule 2020-01-22 03:43:53 +00:00
CCTV-1
74ed34b6dd Merge remote-tracking branch 'upstream/master' 2020-01-21 17:22:43 +08:00
Hans Mackowiak
311eaa70e3 Use EnumSet in Conditions/Restrictions 2020-01-21 06:37:53 +00:00
CCTV-1
f2f984aff6 Merge remote-tracking branch 'upstream/master' 2020-01-19 10:03:19 +08:00
Blacksmith
b8101d0387 [maven-release-plugin] prepare for next development iteration 2020-01-19 00:54:23 +00:00
Blacksmith
55d02d5adb [maven-release-plugin] prepare release forge-1.6.32 2020-01-19 00:54:18 +00:00
CCTV-1
b9dbc14a4d Merge remote-tracking branch 'upstream/master' 2020-01-18 14:06:31 +08:00
CCTV-1
72d16f0636 translate some text 2020-01-18 14:05:40 +08:00
friarsol
ca1504b839 Fix missing translation 2020-01-17 23:20:39 -05:00
swordshine
5b8e709271 Merge branch 'mana-duplication' into 'master' 
Maybe fix Mana Reflection mana duplication

See merge request core-developers/forge!2430
 2020-01-17 13:09:25 +00:00
Tim Mocny
1f90f4e470 THB 1/15 tweaks and such 2020-01-16 21:49:58 +00:00
swordshine
5a64b6c297 Merge branch 'master' into 'master' 
translate some text

See merge request core-developers/forge!2436
 2020-01-15 13:42:36 +00:00
Hans Mackowiak
6e4908acc3 Update StaticAbilityContinuous: for Gain Abilities, only set OriginalHost if it wasn't already set 2020-01-15 13:37:15 +00:00
CCTV-1
33564d023c translate some text 2020-01-15 20:20:25 +08:00
swordshine
c3a95a07a1 Add Heliod's Punishment 2020-01-15 18:39:46 +08:00
swordshine
333a96bb8d Merge branch 'patch' into 'master' 
Add Hateful Eidolon

See merge request core-developers/forge!2431
 2020-01-15 08:30:41 +00:00
swordshine
1aadc7991f Add Hateful Eidolon 2020-01-15 13:12:47 +08:00
friarsol
6529e02c83 Maybe fix Mana Reflection mana duplication 2020-01-14 21:12:47 -05:00
CCTV-1
1a55341dd3 translate some text 2020-01-14 13:18:43 +08:00
swordshine
fd347c10d0 Merge branch 'savant' into 'master' 
Arcane Savant and friends

See merge request core-developers/forge!2396
 2020-01-14 01:12:09 +00:00
klaxnek
cf7a7177c7 Translate PermanentCreatureEffect Card Name 2020-01-12 16:37:06 +01:00
Adam Pantel
b35ea79083 Whirlwind Denial 2020-01-11 18:20:30 -05:00
Adam Pantel
f401c3900c Arcane Savant and friends 2020-01-10 18:29:44 -05:00
swordshine
9a0ba159b0 Merge branch 'master' into 'master' 
Override getParamOrDefault for the sake of WrappedAbility, fixes Verdurous Gearhulk AI

Closes #1227

See merge request core-developers/forge!2403
 2020-01-10 07:47:33 +00:00
Agetian
9ed01ebbb6 - Override getParamOrDefault for the sake of WrappedAbility, fixes Verdurous Gearhulk AI allocation. 2020-01-10 10:27:30 +03:00
swordshine
0e7af09df3 Add Eidolon of Obstruction 2020-01-10 15:13:26 +08:00
Hans Mackowiak
96d3ddf9b5 Resolve "Exception with DFCs and copy effects" 2020-01-09 15:32:20 +00:00
swordshine
dc0ddf542b Merge branch 'temp' into 'master' 
Clear controller when leaving battlefield/stack

Closes #619

See merge request core-developers/forge!2397
 2020-01-09 14:21:36 +00:00
swordshine
910fef3ecd Fix Nykthos 2020-01-09 20:59:20 +08:00
Adam Pantel
65288905d0 Clear controller when leaving battlefield/stack 2020-01-08 20:12:13 -05:00
swordshine
71787b7059 Merge branch 'patch' into 'master' 
Add Altar of the Pantheon

See merge request core-developers/forge!2392
 2020-01-08 10:43:50 +00:00
Hans Mackowiak
896eb79d2c CardFactoryUtil: add Escaped Modifier 2020-01-08 10:18:56 +00:00
Blacksmith
1b130ab157 [maven-release-plugin] prepare for next development iteration 2020-01-08 02:20:36 +00:00
Blacksmith
74005529f5 [maven-release-plugin] prepare release forge-1.6.31 2020-01-08 02:20:31 +00:00
swordshine
4366db1acc Add Altar of the Pantheon 2020-01-08 08:42:28 +08:00
Adam Pantel
a27f69b1c5 DigUntil does nothing on 0 2020-01-07 10:06:33 -05:00
Sol
41844ee7e3 Extracting two bugfixes from Lerio's MR 2020-01-07 04:12:37 +00:00
Hans Mackowiak
adcd86e7d7 Dash: fix keyword after AlternativeCost 2020-01-06 06:35:14 +00:00
swordshine
3d59f1832c Allure of the Unknown should reveal first 2020-01-05 14:09:33 +08:00
Michael Kamensky
bdde3520f4 Merge branch 'patch' into 'master' 
Update Haktos the Unscarred

See merge request core-developers/forge!2371
 2020-01-04 10:21:08 +00:00
Adam Pantel
0536ebf1c8 Fix more localization mismatches 2020-01-03 23:21:13 -05:00
swordshine
fb176abe05 Update Haktos the Unscarred 2020-01-04 12:08:52 +08:00
Adam Pantel
d70e699c81 Mismatched localization labels 2020-01-03 16:06:01 -05:00
CCTV-1
0caf41f1d6 convert indentation to spaces 2020-01-03 13:33:59 +08:00
CCTV-1
817aadb995 Merge remote-tracking branch 'upstream/master' 2020-01-03 13:32:15 +08:00
Hans Mackowiak
b2fcc6e743 Refactor Escape and AlternativeCost 2020-01-03 04:40:09 +00:00