Hedara 1abfa7acfa Merge branch 'master' into master-upcoming
Conflicts:
	include/battle.h
	include/constants/battle_string_ids.h
	src/battle_ai_util.c
	src/battle_main.c
	src/battle_util.c
	test/battle/ai/ai.c
2025-05-12 18:21:35 +02:00
..
2025-05-03 10:26:07 +02:00
2025-01-01 20:34:33 +01:00
2025-05-07 16:50:12 +02:00
2025-05-03 10:26:07 +02:00
2025-01-01 20:34:33 +01:00
2025-01-29 21:13:53 -03:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-05-02 20:14:27 +02:00
2025-05-07 16:50:12 +02:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-04-01 19:11:55 +02:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-05-03 10:26:07 +02:00
2025-01-01 20:34:33 +01:00
2025-01-29 21:13:53 -03:00
2025-03-08 21:24:22 +01:00
2025-01-29 21:13:53 -03:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-05-07 16:50:12 +02:00
2025-01-01 20:34:33 +01:00
2025-05-03 10:26:07 +02:00
2025-01-29 21:13:53 -03:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-05-03 10:26:07 +02:00
2025-05-03 10:26:07 +02:00
2023-10-11 16:11:46 +02:00
2025-05-03 10:26:07 +02:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-01-29 21:13:53 -03:00
2025-01-01 20:34:33 +01:00
2025-05-03 10:26:07 +02:00
2025-05-07 16:50:12 +02:00
2025-05-07 16:50:12 +02:00
2025-05-07 16:50:12 +02:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-05-03 10:26:07 +02:00
2025-05-07 16:50:12 +02:00
2025-05-07 16:50:12 +02:00
2025-01-01 20:34:33 +01:00
2025-05-03 10:26:07 +02:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00
2025-01-01 20:34:33 +01:00