Commit Graph

69691 Commits

Author SHA1 Message Date
Ayora29
1e707dcdbf Merge branch 'master' into ok_shortcut 2024-10-18 20:09:06 +02:00
Paul Hammerton
4ee2af4e1e Merge pull request #6377 from Ayora29/fix_token_names
WOC : Fix token name
2024-10-18 17:33:12 +01:00
tool4ever
b2ec9c3a49 Update longhorn_firebeast.txt 2024-10-18 16:29:09 +00:00
Anthony Calosa
3455045f2e update scripts 2024-10-18 23:16:00 +08:00
fanch
a1de6fa6cc Revert "ZNC : Add token b_1_1_faerie_rogue_flying (from card "Notorious Throng")"
This reverts commit 7f09129683.
2024-10-18 16:20:04 +02:00
fanch
7f09129683 ZNC : Add token b_1_1_faerie_rogue_flying (from card "Notorious Throng") 2024-10-18 16:18:54 +02:00
fanch
e7ec681470 WOC : Fix token name w_1_1_pegasus_flying -> w_2_2_pegasus_flying 2024-10-18 16:12:31 +02:00
Ayora29
b080a337be Merge branch 'master' into ok_shortcut 2024-10-18 16:05:52 +02:00
fanch
be6f353867 Merge branch 'master' into ok_shortcut
# Conflicts:
#	forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java
2024-10-18 15:47:10 +02:00
Anthony Calosa
548450eb1a unused import 2024-10-18 20:00:55 +08:00
Anthony Calosa
c1779a55d5 update to LibGDX 1.13.0, add ForgeAndroidApplication (modified AndroidApplication) 2024-10-18 19:44:30 +08:00
Anthony Calosa
e6caed4ced cleanup 2024-10-18 11:38:57 +08:00
Anthony Calosa
5f98543f6d test remove old build tools on modded android maven plugin 2024-10-18 11:28:56 +08:00
Anthony Calosa
e0639ba33a Merge branch 'master' into master2 2024-10-18 05:23:38 +08:00
Anthony Calosa
2ec505b01a test older build tools 2024-10-18 05:13:21 +08:00
TwentyToedToad
e6a62e54fc Add Enduring Friendship (YDSK) (#6354) 2024-10-17 20:26:18 +00:00
JMAilan
2571aff4c8 Constructed as default mode (#6358)
Co-authored-by: Agetian <stavdev@mail.ru>
2024-10-17 17:58:01 +02:00
fanch
e862f4d8ca MH2 : Fix token name u_1_1_bird_flying -> w_1_1_bird_flying 2024-10-17 17:56:23 +02:00
TwentyToedToad
95eb400b19 Add Chittering Illuminator (YDSK) (#6370)
* Add Chittering Illuminator (YDSK)
2024-10-17 17:55:12 +02:00
fanch
faaec84a8b MH2 : Fix token name u_1_1_bird_flying -> w_1_1_bird_flying 2024-10-17 17:08:28 +02:00
fanch
0d63692ec6 Merge branch 'master' of https://github.com/Ayora29/forge 2024-10-17 17:06:59 +02:00
fanch
ed2a4bf3bf MH2 : Fix token name u_1_1_bird_flying -> w_1_1_bird_flying 2024-10-17 17:05:39 +02:00
Anthony Calosa
8403bda70e Merge branch 'master' into master2 2024-10-17 22:37:36 +08:00
Anthony Calosa
b1ba4b2c4f fix 2024-10-17 22:33:30 +08:00
Anthony Calosa
bde1ebc990 update 2024-10-17 22:20:46 +08:00
Anthony Calosa
54a1995572 test list 2024-10-17 21:48:20 +08:00
TwentyToedToad
9281f89974 Add Eager Flameguide (YDSK) (#6350) 2024-10-17 15:27:13 +02:00
TwentyToedToad
0048f25db2 Add Wingbright Thief (YDSK) (#6368) 2024-10-17 15:25:58 +02:00
TwentyToedToad
65775f87b4 Add Mischievous Lookout (YDSK) (#6366) 2024-10-17 15:25:14 +02:00
TwentyToedToad
54396e7f71 Add Unnatural Summons (YDSK) (#6367) 2024-10-17 15:16:45 +02:00
TwentyToedToad
ace00aa5f8 Add Golden Sidekick (YDSK) (#6362) 2024-10-17 15:11:29 +02:00
Anthony Calosa
dc357461d8 test tmate 2024-10-17 21:09:08 +08:00
TwentyToedToad
d2d38d5d26 Add Soul Shredder (YDSK) (#6338) 2024-10-17 15:03:31 +02:00
Anthony Calosa
e7814ec6d1 test min 2024-10-17 21:02:47 +08:00
TwentyToedToad
c44e41b4d3 Add Ethrimik, Imagined Fiend (YDSK) (#6339) 2024-10-17 15:02:41 +02:00
Anthony Calosa
a5d1165214 test again 2024-10-17 20:55:15 +08:00
Anthony Calosa
1db465d17c test build-tools 2024-10-17 20:53:15 +08:00
Anthony Calosa
331366687e test platform-tools 2024-10-17 20:50:55 +08:00
Jetz
67cedada04 Merge branch 'master' into code-cleanup
# Conflicts:
#	forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
2024-10-17 08:25:39 -04:00
Anthony Calosa
b1bc765627 test permission 2024-10-17 20:23:54 +08:00
Jetz
9be2c3df8b Merge branch 'master' into code-cleanup 2024-10-17 08:23:36 -04:00
Anthony Calosa
57b1c9e0c8 test android root 2024-10-17 20:18:57 +08:00
Anthony Calosa
5b26688303 test without path 2024-10-17 19:54:43 +08:00
Anthony Calosa
97f9ce6b43 add test-build profile 2024-10-17 19:43:17 +08:00
Anthony Calosa
24638ecfce Merge branch 'master' into master2 2024-10-17 15:56:46 +08:00
Anthony Calosa
e7aad18787 remove test build 2024-10-17 15:48:02 +08:00
Anthony Calosa
5c419df8b5 update name 2024-10-17 15:36:38 +08:00
Anthony Calosa
e1e69a4897 test android workflow 2024-10-17 15:34:29 +08:00
TwentyToedToad
ea045f6a15 Add Glimmer Hoarder (YDSK) (#6333) 2024-10-17 09:08:56 +02:00
TwentyToedToad
4aa7f0a4fe Add Razor Demon (#6334) 2024-10-17 09:07:15 +02:00