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
40,815 Commits 32 Branches 187 Tags
211b51e5164976e50b36f85e85995a105d3ea34d
Commit Graph

10727 Commits

Author SHA1 Message Date
Sol
4cc397baa4 Update ragavan.txt 2019-02-13 02:11:13 +00:00
Agetian
24d857f269 - Added puzzle PS_RNA3. 2019-02-12 06:52:48 +03:00
Michael Kamensky
cb13f0a685 Merge branch 'master' into 'master' 
allow floating zones to be sorted by the name of the card

See merge request core-developers/forge!1387
 2019-02-12 03:35:49 +00:00
Peter F. Patel-Schneider
e8f14d5a6c describe change in CHANGES.txt; comment cleanup 2019-02-11 08:04:36 -05:00
Michael Kamensky
64c9f7ffb3 Merge branch '832-state-based-actions-check-conflict-with-upkeep-trigger' into 'master' 
Resolve "State Based Actions check conflict with Upkeep trigger"

Closes #832

See merge request core-developers/forge!1380
 2019-02-11 13:00:14 +00:00
Michael Kamensky
899532666e Merge branch 'master' into 'master' 
Resolve Angel of Grace's Graveyard Ability crash

Closes #838

See merge request core-developers/forge!1388
 2019-02-11 12:35:57 +00:00
T.J. Tillman
eb17f4972a Update angel_of_grace.txt 2019-02-10 19:06:10 +00:00
Hans Mackowiak
e83c78e2b4 Epochrasite: the LKI thing there is wrong 2019-02-10 11:31:50 +01:00
Michael Kamensky
bf7f07b432 Merge branch 'master' into 'master' 
Fix for Clear the Stage

See merge request core-developers/forge!1386
 2019-02-10 10:22:24 +00:00
T.J. Tillman
245994d094 Update clear_the_stage.txt 2019-02-10 09:40:13 +00:00
Sol
d6b011fd72 Update angelic_exaltation.txt 2019-02-10 03:11:26 +00:00
Hanmac
4da05f03dc CardFactoryUtil: Aura swap as Keyword 2019-02-09 17:53:05 +01:00
Michael Kamensky
1e39137ab5 Merge branch 'patch-1' into 'master' 
Deputy of Detention: need Condition like Bishop of Binding

See merge request core-developers/forge!1376
 2019-02-09 03:59:13 +00:00
Hanmac
47c89fb0ae PhaseHandler: fix executeUntil needs to be done after checkStateEffects 2019-02-08 19:51:51 +01:00
Michael Kamensky
cf57832970 Merge branch 'patch-3' into 'master' 
Update Modern.txt

See merge request core-developers/forge!1379
 2019-02-08 18:12:22 +00:00
Sol
09f90bfe35 Update Modern.txt 2019-02-08 16:13:58 +00:00
Sol
0c06346ca0 Update Brawl.txt 2019-02-08 16:12:15 +00:00
Hans Mackowiak
5885c37a0f Deputy of Detention: need Condition like Bishop of Binding 2019-02-08 08:17:01 +00:00
Michael Kamensky
189514f37c Merge branch 'master' into 'master' 
Update amplifire.txt

See merge request core-developers/forge!1374
 2019-02-08 03:37:12 +00:00
T.J. Tillman
983eaaff3c Update amplifire.txt 2019-02-07 20:56:54 +00:00
Michael Kamensky
9d79959b87 Merge branch 'master' into 'master' 
Fix Arrester's Zeal

See merge request core-developers/forge!1372
 2019-02-07 15:12:04 +00:00
T.J. Tillman
a3d75035b9 Update arresters_zeal.txt 2019-02-07 15:08:26 +00:00
Hans Mackowiak
67167c29fc Knight of the last Breath: fix Sac Description 2019-02-07 08:41:02 +00:00
T.J. Tillman
d763e3a1db Update arresters_zeal.txt 2019-02-07 06:42:14 +00:00
T.J. Tillman
ebddcb3210 Update spear_spewer.txt 2019-02-07 06:40:11 +00:00
T.J. Tillman
526104104c Merge branch 'forPushing' into 'master' 
For pushing

See merge request tjtillmancoag/forge!5
 2019-02-07 06:35:27 +00:00
T.J. Tillman
ebd5e7b419 Merge branch 'SpearSpewerFix' into 'master' 
Spear spewer fix et all

See merge request tjtillmancoag/forge!4
 2019-02-07 06:14:18 +00:00
Michael Kamensky
d491972995 Merge branch 'master' into 'master' 
Translating hard-coded text to res en-US.properties

See merge request core-developers/forge!1283
 2019-02-07 05:54:47 +00:00
Michael Kamensky
60c68b10d9 Merge branch 'master' into 'master' 
Guardian Project fix by friarsol: patch and integrate

See merge request core-developers/forge!1371
 2019-02-07 05:05:44 +00:00
Agetian
7111c3f3aa Merge branch 'fix-guardian-project' of https://git.cardforge.org/friarsol/forge into agetian-master 2019-02-07 08:04:27 +03:00
Michael Kamensky
384b5c2c5b Merge branch 'SpearSpewerFix' into 'master' 
Several RNA fixes

See merge request core-developers/forge!1369
 2019-02-07 04:20:13 +00:00
Sol
84a2fed516 Update guardian_project.txt 2019-02-07 03:42:23 +00:00
Chris H
a1c137a86b Fix Guardian Project 2019-02-06 22:04:31 -05:00
T.J. Tillman
87359257fd Update end_raze_forerunners.txt 2019-02-07 02:06:54 +00:00
T.J. Tillman
4e8c18b232 Update angel_of_grace.txt 2019-02-07 01:42:51 +00:00
T.J. Tillman
95f46dfde3 Update smothering_tithe.txt 2019-02-07 01:01:59 +00:00
T.J. Tillman
20c978a64f Revert "Update spear_spewer.txt" 
This reverts commit c7d8a112d0
 2019-02-06 21:39:56 +00:00
T.J. Tillman
bb57cb1e1b Update kaya_orzhov_usurper.txt 2019-02-06 20:28:43 +00:00
T.J. Tillman
29b0c6eb69 Update kaya_orzhov_usurper.txt 2019-02-06 20:17:25 +00:00
T.J. Tillman
76b929b814 Revert "Update arresters_zeal.txt" 
This reverts commit fbde2483e4
 2019-02-06 18:47:19 +00:00
T.J. Tillman
fbde2483e4 Update arresters_zeal.txt 2019-02-06 18:41:40 +00:00
T.J. Tillman
55ccd88790 Update descriptions on swirling_torrent.txt 2019-02-06 18:38:32 +00:00
T.J. Tillman
5b9e121674 Update Contamination.dck 2019-02-06 18:29:37 +00:00
T.J. Tillman
d86e04222d Revert "Update Contamination.dck" 
This reverts commit 5b10cb0e26
 2019-02-06 18:29:08 +00:00
T.J. Tillman
5b10cb0e26 Update Contamination.dck 2019-02-06 18:28:41 +00:00
T.J. Tillman
5d99a0e918 Update pestilent_spirit.txt 2019-02-06 18:21:31 +00:00
T.J. Tillman
8385e80fd3 Revert guardian_project.txt for this branch 2019-02-06 18:00:09 +00:00
T.J. Tillman
c7d8a112d0 Update spear_spewer.txt 2019-02-06 17:56:56 +00:00
Hans Mackowiak
2284964c88 Update imperiosaur: fix P7T 2019-02-06 12:20:37 +00:00
Hanmac
7ea81fce8b cards: add missing empty Oracle 2019-02-06 07:28:13 +01:00