sync with upstreaom #2

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

View File

@ -147,8 +147,7 @@
"Z": -473.94547
},
"TerritoryId": 1191,
"InteractionType": "WalkTo",
"Comment": "TODO Verify this avoids combat"
"InteractionType": "WalkTo"
},
{
"DataId": 1047428,