Skip to content

Commit 8a88cfe

Browse files
Khaoz-TopsyKhaoz-Topsy
authored
πŸ”€ Merge pull request #94 from AssistantNMS/develop
πŸ”– 0.48.1
2 parents fc49bcf + cca8093 commit 8a88cfe

24 files changed

Lines changed: 5920 additions & 10349 deletions

β€Žpackage.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nms-web-app",
3-
"version": "0.48.0",
3+
"version": "0.48.1",
44
"private": true,
55
"scripts": {
66
"start": "env-cmd --file ./.env.development react-scripts start",

β€Žpublic/assets/data/patronsBackup.jsonβ€Ž

Lines changed: 64 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D01DB467EB36DC4A515F3AA7D7227A78.png",
2424
"url": "https://assistantapps.com"
2525
},
26+
{
27+
"name": "dvkJoe",
28+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/D720CA7B985123A462A848941D1B5C69.png",
29+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D720CA7B985123A462A848941D1B5C69.png",
30+
"url": "https://assistantapps.com"
31+
},
2632
{
2733
"name": "CaptainSteve",
2834
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/62621285565C1858B5B1A3E9E7A42D9B.png",
@@ -35,6 +41,12 @@
3541
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DD21247329CC4E7DCE5B2F8F58C1D8CE.png",
3642
"url": "https://assistantapps.com"
3743
},
44+
{
45+
"name": "StormKingPryde",
46+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/DF5CF7E65325CBA8C6824C232B917927.png",
47+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DF5CF7E65325CBA8C6824C232B917927.png",
48+
"url": "https://assistantapps.com"
49+
},
3850
{
3951
"name": "chrisagiddings",
4052
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/AD2DB07A3A0A976AAC85AA5B0FF4E898.png",
@@ -60,7 +72,7 @@
6072
"url": "https://assistantapps.com"
6173
},
6274
{
63-
"name": "cyberpunk2350",
75+
"name": "Cyberpunk2350",
6476
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/2710524A9D208523926238EA123749E9.png",
6577
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/2710524A9D208523926238EA123749E9.png",
6678
"url": "https://assistantapps.com"
@@ -89,24 +101,12 @@
89101
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/C3E7512CFA98BD65ABEBE44EA69EB57F.png",
90102
"url": "https://assistantapps.com"
91103
},
92-
{
93-
"name": "dvkJoe",
94-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/D720CA7B985123A462A848941D1B5C69.png",
95-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D720CA7B985123A462A848941D1B5C69.png",
96-
"url": "https://assistantapps.com"
97-
},
98104
{
99105
"name": "LaurelP",
100106
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/1A27EB717D664455ECDA83B0F649D90A.png",
101107
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/1A27EB717D664455ECDA83B0F649D90A.png",
102108
"url": "https://assistantapps.com"
103109
},
104-
{
105-
"name": "StormKingPryde",
106-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/DF5CF7E65325CBA8C6824C232B917927.png",
107-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DF5CF7E65325CBA8C6824C232B917927.png",
108-
"url": "https://assistantapps.com"
109-
},
110110
{
111111
"name": "David Stevenson",
112112
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/75D2741AA463E5BA847AEF218CE53E16.png",
@@ -119,18 +119,18 @@
119119
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/04035D051898F471873F7EC6C4925791.png",
120120
"url": "https://assistantapps.com"
121121
},
122-
{
123-
"name": "MasterCyberpunk",
124-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/BCD210FF084C2EA92DA567C0E2D3C08C.png",
125-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/BCD210FF084C2EA92DA567C0E2D3C08C.png",
126-
"url": "https://assistantapps.com"
127-
},
128122
{
129123
"name": "April Gunter",
130124
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/74B8D5A6AC9A72876BFAF89489E3CACB.png",
131125
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/74B8D5A6AC9A72876BFAF89489E3CACB.png",
132126
"url": "https://assistantapps.com"
133127
},
128+
{
129+
"name": "MasterCyberpunk",
130+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/BCD210FF084C2EA92DA567C0E2D3C08C.png",
131+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/BCD210FF084C2EA92DA567C0E2D3C08C.png",
132+
"url": "https://assistantapps.com"
133+
},
134134
{
135135
"name": "Arcadie",
136136
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/7B48FDA94614713E7E91CB53CCAF1552.png",
@@ -155,18 +155,6 @@
155155
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9CF50630ADBF46DD1F8C3BC5874B518F.png",
156156
"url": "https://assistantapps.com"
157157
},
158-
{
159-
"name": "Dominik Valachovič",
160-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/9D055DEC18EDF3FC779761BC38B25260.png",
161-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9D055DEC18EDF3FC779761BC38B25260.png",
162-
"url": "https://assistantapps.com"
163-
},
164-
{
165-
"name": "Ryan Plucker",
166-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/7E4A8CDEB3F3702F32B1DCCD7BD11A1E.png",
167-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7E4A8CDEB3F3702F32B1DCCD7BD11A1E.png",
168-
"url": "https://assistantapps.com"
169-
},
170158
{
171159
"name": "Jdia Plum",
172160
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/97A74E429C4BDDDE7FA1A82AF690CB64.png",
@@ -186,33 +174,39 @@
186174
"url": "https://assistantapps.com"
187175
},
188176
{
189-
"name": "Gregory F. Hogg",
190-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png",
191-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png",
177+
"name": "Logovore",
178+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/D764BF4C47BF25EEA090B7C23A8E7FAA.png",
179+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D764BF4C47BF25EEA090B7C23A8E7FAA.png",
192180
"url": "https://assistantapps.com"
193181
},
194182
{
195-
"name": "Paul Lang",
196-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/EBC01AABFFBB2CCB0A39D04CBB69D8C5.png",
197-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/EBC01AABFFBB2CCB0A39D04CBB69D8C5.png",
183+
"name": "MysticErmine",
184+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/63CF7D84409BB03CD5150E8560B855ED.png",
185+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/63CF7D84409BB03CD5150E8560B855ED.png",
198186
"url": "https://assistantapps.com"
199187
},
200188
{
201-
"name": "Stephanie Parsons",
202-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/B4C1E8292B23811594B9F7D50B43C10A.png",
203-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/B4C1E8292B23811594B9F7D50B43C10A.png",
189+
"name": "Ryan Plucker",
190+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/7E4A8CDEB3F3702F32B1DCCD7BD11A1E.png",
191+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7E4A8CDEB3F3702F32B1DCCD7BD11A1E.png",
204192
"url": "https://assistantapps.com"
205193
},
206194
{
207-
"name": "WicketG0DSs",
208-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
209-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
195+
"name": "Paul Lang",
196+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/EBC01AABFFBB2CCB0A39D04CBB69D8C5.png",
197+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/EBC01AABFFBB2CCB0A39D04CBB69D8C5.png",
210198
"url": "https://assistantapps.com"
211199
},
212200
{
213-
"name": "MEOGI",
214-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/931F9C05676AC1EAA21F3B68FEE879F9.png",
215-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/931F9C05676AC1EAA21F3B68FEE879F9.png",
201+
"name": "Gregory F. Hogg",
202+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png",
203+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png",
204+
"url": "https://assistantapps.com"
205+
},
206+
{
207+
"name": "Stephanie Parsons",
208+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/B4C1E8292B23811594B9F7D50B43C10A.png",
209+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/B4C1E8292B23811594B9F7D50B43C10A.png",
216210
"url": "https://assistantapps.com"
217211
},
218212
{
@@ -222,9 +216,9 @@
222216
"url": "https://assistantapps.com"
223217
},
224218
{
225-
"name": "Richard Oden",
226-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/0C0EB23E185AE0543883ED7804FB03FB.png",
227-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/0C0EB23E185AE0543883ED7804FB03FB.png",
219+
"name": "WicketG0DSs",
220+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
221+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
228222
"url": "https://assistantapps.com"
229223
},
230224
{
@@ -258,9 +252,15 @@
258252
"url": "https://assistantapps.com"
259253
},
260254
{
261-
"name": "Pete R",
262-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/17E9E9AAFA71DA3245DCDD3398545D21.png",
263-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/17E9E9AAFA71DA3245DCDD3398545D21.png",
255+
"name": "MEOGI",
256+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/931F9C05676AC1EAA21F3B68FEE879F9.png",
257+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/931F9C05676AC1EAA21F3B68FEE879F9.png",
258+
"url": "https://assistantapps.com"
259+
},
260+
{
261+
"name": "Mayra Lawson",
262+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/9353C168D5DE4AAE09695F2CE32E846F.png",
263+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9353C168D5DE4AAE09695F2CE32E846F.png",
264264
"url": "https://assistantapps.com"
265265
},
266266
{
@@ -275,12 +275,6 @@
275275
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/2BF49169BD89532611EDA5A00651C0A0.png",
276276
"url": "https://assistantapps.com"
277277
},
278-
{
279-
"name": "Mayra Lawson",
280-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/9353C168D5DE4AAE09695F2CE32E846F.png",
281-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9353C168D5DE4AAE09695F2CE32E846F.png",
282-
"url": "https://assistantapps.com"
283-
},
284278
{
285279
"name": "Tim Roark",
286280
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/0FEE95151EC80BDAE29EB2D4D1EDD4E9.png",
@@ -317,12 +311,24 @@
317311
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/4422CEA6F012C8F338994799459CF3A8.png",
318312
"url": "https://assistantapps.com"
319313
},
314+
{
315+
"name": "C Aramirdan",
316+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/1964EB0FF91D01C8B22CD6A0E40DC6CE.png",
317+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/1964EB0FF91D01C8B22CD6A0E40DC6CE.png",
318+
"url": "https://assistantapps.com"
319+
},
320320
{
321321
"name": "Nick",
322322
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/1290AD2AC8E1EB7EF8A40B17D0561DC3.png",
323323
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/1290AD2AC8E1EB7EF8A40B17D0561DC3.png",
324324
"url": "https://assistantapps.com"
325325
},
326+
{
327+
"name": "William Aja",
328+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/C84A9C40FD3A5A5110B9DE8DF3BBAD05.png",
329+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/C84A9C40FD3A5A5110B9DE8DF3BBAD05.png",
330+
"url": "https://assistantapps.com"
331+
},
326332
{
327333
"name": "Drew Robison",
328334
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/D98A2915E66F9DBF7CB53631FB278D9B.png",
@@ -334,29 +340,5 @@
334340
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/2B939F8876F617A2ED8EBA18E7748EAC.png",
335341
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/2B939F8876F617A2ED8EBA18E7748EAC.png",
336342
"url": "https://assistantapps.com"
337-
},
338-
{
339-
"name": "C Aramirdan",
340-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/1964EB0FF91D01C8B22CD6A0E40DC6CE.png",
341-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/1964EB0FF91D01C8B22CD6A0E40DC6CE.png",
342-
"url": "https://assistantapps.com"
343-
},
344-
{
345-
"name": "Logovore",
346-
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Logovore",
347-
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Logovore",
348-
"url": "https://assistantapps.com"
349-
},
350-
{
351-
"name": "MysticErmine",
352-
"imageUrl": "https://ui-avatars.com/api/?size=128&name=MysticEr",
353-
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=MysticEr",
354-
"url": "https://assistantapps.com"
355-
},
356-
{
357-
"name": "William Aja",
358-
"imageUrl": "https://ui-avatars.com/api/?size=128&name=William ",
359-
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=William ",
360-
"url": "https://assistantapps.com"
361343
}
362344
]

