sync with upstreaom #2

Open
goatzone wants to merge 545 commits from liza/Questionable:master into master
Showing only changes of commit 10b8c1ddc2 - Show all commits

View File

@ -83,7 +83,7 @@
}, },
"TerritoryId": 152, "TerritoryId": 152,
"InteractionType": "Interact", "InteractionType": "Interact",
"StopDistance": 0.1, "StopDistance": 0.25,
"AetheryteShortcut": "East Shroud - Hawthorne Hut", "AetheryteShortcut": "East Shroud - Hawthorne Hut",
"Fly": true, "Fly": true,
"SkipConditions": { "SkipConditions": {
@ -109,7 +109,7 @@
}, },
"TerritoryId": 152, "TerritoryId": 152,
"InteractionType": "Interact", "InteractionType": "Interact",
"StopDistance": 0.1, "StopDistance": 0.25,
"AetheryteShortcut": "East Shroud - Hawthorne Hut", "AetheryteShortcut": "East Shroud - Hawthorne Hut",
"Fly": true, "Fly": true,
"SkipConditions": { "SkipConditions": {