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

This commit is contained in:
JohnCorby 2023-06-22 00:10:41 -07:00
commit 7963bb7bc1

View File

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