Eduardo Quezada c9b2a8ae24 Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # src/battle_ai_util.c		2023-09-14 08:34:47 -03:00
..
bad_dreams.c
battle_bond.c	Battle bond tests and small fix (#3279)	2023-09-07 17:23:43 -03:00
beads_of_ruin.c
blaze.c
clear_body.c
cloud_nine.c
compound_eyes.c
contrary.c
cute_charm.c
damp.c
desolate_land.c
download.c
drizzle.c
dry_skin.c
electromorphosis.c
flame_body.c
flower_gift.c
fluffy.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
forecast.c
full_metal_body.c
hunger_switch.c
hydration.c
hyper_cutter.c
ice_body.c
immunity.c
inner_focus.c
insomnia.c
intimidate.c
leaf_guard.c
limber.c
magic_bounce.c
mirror_armor.c
oblivious.c
overcoat.c
overgrow.c
own_tempo.c
pastel_veil.c
poison_point.c
primordial_sea.c
protosynthesis.c
quark_drive.c
rain_dish.c
rattled.c
sand_veil.c
schooling.c
scrappy.c
snow_cloak.c
snow_warning.c
speed_boost.c
stamina.c
static.c
stench.c
sturdy.c
swarm.c
sword_of_ruin.c
tablets_of_ruin.c
torrent.c
toxic_debris.c	Fixes Toxic Debris + CanTargetFaintAi index issue (#3306)	2023-09-13 10:31:20 +02:00
vessel_of_ruin.c
volt_absorb.c
water_absorb.c
white_smoke.c
wind_power.c
zen_mode.c