Commit Graph

69254 Commits

Author SHA1 Message Date
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
Anthony Calosa
b1bc765627 test permission 2024-10-17 20:23:54 +08: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
TwentyToedToad
aedd3bc521 Add Housemeld (YDSK) (#6341) 2024-10-17 09:01:46 +02:00
TwentyToedToad
7c3f8b57f0 Add Fear of Ridicule (YDSK) (#6343) 2024-10-17 08:56:28 +02:00
TwentyToedToad
9d8df142b4 Add Replicating Terror (YDSK) (#6344) 2024-10-17 08:55:06 +02:00
TwentyToedToad
c3aa31cb98 Add Welcome the Darkness (YDSK) (#6346) 2024-10-17 08:53:50 +02:00
TwentyToedToad
fbde7dca06 Add Anugished Recollection (YDSK) (#6347) 2024-10-17 08:52:45 +02:00
TwentyToedToad
dc6be93b25 Add Wary Zone Guard (YDSK) (#6353) 2024-10-17 08:48:07 +02:00
TwentyToedToad
b5246c42cf Add Mangled Soulrager (YDSK) (#6364) 2024-10-17 08:35:55 +02:00
TwentyToedToad
47a8b72b2e Add Polterheist (YDSK) (#6365) 2024-10-17 08:33:46 +02:00
Jetz72
54ecbeef6e Fix IndexOutOfBoundsException in generateParticipants (#6359)
Co-authored-by: Jetz <Jetz722@gmail.com>
2024-10-17 08:03:11 +03:00
Simisays
db0e188fab Sorin tweaks (#6373)
* update

* Update enemies.json
2024-10-17 08:01:58 +03:00
Anthony Calosa
e2a6dfabe8 update version digits 2024-10-17 12:35:11 +08:00
Anthony Calosa
89c699b94d update android pom 2024-10-17 11:34:37 +08:00
Anthony Calosa
0420ad4ef2 Merge branch 'master' into master2
# Conflicts:
#	README.md
#	forge-gui-android/pom.xml
#	forge-gui-android/src/main/AndroidManifest.xml
2024-10-17 10:48:20 +08:00
Hans Mackowiak
f5b30a6826 removed version from AndroidManifest 2024-10-16 21:12:02 -04:00
Hans Mackowiak
94f1835462 ~ fix version pattern for android.manifest merger 2024-10-16 21:12:02 -04:00
Hans Mackowiak
0c5f7962e2 ~ update android-maven-plugin 2024-10-16 21:12:02 -04:00
Hans Mackowiak
23be0c568d AndroidManifest 2024-10-16 21:12:02 -04:00
VishalKeerthan
0edd7d9d87 Update README.md 2024-10-16 21:09:13 -04:00
VishalKeerthan
c05760bab8 Update README.md 2024-10-16 21:09:13 -04:00
Anthony Calosa
143f2d883f update start button colors 2024-10-17 05:42:26 +08:00
Anthony Calosa
c07329db42 Merge branch 'master' into master2 2024-10-17 05:33:20 +08:00
TwentyToedToad
28744ff211 Add Fear of Change (#6327) 2024-10-16 17:12:10 +02:00
Paul Hammerton
ed7ba03b5a Merge pull request #6363 from paulsnoops/slp_edition
Edition updates: SLP
2024-10-16 15:52:36 +01:00