external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,453 Commits 31 Branches 187 Tags
0637c69bfe901babf30a015d11386699407b602b
Commit Graph

11706 Commits

Author SHA1 Message Date
Rob Schnautz
7273c36d71 Time Spiral zones (nonfunctional) 2019-06-16 03:42:59 +00:00
Rob Schnautz
109339f058 Creating Marit Lage (nonfunctional) 2019-06-16 03:40:39 +00:00
Rob Schnautz
3b4be89e55 Planeswalker reminder text (nonfunctional) 2019-06-16 03:38:28 +00:00
Rob Schnautz
1eb609d30c Lord of Atlantis gets into commerce (functional... kinda) 2019-06-16 03:31:39 +00:00
Rob Schnautz
27521623a6 Missing a (nonfunctional) period. 2019-06-16 03:28:43 +00:00
Rob Schnautz
147ad884da Ajani's Pride-may-te (functional) 2019-06-16 03:14:10 +00:00
Rob Schnautz
685c452ea5 Merge branch 'master' into 'oracle-updates-nonfunctional' 
# Conflicts:
#   forge-gui/res/cardsfolder/a/artisan_of_forms.txt
#   forge-gui/res/cardsfolder/c/cemetery_puca.txt
#   forge-gui/res/cardsfolder/d/dimir_doppelganger.txt
#   forge-gui/res/cardsfolder/e/evil_twin.txt
#   forge-gui/res/cardsfolder/h/heat_shimmer.txt
#   forge-gui/res/cardsfolder/i/increasing_devotion.txt
#   forge-gui/res/cardsfolder/i/increasing_vengeance.txt
#   forge-gui/res/cardsfolder/k/kiki_jiki_mirror_breaker.txt
#   forge-gui/res/cardsfolder/l/lazav_dimir_mastermind.txt
#   forge-gui/res/cardsfolder/m/minion_reflector.txt
#   forge-gui/res/cardsfolder/m/mizzium_transreliquat.txt
#   forge-gui/res/cardsfolder/s/sakashima_the_impostor.txt
#   forge-gui/res/cardsfolder/s/splinter_twin.txt
#   forge-gui/res/cardsfolder/t/tempt_with_vengeance.txt
#   forge-gui/res/cardsfolder/t/thespians_stage.txt
#   forge-gui/res/cardsfolder/t/twinflame.txt
#   forge-gui/res/cardsfolder/u/unstable_shapeshifter.txt
#   forge-gui/res/cardsfolder/v/vesuvan_doppelganger.txt
#   forge-gui/res/cardsfolder/v/vesuvan_shapeshifter.txt
 2019-06-16 03:09:06 +00:00
schnautzr
2951cb5660 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-06-15 15:45:37 -05:00
schnautzr
7436bf5385 format updates 2019-06-15 15:44:48 -05:00
Agetian
ed818f1bd1 - Fix the order of elements for Charm effect being random in the UI 2019-06-15 22:12:06 +03:00
Agetian
df01fe5085 - Fix AI logic for Teferi, Time Raveler 2019-06-15 21:02:42 +03:00
Agetian
55a2cc92a4 - Revert a change in Epochrasite (no longer necessary) 2019-06-15 18:02:16 +03:00
Computica
75a195f952 Battlebond - Stolen Strategy 2019-06-15 14:42:48 +00:00
Michael Kamensky
e7dadc5a4c Merge branch 'ai-kicker' into 'master' 
Improve AI playability checks for Kicker costs

Closes #1049

See merge request core-developers/forge!1856
 2019-06-15 11:13:52 +00:00
Agetian
379e866424 - Improve AI playability checks for Kicker costs 2019-06-15 09:52:02 +03:00
Michael Kamensky
13d2064459 Merge branch 'master' into 'master' 
Fix AI for Sadistic Obsession.

Closes #1052

See merge request core-developers/forge!1855
 2019-06-15 05:04:44 +00:00
Agetian
60c967dcf7 - Fix AI for Sadistic Obsession. 2019-06-15 07:38:19 +03:00
Hans Mackowiak
ce90d3b845 Update Phantasmal Form 2019-06-15 01:02:02 +00:00
Hans Mackowiak
e1ed2da86c Update throatseeker 2019-06-14 17:40:28 +00:00
Hans Mackowiak
34363829f0 Update Kamahl's Druidic Vow SpellDescription 2019-06-14 12:17:42 +00:00
swordshine
5ade9ea6e8 Merge branch 'patch' into 'master' 
Update some scripts

