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

..

.gitignore

…

json11.cpp

Added missing include due to g++ changes

2025-05-02 16:03:55 +02:00

json11.h

…

Makefile

…

mapjson.cpp

Merge commit '07c897a' into pret-merge

2025-05-27 19:46:13 +02:00

mapjson.h

…