external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,079 Commits 31 Branches 187 Tags
2cda73ad77ee07c3115cca08901bbedd169985d1
Commit Graph

8459 Commits

Author SHA1 Message Date
swordshine
356bd9c635 - Fixed P/T of two cards 2018-01-11 21:07:53 +08:00
austinio7116
7352f9094a Corrected creature type of Forefunner of the Heralds 2018-01-11 10:06:36 +00:00
Agetian
c90e8bd356 - CantEquip: modify the card scripts such that they use a colon delimiter. 2018-01-11 09:41:38 +03:00
swordshine
fe8ec70159 - Added The Immortal Sun 2018-01-11 11:09:08 +08:00
Chris H
804d47df7b Fix RIX edition missing rarity 2018-01-10 21:07:52 -05:00
austinio7116
b3727f6821 Update azor_the_lawbringer.txt 2018-01-10 23:06:45 +00:00
austinio7116
bc538da8ea Added Azor, the Lawbringer (RIX) 2018-01-10 22:53:30 +00:00
Agetian
465e25adff - Updating CHANGES.txt (some clarifications). 2018-01-10 19:50:09 +03:00
Agetian
809fc513ea Merge remote-tracking branch 'upstream/master' 2018-01-10 19:38:45 +03:00
Agetian
ea101baf0d - Updating CHANGES.txt. 2018-01-10 19:37:28 +03:00
Michael Kamensky
19f88d6e6d Merge branch 'RIX' into 'master' 
Fixed a few cards and added Peace Talks

See merge request core-developers/forge!64
 2018-01-10 15:17:59 +00:00
Agetian
de2e3fc070 Merge branch 'Marek14/forge-master' 2018-01-10 18:03:36 +03:00
Agetian
9b85293349 - Fix a couple cards. 2018-01-10 17:48:33 +03:00
swordshine
bee34c064b - Removed a param in the previous commit 2018-01-10 22:09:26 +08:00
swordshine
7ba64ce136 - Added Peack Talks 2018-01-10 22:06:57 +08:00
swordshine
d80d2c5cda - Fixed Touch of Vitae 2018-01-10 20:12:17 +08:00
Marek Čtrnáct
2419b93682 Update expel_from_orazca.txt 2018-01-10 11:48:03 +00:00
Marek Čtrnáct
740b3f0c49 Update expel_from_orazca.txt 2018-01-10 11:47:35 +00:00
Marek Čtrnáct
0925379a6d Add new file 2018-01-10 11:45:54 +00:00
Marek Čtrnáct
0c89087579 Add new file 2018-01-10 11:40:39 +00:00
Marek Čtrnáct
0565082309 Add new file 2018-01-10 11:37:11 +00:00
Marek Čtrnáct
cf7fcb07a1 Update kumenas_awakening.txt 2018-01-10 11:32:18 +00:00
Marek Čtrnáct
ad99d21cdf Add new file 2018-01-10 11:31:33 +00:00
Marek Čtrnáct
3ad4da4f49 Add new file 2018-01-10 11:27:47 +00:00
Marek Čtrnáct
62238e0f81 Update deadeye_brawler.txt 2018-01-10 11:21:09 +00:00
Marek Čtrnáct
2928f157fa Update mausoleum_harpy.txt 2018-01-10 11:21:03 +00:00
Marek Čtrnáct
cacb64b2ca Update twilight_prophet.txt 2018-01-10 11:20:55 +00:00
Marek Čtrnáct
1f65c4723d Update resplendent_griffin.txt 2018-01-10 11:20:42 +00:00
Marek Čtrnáct
c2d4923706 Add new file 2018-01-10 10:20:51 +00:00
Marek Čtrnáct
5ea07389b4 Add new file 2018-01-10 10:16:01 +00:00
Marek Čtrnáct
8c56bb51ed Update slippery_scoundrel.txt 2018-01-10 10:15:11 +00:00
Marek Čtrnáct
7c8057dbc6 Add new file 2018-01-10 10:14:42 +00:00
Marek Čtrnáct
841b9ae668 Add new file 2018-01-10 10:13:13 +00:00
Marek Čtrnáct
f847a39eaa Add new file 2018-01-10 10:11:59 +00:00
Marek Čtrnáct
f2eafb99d4 Update dusk_charger.txt 2018-01-10 10:10:03 +00:00
Marek Čtrnáct
847becccfe Add new file 2018-01-10 10:09:54 +00:00
Marek Čtrnáct
536c2483b0 Add new file 2018-01-10 10:08:02 +00:00
Marek Čtrnáct
af80228bcd Add new file 2018-01-10 10:05:21 +00:00
Marek Čtrnáct
334b086efb Add new file 2018-01-10 09:49:22 +00:00
Marek Čtrnáct
bddce9872f Add new file 2018-01-10 09:41:15 +00:00
Marek Čtrnáct
3d4e544573 Add new file 2018-01-10 09:37:53 +00:00
Marek Čtrnáct
7fe68a1c4a Add new file 2018-01-10 09:34:28 +00:00
Marek Čtrnáct
8693b6ce81 Add new file 2018-01-10 09:25:18 +00:00
Marek Čtrnáct
200b3f7092 Add new file 2018-01-10 09:20:42 +00:00
Marek Čtrnáct
69afbde352 Add new file 2018-01-10 09:09:03 +00:00
Hanmac
052fb65518 CardFactoryUtil: add Ascend for non-permanent Spell 2018-01-10 07:30:03 +01:00
swordshine
c2ec6978c4 - Added a planeswalker subtype: Angrath 2018-01-10 14:21:41 +08:00
Michael Kamensky
941e25d7a7 Merge branch 'RIX' into 'master' 
- Added Sphinx's Decree

See merge request core-developers/forge!62
 2018-01-09 15:28:08 +00:00
swordshine
0bddb07ba0 - Added Sphinx's Decree 2018-01-09 22:11:45 +08:00
Agetian
9757fdb16b Merge branch 'Marek14/forge-master' 
# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/canal_monitor.txt
#	forge-gui/res/cardsfolder/upcoming/daring_buccaneer.txt
#	forge-gui/res/cardsfolder/upcoming/goblin_trailblazer.txt
#	forge-gui/res/cardsfolder/upcoming/impale.txt
#	forge-gui/res/cardsfolder/upcoming/orazca_raptor.txt
#	forge-gui/res/cardsfolder/upcoming/sadistic_skymarcher.txt
#	forge-gui/res/cardsfolder/upcoming/siegehorn_ceratops.txt
#	forge-gui/res/cardsfolder/upcoming/vampire_revenant.txt
 2018-01-09 16:56:27 +03:00