external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,974 Commits 32 Branches 187 Tags
a5f4375ff27f2894ff94dd19a6c35cbef390b51a
Commit Graph

16315 Commits

Author SHA1 Message Date
Northmoc
903ead9e91 star_pupil.txt 2021-03-26 19:47:33 -04:00
Northmoc
bacbd8baf3 confront_the_past.txt 2021-03-26 19:36:07 -04:00
Northmoc
65f4724f87 add Lesson type 2021-03-26 16:56:21 -04:00
Northmoc
afafe46221 pest_summoning.txt and token 2021-03-26 16:55:56 -04:00
Northmoc
ff220113af storm_kiln_artist.txt (script by ?) 2021-03-26 15:28:00 -04:00
Adam Pantel
81c2c482cd Treasure Keeper, Kianne, Plargg 2021-03-26 15:25:10 -04:00
Northmoc
d25ff61f22 dragonsguard_elite.txt (script by ?) 2021-03-26 15:12:08 -04:00
Northmoc
0f71efd1e9 willowdusk_essence_seer.txt 2021-03-26 14:39:01 -04:00
Northmoc
fe6a5a700a add optional Charm prompt 2021-03-26 12:43:34 -04:00
Northmoc
87a994b8ce shadrix_silverquill.txt v2 2021-03-26 12:42:52 -04:00
Hythonia
3f06553604 Merge remote-tracking branch 'origin/master' 2021-03-26 16:34:34 +01:00
Northmoc
e9f765a216 wb_2_1_inkling_flying.txt 2021-03-26 11:29:28 -04:00
Northmoc
532e65f3a0 shadrix_silverquill.txt 2021-03-26 11:29:08 -04:00
Hythonia
b038044347 STX: One Ward, two card 2021-03-26 15:01:59 +01:00
Michael Kamensky
6d00a26530 - Basic logic for Professor Onyx. 2021-03-26 14:38:10 +03:00
Michael Kamensky
a4d28b13ef Merge branch 'AIopponent' into 'master' 
AI Multiplayer improvements

See merge request core-developers/forge!4239
 2021-03-26 10:58:22 +00:00
Bug Hunter
fd01dc1bb1 AI Multiplayer improvements 2021-03-26 10:58:22 +00:00
Michael Kamensky
fa72d3d0de Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4269
 2021-03-26 10:57:20 +00:00
Michael Kamensky
f935f57d23 Merge branch 'add_camouflage' into 'master' 
Add Camouflage

See merge request core-developers/forge!4268
 2021-03-26 10:57:03 +00:00
Michael Kamensky
fbf1e855ad Merge branch 'snarls' into 'master' 
STX rare land cycle

See merge request core-developers/forge!4263
 2021-03-26 10:56:25 +00:00
CCTV-1
d15d27defb update simplified chinese translation 2021-03-26 18:40:04 +08:00
Hythonia
7952bdcb48 Revert "ManaEffect rework" 
This reverts commit 9db11ce6
 2021-03-26 11:37:57 +01:00
Hythonia
dfdf3160d3 Merge remote-tracking branch 'origin/master' 2021-03-26 11:20:36 +01:00
Lyu Zong-Hong
ce4f12179c Add Camouflage 2021-03-26 13:05:04 +09:00
Northmoc
2a410b9099 snarls 2021-03-25 20:14:22 -04:00
Northmoc
3ccc7c41e7 professor_onyx.txt v2 2021-03-25 18:13:33 -04:00
Northmoc
973464f1c4 professor_onyx.txt 2021-03-25 10:56:40 -04:00
Hythonia
9db11ce690 ManaEffect rework 2021-03-24 20:14:41 +01:00
Anthony Calosa
93d8fd43f3 Merge remote-tracking branch 'core/master' 2021-03-24 14:34:38 +08:00
Anthony Calosa
f67b46255a Fix ProtocolMethod 2021-03-24 14:34:23 +08:00
Michael Kamensky
9d44b11e95 Merge branch 'insubordination' into 'master' 
Insubordination: Fix trigger

See merge request core-developers/forge!4252
 2021-03-24 03:42:28 +00:00
Anthony Calosa
c3dd154ef5 Fix duplicate dependencies 
-xstream greater than 1.4.9 needs higher android.jar (would remove support for devices lower than Android 8 unless we use the java 7 variant), latest guava and maybe other higher libs needs desugaring for android to work.
 2021-03-24 10:22:43 +08:00
tool4EvEr
2b24539e0e Fix trigger 2021-03-23 21:53:02 +01:00
Hans Mackowiak
9ca66c213d Merge branch 'cleanup' into 'master' 
Code cleanup

See merge request core-developers/forge!4248
 2021-03-23 17:17:37 +00:00
Michael Kamensky
bbb561314a Merge branch 'master' into 'master' 
Added 3 Kaldheim puzzles.

See merge request core-developers/forge!4250
 2021-03-23 06:37:06 +00:00
Michael Kamensky
16b56fffbe - Added 3 Kaldheim puzzles. 2021-03-23 09:36:21 +03:00
Michael Kamensky
9961604ca5 Merge branch 'master' into 'master' 
Kasmina, Enigma Sage

See merge request core-developers/forge!4246
 2021-03-23 03:59:39 +00:00
Anthony Calosa
6a0345f6d4 Merge branch 'twosat-master-patch-44168' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4247
 2021-03-23 03:46:26 +00:00
Anthony Calosa
9b1521ee64 Update M15_Prerelease_Challenge.txt 2021-03-23 03:45:09 +00:00
tool4EvEr
dda5af5d4d Code cleanup 2021-03-22 21:54:09 +01:00
Andreas Bendel
c90cd7f525 Update de-DE.properties 
five new strings :)
 2021-03-22 20:36:04 +00:00
Michael Kamensky
89dfdff05b Merge branch 'raging_river' into 'master' 
Add Raging River

See merge request core-developers/forge!4244
 2021-03-22 19:05:32 +00:00
Michael Kamensky
e74eab8d50 Merge branch 'DifferentCardNames' into 'master' 
Fix DifferentCardNames counting

See merge request core-developers/forge!4245
 2021-03-22 19:04:32 +00:00
Michael Kamensky
d7a3357bbf Merge branch 'fix_fantasy_block_npe' into 'master' 
Fix NPE for Fantasy Block Draft when there is only one meta-set.

See merge request core-developers/forge!4242
 2021-03-22 19:03:58 +00:00
Hythonia
e29fca980d Kasmina, Enigma Sage 2021-03-22 19:23:09 +01:00
tool4EvEr
4c57436e9f Update rulings 2021-03-22 19:01:49 +01:00
Lyu Zong-Hong
214a35ba5e Add Raging River 2021-03-23 02:18:01 +09:00
Anthony Calosa
e4a0ce9165 [Mobile] Preferred Art Options 2021-03-22 21:46:39 +08:00
Lyu Zong-Hong
76d0a9b41e Fix NPE for FantasyBlock when there is only one meta-set. 2021-03-22 18:46:05 +09:00
Michael Kamensky
17352940ab Merge branch 'Williams-master-patch-78185' into 'master' 
Fix TSR

See merge request core-developers/forge!4241
 2021-03-21 19:37:00 +00:00