Eduardo Quezada 2b40e79ac3 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	include/battle_util.h
#	src/battle_ai_main.c
2024-07-14 22:44:00 -04:00
..
2023-10-23 13:24:38 -05:00
2024-06-21 12:21:29 +02:00
2022-06-28 00:11:59 -04:00
2023-05-03 15:36:17 +02:00