Skip to content

Commit 8bd25d1

Browse files
authored
Merge pull request #79 from AssistantNMS/develop
Develop
2 parents c9aebb9 + 8b0763d commit 8bd25d1

606 files changed

Lines changed: 177152 additions & 135015 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

assets/data/alphabetTranslations.json

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
[
22
{
3-
"AppId": "other122",
3+
"AppId": "build939",
44
"Text": "Pioneers"
55
},
66
{
7-
"AppId": "other122",
7+
"AppId": "build943",
88
"Text": "Pioneers"
99
},
1010
{
11-
"AppId": "other128",
12-
"Text": "Pioneers"
13-
},
14-
{
15-
"AppId": "other154",
11+
"AppId": "build946",
1612
"Text": "Cartographers"
1713
},
1814
{
19-
"AppId": "other193",
15+
"AppId": "build961",
2016
"Text": "Emergence"
2117
},
2218
{
23-
"AppId": "other184",
19+
"AppId": "build958",
2420
"Text": "Home"
2521
},
2622
{
27-
"AppId": "other185",
23+
"AppId": "build959",
2824
"Text": "Not milk"
2925
},
3026
{
@@ -108,27 +104,27 @@
108104
"Text": "Explorers Wanted"
109105
},
110106
{
111-
"AppId": "other233",
107+
"AppId": "build964",
112108
"Text": "Outlaw"
113109
},
114110
{
115-
"AppId": "other234",
111+
"AppId": "build965",
116112
"Text": "Pirate"
117113
},
118114
{
119-
"AppId": "other235",
115+
"AppId": "build966",
120116
"Text": "Planet??"
121117
},
122118
{
123-
"AppId": "other243",
119+
"AppId": "build973",
124120
"Text": "Blighted"
125121
},
126122
{
127-
"AppId": "other266",
123+
"AppId": "build979",
128124
"Text": "Fly"
129125
},
130126
{
131-
"AppId": "other267",
127+
"AppId": "build980",
132128
"Text": "Ortbital"
133129
},
134130
{

assets/data/assistantAppTeamMembers.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,37 @@
1818
"sortOrder": 1
1919
},
2020
{
21-
"guid": "80d2a8e9-dc1c-4d94-8617-a5385cf902d2",
22-
"name": "LionessLilo",
23-
"role": "Graphic Design",
24-
"imageUrl": "https://cdn.assistantapps.com/team/LionessLilo.jpg",
25-
"linkUrl": "https://lionesslilo.com?ref=assistantAppsDocs",
26-
"linkName": "LionessLilo.com",
21+
"guid": "0471978d-0fc2-4ace-9279-5091444b2df3",
22+
"name": "Lenni",
23+
"role": "German Translator | Bug finder | NMS Expert",
24+
"imageUrl": "https://cdn.assistantapps.com/team/lenni.png",
25+
"linkUrl": "",
26+
"linkName": "",
2727
"sortOrder": 2
2828
},
2929
{
3030
"guid": "172428e5-401c-4fc3-96d0-679db363ae6a",
3131
"name": "Sphynxcolt",
32-
"role": "Discord Admin",
32+
"role": "Designer | Discord Admin",
3333
"imageUrl": "https://cdn.assistantapps.com/team/Sphynxcolt.png",
3434
"sortOrder": 3
3535
},
36-
{
37-
"guid": "0471978d-0fc2-4ace-9279-5091444b2df3",
38-
"name": "Lenni",
39-
"role": "German Translator | Bug finder | NMS Expert",
40-
"imageUrl": "https://cdn.assistantapps.com/team/lenni.png",
41-
"linkUrl": "",
42-
"linkName": "",
43-
"sortOrder": 4
44-
},
4536
{
4637
"guid": "50008598-f7a0-4d8a-ba41-579bf8471e92",
4738
"name": "Cyberpunk2350",
4839
"role": "Moderator | NMS Dataminer | Keeper of Obscure Knowledge",
4940
"imageUrl": "https://cdn.assistantapps.com/team/cyberpunk2350.png",
5041
"linkUrl": "",
5142
"linkName": "",
43+
"sortOrder": 4
44+
},
45+
{
46+
"guid": "80d2a8e9-dc1c-4d94-8617-a5385cf902d2",
47+
"name": "LionessLilo",
48+
"role": "Logo Designer | Social media",
49+
"imageUrl": "https://cdn.assistantapps.com/team/LionessLilo.jpg",
50+
"linkUrl": "https://lionesslilo.com?ref=assistantAppsDocs",
51+
"linkName": "LionessLilo.com",
5252
"sortOrder": 5
5353
}
5454
]

0 commit comments

Comments
 (0)