β€Žpublic/assets/data/updates.jsonβ€Ž

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
[
2+
{
3+
"guid": "aa34a4e7-7e34-4560-ae19-4a41ecc74bdb",
4+
"title": "Titan",
5+
"icon": "update/titan.png",
6+
"gameVersion": "5.55",
7+
"updateType": 2,
8+
"releaseDate": "2025-02-12T00:00:00",
9+
"postUrl": "https://www.nomanssky.com/2025/02/expedition-seventeen-titan/",
10+
"itemIds": [
11+
"build1171",
12+
"build1172",
13+
"build1173",
14+
"other842",
15+
"other846",
16+
"other847"
17+
]
18+
},
219
{
320
"guid": "a3965ec2-7fe3-4e7b-bf7a-7e9b85371d82",
421
"title": "Worlds Part II",
@@ -15,9 +32,6 @@
1532
"raw78",
1633
"raw79",
1734
"raw80",
18-
"build1171",
19-
"build1172",
20-
"build1173",
2135
"build1174",
2236
"cur291",
2337
"cur292",
@@ -103,12 +117,9 @@
103117
"other839",
104118
"other840",
105119
"other841",
106-
"other842",
107120
"other843",
108121
"other844",
109122
"other845",
110-
"other846",
111-
"other847",
112123
"other848",
113124
"other849",
114125
"other850",
@@ -137,6 +148,16 @@
137148
"tech292"
138149
]
139150
},
151+
{
152+
"guid": "79bf60fb-d535-4674-8467-61fa32b8dd29",
153+
"title": "Holiday 2024 Expeditions",
154+
"icon": "update/expeditionsRevisited2023.png",
155+
"gameVersion": "4.46",
156+
"updateType": 2,
157+
"releaseDate": "2024-11-27T00:00:00",
158+
"postUrl": "https://www.nomanssky.com/2024/11/holiday-2024-expeditions/",
159+
"itemIds": []
160+
},
140161
{
141162
"guid": "aa34a4e7-7e34-4560-ae19-4a41ecc74bdb",
142163
"title": "The Cursed",

β€Žpublic/assets/images/update/expeditionsRevisited2024.pngβ€Ž

177 KB
Loading

β€Žpublic/assets/images/update/titan-icon.pngβ€Ž

11.3 KB
Loading

β€Žpublic/assets/images/update/titan.pngβ€Ž

130 KB
Loading

β€Žpublic/assets/json/en-us/AlienPuzzle.lang.jsonβ€Ž

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@
13711371
"IsFactory": false,
13721372
"Number": 0,
13731373
"IncomingMessages": [
1374-
"Something was very wrong. The ATLAS interface had grown still, its orb cold and almost gray. The computers did not respond. Nothing did.\n\nIt took a few moments before I realized that Laylaps was gone.\n\nI was alone."
1374+
"Something was very wrong. The ATLAS interface had grown still, its orb cold and almost grey. The computers did not respond. Nothing did.\n\nIt took a few moments before I realized that Laylaps was gone.\n\nI was alone."
13751375
],
13761376
"Options": [
13771377
{
@@ -4358,7 +4358,7 @@
43584358
"Options": [
43594359
{
43604360
"Name": "Touch Monolith",
4361-
"Text": "The vengeful sprits that inhabit this place punish my disobedience.",
4361+
"Text": "The vengeful spirits that inhabit this place are grateful for my obedience.",
43624362
"RewardIds": [
43634363
"DAMAGE_TECH",
43644364
"DAMAGESMALL",
@@ -4367,7 +4367,7 @@
43674367
},
43684368
{
43694369
"Name": "Move away",
4370-
"Text": "The vengeful spirits that inhabit this place are grateful for my obedience.",
4370+
"Text": "The vengeful sprits that inhabit this place punish my disobedience.",
43714371
"InteractionId": "?TRA_FIND_PORTAL",
43724372
"RewardIds": [
43734373
"R_GEKRELIC",
@@ -4377,7 +4377,7 @@
43774377
},
43784378
{
43794379
"Name": "Wait",
4380-
"Text": "The vengeful sprits that inhabit this place punish my disobedience.",
4380+
"Text": "The vengeful spirits that inhabit this place are grateful for my obedience.",
43814381
"RewardIds": [
43824382
"DAMAGESMALL",
43834383
"STD_DEC_TRA"
@@ -15156,7 +15156,6 @@
1515615156
{
1515715157
"Name": "Deny the Atlas",
1515815158
"Text": "I leave, the Atlas, alone, abandoned.\nI feel it begin to scream, a silent shriek that echoes across all of space and time...",
15159-
"InteractionId": "ATLASSTATION_WAIT",
1516015159
"RewardIds": []
1516115160
},
1516215161
{

0 commit comments

Comments
Β (0)