Merge remote-tracking branch 'origin/orbs' into orbs

This commit is contained in:
JohnCorby 2023-06-21 23:51:19 -07:00
commit 1c96b374a2

View File

@ -1644,7 +1644,9 @@
"CairnBrittleHollow",
"CairnTimberHearth",
"CairnEmberTwin",
"Trailmarker"
"Trailmarker",
"Cairn",
"CairnVariant"
],
"enum": [
"wall",
@ -1657,7 +1659,9 @@
"cairnBH",
"cairnTH",
"cairnCT",
"trailmarker"
"trailmarker",
"cairn",
"cairnVariant"
]
},
"NomaiTextLocation": {