Jetz
6b93e628ac
Merge branch 'master' into code-cleanup
...
# Conflicts:
# forge-ai/src/main/java/forge/ai/ComputerUtil.java
# forge-core/src/main/java/forge/card/DeckHints.java
# forge-game/src/main/java/forge/game/ability/AbilityFactory.java
# forge-game/src/main/java/forge/game/cost/CostUntapType.java
# forge-gui/src/main/java/forge/player/HumanCostDecision.java
2024-10-14 22:36:07 -04:00
Anthony Calosa
83df147d0e
Merge branch 'master' into master2
...
# Conflicts:
# forge-adventure/pom.xml
# forge-ai/pom.xml
# forge-core/pom.xml
# forge-game/pom.xml
# forge-gui-android/AndroidManifest.xml
# forge-gui-android/pom.xml
# forge-gui-desktop/pom.xml
# forge-gui-ios/pom.xml
# forge-gui-mobile-dev/pom.xml
# forge-gui-mobile/pom.xml
# forge-gui-mobile/src/forge/Forge.java
# forge-gui/pom.xml
# forge-lda/pom.xml
# pom.xml
2024-10-15 10:29:23 +08:00
Jetz
31547c6bbb
Merge branch 'master' into code-cleanup
...
# Conflicts:
# forge-game/src/main/java/forge/game/phase/PhaseHandler.java
2024-10-14 22:20:44 -04:00
Meta
5b62a1ffb5
Fixed non-cards for rarity sorting
...
import
2024-10-14 21:56:30 -04:00
Chris H
0475f4bafa
Manually update files that need to be updated
2024-10-14 21:53:45 -04:00
GitHub Actions
d366bf8ffc
[maven-release-plugin] prepare for next development iteration
2024-10-14 21:53:45 -04:00
GitHub Actions
fa538bd5c9
[maven-release-plugin] prepare release forge-1.6.65
2024-10-14 21:53:45 -04:00
Fulgur14
3db4db0d07
Add files via upload
2024-10-14 19:30:33 -04:00
Chris H
932bfb9e33
Migrate DSK upcoming
2024-10-14 14:22:35 -04:00
Chris H
da712a5e49
Add Winter Cynical Opportunist ( #6325 )
2024-10-14 18:04:30 +00:00
TwentyToedToad
0fb2db556b
Add Experimental Lab // Staff Room ( #6324 )
2024-10-14 17:32:34 +00:00
TwentyToedToad
b820d6b622
Update my_will_is_irresistible.txt
2024-10-14 11:58:29 -04:00
TwentyToedToad
79337dbf1f
Update my_will_is_irresistible.txt
2024-10-14 11:58:29 -04:00
TwentyToedToad
1a6d0a4354
Add My Will Is Irresistible
2024-10-14 11:58:29 -04:00
Paul Hammerton
68bb0ebd39
Fix Demonic Covenant ( #6326 )
2024-10-14 15:49:13 +00:00
Anthony Calosa
4af8061824
Merge branch 'master' into master2
2024-10-14 20:46:23 +08:00
Paul Hammerton
cc3b2a20ce
Merge pull request #6323 from paulsnoops/ydsk_formats
...
Add YDSK to formats
2024-10-14 13:24:32 +01:00
Paul Hammerton
81faad08d4
Merge pull request #6322 from paulsnoops/edition_updates
...
Edition updates: SLD, YDSK
2024-10-14 13:22:05 +01:00
Paul Hammerton
c31b26a13d
Add YDSK to formats
2024-10-14 13:21:03 +01:00
Paul Hammerton
efd883ef12
Edition updates: SLD, YDSK
2024-10-14 13:17:13 +01:00
tool4ever
b6f118f89b
Fear of Sleep Paralysis and support ( #6287 )
2024-10-14 10:55:00 +00:00
tool4ever
8f33da5b9c
AI aura targeting fix ( #6320 )
2024-10-14 10:23:18 +00:00
tool4ever
90adf4b0cb
Update struggle_for_project_purity.txt
2024-10-14 06:38:01 +00:00
tool4ever
0df84b91f2
Support recursive check for tokens that create others ( #6315 )
2024-10-14 06:33:41 +00:00
tool4ever
2a5fa9d0a5
Fix CardZoneTable not using the LastStates before moving ( #6291 )
2024-10-14 08:05:24 +02:00
Anthony Calosa
12d2ec89f7
update android pom -> run signv2 on verify phase, fix versin string
2024-10-14 11:02:54 +08:00
Anthony Calosa
1e2d66f574
Merge branch 'master' into master2
...
# Conflicts:
# README.md
2024-10-14 09:56:34 +08:00
Dnaynu
6859380e9e
Docs: Typo fix
...
Corrected "[enviroment]" to "[environment]" in [README.md].
This pull request addresses a minor typo found in repository. The typo has been corrected to improve clarity and maintain the quality of the documentation.
This change is purely cosmetic and does not affect functionality.
2024-10-13 20:09:09 -04:00
Anthony Calosa
00e81d20dd
Merge branch 'master' into master2
2024-10-14 06:06:40 +08:00
Chris H
8669859706
Accidentally pushed
2024-10-13 17:33:05 -04:00
Chris H
c948355f12
Add new set things
2024-10-13 17:20:02 -04:00
tool4ever
dc5cef1446
Update dreams_of_steel_and_oil.txt
2024-10-13 15:34:57 +00:00
tool4ever
bd659a1e44
Update defiled_crypt_cadaver_lab.txt
2024-10-13 15:32:42 +00:00
tool4EvEr
036e6ec1bf
Ghostly Dancers and support
2024-10-13 11:03:02 -04:00
tool4ever
9568abc6f4
Update kraul_harpooner.txt
2024-10-13 11:50:01 +00:00
Renato Filipe Vidal Santos
31a1f05d51
Edit pile cleanup: Line reordering, second pass: part 10, folders 'w' to 'z'
2024-10-13 11:14:44 +00:00
Renato Filipe Vidal Santos
5bf12ab4eb
Edit pile cleanup: Line reordering, second pass: part 9, folders 't' to 'v' ( #6312 )
2024-10-13 11:13:59 +00:00
Renato Filipe Vidal Santos
7fc3e18ff5
Edit pile cleanup: Line reordering, second pass: part 8, folder 's'
2024-10-13 11:11:20 +00:00
Renato Filipe Vidal Santos
9766d4b1e5
Edit pile cleanup: Line reordering, second pass: part 7, folders 'r', 'rebalanced'
2024-10-13 11:10:34 +00:00
Renato Filipe Vidal Santos
2a342b7e3b
Edit pile cleanup: Line reordering, second pass: part 6, folders 'o' to 'q' ( #6309 )
2024-10-13 11:10:02 +00:00
Renato Filipe Vidal Santos
2a1b8b4c93
Edit pile cleanup: Line reordering, second pass: part 5, folders 'l' to 'n'
2024-10-13 11:09:26 +00:00
Renato Filipe Vidal Santos
f538eb1ec3
Edit pile cleanup: Line reordering, second pass: part 4, folders 'h' to 'k'
2024-10-13 11:07:58 +00:00
Renato Filipe Vidal Santos
ae28cd17c0
Edit pile cleanup: Line reordering, second pass: part 3, folders 'e' to 'g'
2024-10-13 11:07:28 +00:00
Renato Filipe Vidal Santos
add0e812a2
Edit pile cleanup: Line reordering, second pass: part 2, folders 'c' to 'd'
2024-10-13 11:06:57 +00:00
Renato Filipe Vidal Santos
0e9c95e542
Edit pile cleanup: Line reordering, second pass: part 1, folders 'a' to 'b' ( #6304 )
2024-10-13 11:06:16 +00:00
Chris H
6b03f6909f
Add Central elevator ( #6292 )
2024-10-13 08:45:41 +00:00
Renato Filipe Vidal Santos
0bf92af38b
Edit pile cleanup: Line reordering, first pass: part 10, folder 'tokenscripts', part 6
2024-10-13 08:34:39 +00:00
Renato Filipe Vidal Santos
042638612e
Edit pile cleanup: Line reordering, first pass: part 9, folder 'tokenscripts', part 5
2024-10-13 08:34:22 +00:00
Renato Filipe Vidal Santos
b494ad8cd1
Edit pile cleanup: Line reordering, first pass: part 8, folder 'tokenscripts', part 4
2024-10-13 08:34:01 +00:00
Renato Filipe Vidal Santos
a2901eeeb8
Edit pile cleanup: Line reordering, first pass: part 7, folder 'tokenscripts', part 3
2024-10-13 08:33:32 +00:00
