Northmoc
|
24be7eb802
|
fact_or_fiction.txt improve StackDesc
|
2021-10-27 10:50:41 -04:00 |
|
Northmoc
|
9353587b89
|
TwoPilesEffect fix
|
2021-10-27 10:47:37 -04:00 |
|
Michael Kamensky
|
cdd4947c15
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
|
2021-10-27 14:39:29 +03:00 |
|
Anthony Calosa
|
4df02c943e
|
Merge branch 'master' into 'master'
prevent NPE
See merge request core-developers/forge!5659
|
2021-10-27 05:34:34 +00:00 |
|
Anthony Calosa
|
d921677e60
|
prevent NPE
|
2021-10-27 13:33:16 +08:00 |
|
Michael Kamensky
|
1ca7eb6c52
|
Merge branch 'master' into 'master'
Net Decks Archive Updates
See merge request core-developers/forge!5655
|
2021-10-27 04:22:27 +00:00 |
|
Michael Kamensky
|
7370f2a6cf
|
Merge branch 'foiling' into 'master'
Fix deck loading not restoring foiled status
See merge request core-developers/forge!5656
|
2021-10-27 04:22:23 +00:00 |
|
Michael Kamensky
|
ac6bdc09e2
|
Merge branch 'typo' into 'master'
sorin_lord_of_innistrad.txt typo
See merge request core-developers/forge!5658
|
2021-10-27 04:21:54 +00:00 |
|
Michael Kamensky
|
93cd28f40c
|
Merge branch 'urza' into 'master'
Urza, Academy Headmaster
See merge request core-developers/forge!5657
|
2021-10-27 04:21:39 +00:00 |
|
Northmoc
|
9d02c0c39f
|
Match.java final Urza work
|
2021-10-26 20:36:57 -04:00 |
|
Northmoc
|
cd6cf320de
|
urza tweak
|
2021-10-26 20:36:56 -04:00 |
|
Northmoc
|
89a91c6df8
|
placeholder for special param that picks new ability if no legal targets
|
2021-10-26 20:36:56 -04:00 |
|
Northmoc
|
f3a2f72106
|
add Urza planeswalker type
|
2021-10-26 20:36:55 -04:00 |
|
Northmoc
|
63c7852ded
|
urza_academy_headmaster.txt (need to finish ultimates and change ChangeTo param)
|
2021-10-26 20:36:55 -04:00 |
|
Northmoc
|
17f3b24fa4
|
sorin_lord_of_innistrad.txt typo
|
2021-10-26 20:33:39 -04:00 |
|
TRT
|
cbbdd8584c
|
Fix NPE when trying to remove card
|
2021-10-27 01:12:17 +02:00 |
|
Churrufli
|
9bced99419
|
Net Decks Archive Updates
|
2021-10-26 22:21:26 +02:00 |
|
leriomaggio
|
c31d4cbb1f
|
Implementing (deep) deck comparison based on similarity of parts (cardPool)
|
2021-10-26 17:30:28 +02:00 |
|
TRT
|
5e050765a3
|
Clean up
|
2021-10-26 13:41:31 +02:00 |
|
Michael Kamensky
|
58faf536e1
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
Conflicts:
forge-gui/res/languages/de-DE.properties
|
2021-10-26 11:10:29 +03:00 |
|
Michael Kamensky
|
68ae23b494
|
Merge branch 'twosat-master-patch-67711' into 'master'
Update de-DE.properties
See merge request core-developers/forge!5654
|
2021-10-26 03:35:10 +00:00 |
|
tool4EvEr
|
fb88fcfe9c
|
Fix deck loading not restoring foiled status
|
2021-10-25 23:54:08 +02:00 |
|
Andreas Bendel
|
bfb5b588ca
|
Update de-DE.properties
translated #FlipOntoBattlefieldEffect
|
2021-10-25 20:52:20 +00:00 |
|
Michael Kamensky
|
849e3d0719
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
|
2021-10-25 18:51:05 +03:00 |
|
Michael Kamensky
|
81c288f3fc
|
- Clarify the new FlipOntoBattlefield mechanics text labels a little (according to the Oracle wording).
|
2021-10-25 18:50:51 +03:00 |
|
Michael Kamensky
|
f9d933c6bd
|
Merge branch 'aicombat' into 'master'
Fix predictToughnessBonusOfAttacker logic
See merge request core-developers/forge!5653
|
2021-10-25 12:52:22 +00:00 |
|
TRT
|
f0f6592a38
|
Fix predictToughnessBonusOfAttacker logic
|
2021-10-25 13:56:35 +02:00 |
|
Michael Kamensky
|
6ae88ea82b
|
Merge branch 'java-11plus' into 'master'
Update Forge scripts for Java 11+ and Java 17+
See merge request core-developers/forge!5566
|
2021-10-25 09:41:50 +00:00 |
|
Michael Kamensky
|
130ffde80a
|
Merge branch 'look' into 'master'
Blacker Lotus and Look at Me, I'm the DCI
See merge request core-developers/forge!5630
|
2021-10-25 09:01:44 +00:00 |
|
Tim Mocny
|
f0c852c54f
|
Blacker Lotus and Look at Me, I'm the DCI
|
2021-10-25 09:01:43 +00:00 |
|
Michael Kamensky
|
ff55215016
|
Merge branch 'master' into 'master'
Improve some AI hints for AFR.
See merge request core-developers/forge!5652
|
2021-10-25 08:58:01 +00:00 |
|
Michael Kamensky
|
668ed97ed1
|
- Improve some AI hints for AFR.
|
2021-10-25 11:56:20 +03:00 |
|
Michael Kamensky
|
3ed10fb112
|
Merge branch 'master' into 'master'
Tweak a comment.
See merge request core-developers/forge!5651
|
2021-10-25 06:14:08 +00:00 |
|
Michael Kamensky
|
c70b6d13c1
|
- Tweak a comment.
|
2021-10-25 09:13:42 +03:00 |
|
Michael Kamensky
|
eee4e08b89
|
Merge branch 'master' into 'master'
No need to sort cards by ID for FlipOntoBattlefieldEffect
See merge request core-developers/forge!5650
|
2021-10-25 06:12:43 +00:00 |
|
Michael Kamensky
|
470fe5fba4
|
- No need to sort cards by ID for FlipOntoBattlefieldEffect
|
2021-10-25 09:11:22 +03:00 |
|
Michael Kamensky
|
0399e52bf6
|
Merge branch 'manual-dexterity' into 'master'
Initial implementation for simulated manual dexterity cards (Chaos Orb and Falling Star)
See merge request core-developers/forge!5647
|
2021-10-25 05:08:15 +00:00 |
|
Michael Kamensky
|
c9b94710b2
|
- Initial implementation for simulated manual dexterity cards (Chaos Orb and Falling Star) with basic AI support.
|
2021-10-25 05:08:14 +00:00 |
|
Michael Kamensky
|
d0afefb5ab
|
Merge branch 'mpfix' into 'master'
Fix SA not fizzling when targeting cards that left game
See merge request core-developers/forge!5649
|
2021-10-25 03:44:45 +00:00 |
|
tool4EvEr
|
47a1a93625
|
Fix SA not fizzling when targeting cards that left game
|
2021-10-24 22:10:22 +02:00 |
|
Michael Kamensky
|
81ec2c1a55
|
Merge branch 'twosat-master-patch-04851' into 'master'
Update de-DE.properties
See merge request core-developers/forge!5648
|
2021-10-24 19:06:58 +00:00 |
|
Andreas Bendel
|
066ede2237
|
Update de-DE.properties
translated lblfromdungeondeck and LimitedPoolType
|
2021-10-24 19:04:39 +00:00 |
|
Michael Kamensky
|
916b73e4b9
|
Merge branch 'master' into 'master'
Enable Harm's Way in MTGO Core Cube 2018.
See merge request core-developers/forge!5646
|
2021-10-24 15:08:39 +00:00 |
|
Michael Kamensky
|
bbe0a5b76b
|
- Enable Harm's Way in MTGO Core Cube 2018.
|
2021-10-24 18:07:58 +03:00 |
|
Michael Kamensky
|
6c1b5d2ea3
|
Merge branch 'master' into 'master'
Bag of Holding AI spec.
See merge request core-developers/forge!5645
|
2021-10-24 14:55:35 +00:00 |
|
Michael Kamensky
|
c827769da7
|
- Bag of Holding AI spec.
|
2021-10-24 17:54:55 +03:00 |
|
Michael Kamensky
|
9afa3908b8
|
Merge branch 'master' into 'master'
Enable some of the recently implemented cards in Oldschool 93-94 Magic Full Set cube list.
See merge request core-developers/forge!5644
|
2021-10-24 14:39:38 +00:00 |
|
Michael Kamensky
|
a91699bc07
|
- Enable some of the recently implemented cards in Oldschool 93-94 Magic Full Set cube list.
|
2021-10-24 17:39:00 +03:00 |
|
Michael Kamensky
|
75c6e9ef5e
|
Merge branch 'deck-importer-decks-file-format' into 'master'
FIX Issue with Race Condition in Decks + Extras to CustomCube Draft and Deck Editor
See merge request core-developers/forge!5643
|
2021-10-24 14:36:37 +00:00 |
|
leriomaggio
|
669a10820e
|
Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format
|
2021-10-24 16:20:21 +02:00 |
|