Hedara 647c786c53 Merge commit '07c897a' into pret-merge ... Conflicts: include/constants/heal_locations.h map_data_rules.mk		2025-05-27 19:46:13 +02:00
..
map.json	Merge commit '07c897a' into pret-merge	2025-05-27 19:46:13 +02:00
scripts.inc	OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA	2024-10-12 23:34:02 -04:00