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
43,884 Commits 32 Branches 187 Tags
4e5853e29a22e5d12d51a982fe592bd4d8ef9f8c
Commit Graph

43884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
318d919111 More upcoming THB 2019-12-12 14:03:12 -05:00
Northmoc
c753a1c875 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 
 Conflicts:
	forge-gui/res/cardsfolder/upcoming/moss_viper.txt
 2019-12-11 10:57:43 -05:00
Northmoc
e304337a62 More upcoming THB 2019-12-11 10:33:10 -05:00
Michael Kamensky
3768ca8f77 Merge branch 'master' into 'master' 
Added puzzle PS_ELD8 - Possibility Storm - Throne of Eldraine 08

See merge request core-developers/forge!2322
 2019-12-10 17:26:30 +00:00
Agetian
12f76827e9 - Added puzzle PS_ELD8. 2019-12-10 19:51:41 +03:00
Michael Kamensky
3c5f464039 Merge branch 'master' into 'master' 
Set ExiledWith for the LKI copies (fixes Colfenor's Plans)

Closes #1215

See merge request core-developers/forge!2321
 2019-12-10 16:43:41 +00:00
Agetian
9f2304b1a5 - Set ExiledWith for the LKI copies (fixes Colfenor's Plans) 2019-12-10 19:35:10 +03:00
swordshine
8a0ba4f27a Merge branch 'patch-5' into 'master' 
Update iroas_god_of_victory.txt

See merge request core-developers/forge!2320
 2019-12-09 03:55:24 +00:00
Sol
43dc6d35c0 Update iroas_god_of_victory.txt 2019-12-09 03:49:50 +00:00
swordshine
d04c593adc Merge branch 'patch' into 'master' 
Update scripts

See merge request core-developers/forge!2319
 2019-12-07 10:10:53 +00:00
swordshine
4e1b7e886f Update scripts 2019-12-07 17:52:59 +08:00
Michael Kamensky
8544e805bb Merge branch 'master' into 'master' 
More THB: Funeral Rites

See merge request core-developers/forge!2318
 2019-12-07 04:34:06 +00:00
klaxnek
7e18cbca97 Undo changes 2019-12-06 20:12:05 +01:00
klaxnek
f5734bb626 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-12-06 18:29:31 +01:00
Northmoc
08823bd94c Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-12-06 09:24:35 -05:00
Northmoc
04cfc7a81f Furious Rise, some "heroics" and a token (THB leaks) 2019-12-06 09:20:42 -05:00
Northmoc
91656fd7c0 Furious Rise, some "heroics" and a token (THB leaks) 2019-12-06 09:16:17 -05:00
Northmoc
e984bd5708 Funeral Rites 2019-12-05 20:05:45 -05:00
swordshine
eb0c0f3f84 Merge branch 'master' into 'master' 
More THB cards and a relevant token

See merge request core-developers/forge!2316
 2019-12-05 01:28:05 +00:00
klaxnek
acac0ee5e2 Add personal changes 2019-12-04 23:09:03 +01:00
Michael Kamensky
19b7daeaee Merge branch 'master' into 'master' 
Added puzzle PS_ELD7 - Possibility Storm - Throne of Eldraine 07

See merge request core-developers/forge!2317
 2019-12-04 16:55:30 +00:00
Agetian
c933e722f3 - Added puzzle PS_ELD7. 2019-12-04 19:03:54 +03:00
Northmoc
1536377eb2 Alirios, Enraptured -putting his token in the right spot 2019-12-04 10:27:38 -05:00
Northmoc
a11640cbc9 Alirios, Enraptured and his token 2019-12-03 23:47:03 -05:00
Northmoc
d51fe454b5 Eidolon of Philosophy and Flicker of Fate THB leaks 2019-12-03 19:36:27 -05:00
Michael Kamensky
550fd937f1 Merge branch 'master' into 'master' 
THB leaked cards (in upcoming folder!)

See merge request core-developers/forge!2315
 2019-12-03 18:57:41 +00:00
Northmoc
bd1add4d47 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-12-03 13:34:02 -05:00
Tim Mocny
944eb38002 dreamstalker_manticore.txt THB leak 2019-12-03 12:31:07 -05:00
Tim Mocny
ddf481f4fd THB leak (upcoming) 2019-12-03 11:35:58 -05:00
Tim Mocny
2e7d84b58f Upload New File 2019-12-03 14:13:31 +00:00
Tim Mocny
db853cb5ba Upload New File 2019-12-03 14:12:46 +00:00
Tim Mocny
d0d652b427 Upload New File 2019-12-03 14:12:15 +00:00
Tim Mocny
231e048936 Upload New File 2019-12-03 14:11:47 +00:00
Tim Mocny
e95982a043 Upload New File 2019-12-03 14:10:52 +00:00
Tim Mocny
1a7b2677f3 Upload New File 2019-12-03 14:10:24 +00:00
Tim Mocny
b77bb5768d Upload New File 2019-12-03 14:09:52 +00:00
Tim Mocny
2be9fc65b1 Delete moss_viper.txt 2019-12-03 14:08:41 +00:00
Tim Mocny
c4e04fe003 Delete hydras_growth.txt 2019-12-03 14:07:56 +00:00
Tim Mocny
964e06b8cb Delete dreamshaper_shaman.txt 2019-12-03 14:07:26 +00:00
Tim Mocny
78d6847db5 Delete dreadful_apathy.txt 2019-12-03 14:07:11 +00:00
Tim Mocny
25d6ce6763 Delete aspect_of_lamprey.txt 2019-12-03 14:06:39 +00:00
Tim Mocny
fc26b5d3a9 Delete arena_trickster.txt 2019-12-03 14:06:04 +00:00
Tim Mocny
9e4dc631e8 Delete ashioks_erasure.txt 2019-12-03 14:04:49 +00:00
Tim Mocny
b6bff03ad3 Upload New File 2019-12-03 02:24:52 +00:00
Tim Mocny
394a365497 Upload New File 2019-12-03 02:24:12 +00:00
Tim Mocny
d5de2f387b Upload New File 2019-12-03 02:20:54 +00:00
Tim Mocny
5106de0abe Upload New File 2019-12-03 02:20:23 +00:00
Tim Mocny
510c81d251 Upload New File 2019-12-03 02:19:28 +00:00
Tim Mocny
b4437636a8 Upload New File 2019-12-03 02:18:38 +00:00
Tim Mocny
cc64997832 Upload New File 2019-12-03 02:17:39 +00:00