Fix merge conflicts

This commit is contained in:
Tetrable
2019-01-03 02:28:18 +00:00
31 changed files with 11632 additions and 17985 deletions

View File

@@ -9,6 +9,7 @@
#define FRONTIER_FACILITY_FACTORY 4
#define FRONTIER_FACILITY_PIKE 5
#define FRONTIER_FACILITY_PYRAMID 6
#define NUM_FRONTIER_FACILITIES 7
#define TENT_VERDANTURF 2
#define TENT_FALLARBOR 3