See merge request core-developers/forge!1851
 2019-06-14 07:24:55 +00:00
swordshine
192f205c0d Update some scripts 2019-06-14 15:24:39 +08:00
Agetian
296a9c32d4 - Fix token definition in Ravnica Allegiance 2019-06-14 09:04:46 +03:00
Agetian
a9275b1184 - Fix the Domain achievement not working correctly with snow-covered basic lands. 2019-06-14 07:18:30 +03:00
Rob Schnautz
19d2703ff4 Update forge-gui/res/editions/Magic 2020.txt 2019-06-13 22:34:31 +00:00
Rob Schnautz
249649dbaa Merge branch 'master' into 'deprecation-cleanup' 
# Conflicts:
#   forge-ai/src/main/java/forge/ai/ability/DiscardAi.java
#   forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java
 2019-06-13 22:10:10 +00:00
Agetian
7f3da042ea - Migrate "upcoming" for MH1 in preparation for the upcoming M20 development. 2019-06-13 07:04:48 +03:00
Blacksmith
803e82f5f8 Clear out release files in preparation for next release 2019-06-12 20:18:07 +00:00
Blacksmith
560fdf1a46 [maven-release-plugin] prepare for next development iteration 2019-06-12 20:13:01 +00:00
Blacksmith
2974f6a7c3 [maven-release-plugin] prepare release forge-1.6.26 2019-06-12 20:12:56 +00:00
Blacksmith
4e9b3ce256 Update README.txt for release 2019-06-12 20:10:26 +00:00
Agetian
9b3b1b9e8d - Fix logic for Domri, Anarch of Bolas 2019-06-12 11:26:27 +03:00
Agetian
06abfc1f14 - Improved London Mulligan AI 
- Also tweaked Goatnap to use AddKWs
 2019-06-12 11:00:48 +03:00
Agetian
7fb089d120 - Fix Goatnap. 2019-06-12 09:53:58 +03:00
Agetian
293b5a1a5f - Fix AI for a couple cards with AF Draw 2019-06-12 08:45:31 +03:00
Hans Mackowiak
244fa13961 TriggerExiled: make new Trigger for exile keyword action for Soulherder 2019-06-12 05:23:31 +00:00
Agetian
b772b08d03 - A more traditional name for the AI logic 2019-06-12 08:01:35 +03:00
Agetian
b23fc791a2 - Same tweak for Savage Stomp 2019-06-12 07:59:50 +03:00
Agetian
25995db862 - Fix the AI logic for Hunt the Weak 2019-06-12 07:59:09 +03:00
Agetian
2acbddbecf - Fix AI logic for Domri's Ambush 2019-06-12 07:44:57 +03:00
Agetian
de0807f6f8 - Tweak ANNOUNCEMENTS.txt. 2019-06-12 06:49:16 +03:00
Sol
84b26638dd Update ANNOUNCEMENTS.txt 2019-06-12 01:52:32 +00:00
Michael Kamensky
54f397cca9 Merge branch 'master' into 'master' 
Tweak the new cubes for better AI rankings.

See merge request core-developers/forge!1834
 2019-06-11 19:49:38 +00:00
Agetian
2c7d38fa39 - Tweak the new cubes for better AI rankings. 2019-06-11 22:49:13 +03:00
Michael Kamensky
854a5575e1 Merge branch 'master' into 'master' 
Added 2 draft cubes (cubetutor.com)

See merge request core-developers/forge!1833
 2019-06-11 19:40:46 +00:00
Agetian
a1e8d15818 - Added 2 draft cubes. 2019-06-11 22:40:02 +03:00
Michael Kamensky
4dde3610fa Merge branch 'master' into 'master' 
de-DE internationalization work

See merge request core-developers/forge!1832
 2019-06-11 18:10:21 +00:00
churrufli
704fa9ad5c de-DE internationalization work 2019-06-11 18:50:10 +02:00
Agetian
3145412ca9 - Added Wtwlf123 540-card Powered Cube originally contributed in Forge format by peepser 2019-06-11 16:02:57 +03:00
Agetian
c75d8fa065 - Added puzzle PS_WAR6. 2019-06-11 13:41:06 +03:00