Skip to content

Commit 4c56a71

Browse files
authored
🔀 Merge pull request #273 from AssistantNMS/develop
🔖 2.28.1
2 parents 6ed8ecc + 00732a6 commit 4c56a71

File tree

176 files changed

+6796
-3218
lines changed

Some content is hidden

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

176 files changed

+6796
-3218
lines changed

.github/workflows/flutterWindows.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ permissions:
77

88
# Allow one concurrent deployment
99
concurrency:
10-
group: 'build-windows'
10+
group: "build-windows"
1111
cancel-in-progress: true
1212

1313
on:
1414
workflow_dispatch:
1515
push:
16-
branches: ['main']
16+
branches: ["main"]
1717

1818
jobs:
1919
build:
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/checkout@v4
2727
- uses: subosito/flutter-action@v1
2828
with:
29-
channel: 'stable' # 'stable', 'beta', 'dev' or 'master'
29+
channel: "stable" # 'stable', 'beta', 'dev' or 'master'
3030

3131
- name: Write env file
3232
env:
@@ -46,7 +46,7 @@ jobs:
4646
"%programfiles(x86)%\Inno Setup 6\iscc.exe" "installers\assistantNMS.iss"
4747
4848
- name: Upload Artifact
49-
uses: actions/upload-artifact@v1
49+
uses: actions/upload-artifact@v4
5050
with:
5151
name: AssistantNMS_setup
52-
path: 'installers/AssistantNMS_setup.exe'
52+
path: "installers/AssistantNMS_setup.exe"

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
*.iws
1616
.idea/
1717

18-
# Visual Studio Code related
19-
.vscode/
20-
2118
# Flutter/Dart/Pub related
2219
**/doc/api/
2320
.dart_tool/

.metadata

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "4cf269e36de2573851eaef3c763994f8f9be494d"
7+
revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,26 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
17-
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
16+
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
17+
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
1818
- platform: android
19-
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
20-
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
19+
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
20+
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
2121
- platform: ios
22-
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
23-
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
22+
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
23+
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
2424
- platform: linux
25-
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
26-
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
25+
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
26+
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
2727
- platform: macos
28-
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
29-
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
28+
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
29+
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
3030
- platform: web
31-
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
32-
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
31+
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
32+
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
3333
- platform: windows
34-
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
35-
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
34+
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
35+
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
3636

3737
# User provided section
3838

.vscode/settings.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"cSpell.words": [
3+
"assistantapps",
4+
"Colour",
5+
"Colours",
6+
"cupertino",
7+
"descrip",
8+
"descript",
9+
"Displayer",
10+
"Favourite",
11+
"favourites",
12+
"Imgs",
13+
"lifeform",
14+
"NMSUI",
15+
"Presentor",
16+
"RGBO",
17+
"youtubers"
18+
]
19+
}

assets/data/meta.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"GameVersion": "5.12",
3-
"GameBuildNumber": 15728657,
4-
"GeneratedDate": "2024-09-23"
2+
"GameVersion": "5.13",
3+
"GameBuildNumber": 15794152,
4+
"GeneratedDate": "2024-09-29"
55
}

assets/data/patronsBackup.json

Lines changed: 96 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,18 @@
113113
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/BCD210FF084C2EA92DA567C0E2D3C08C.png",
114114
"url": "https://assistantapps.com"
115115
},
116-
{
117-
"name": "Arshad Omari",
118-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.png",
119-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.png",
120-
"url": "https://assistantapps.com"
121-
},
122116
{
123117
"name": "Jason Rich",
124118
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/3EDB6BDFBDD09DD4DEB0DEB2CEC87C04.png",
125119
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/3EDB6BDFBDD09DD4DEB0DEB2CEC87C04.png",
126120
"url": "https://assistantapps.com"
127121
},
122+
{
123+
"name": "Arshad Omari",
124+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.png",
125+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.png",
126+
"url": "https://assistantapps.com"
127+
},
128128
{
129129
"name": "Ryan Plucker",
130130
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/7E4A8CDEB3F3702F32B1DCCD7BD11A1E.png",
@@ -179,18 +179,18 @@
179179
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9D055DEC18EDF3FC779761BC38B25260.png",
180180
"url": "https://assistantapps.com"
181181
},
182-
{
183-
"name": "WicketG0DSs",
184-
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
185-
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
186-
"url": "https://assistantapps.com"
187-
},
188182
{
189183
"name": "griff2877",
190184
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/64547E8411DE881D1602DE08B4410E94.png",
191185
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/64547E8411DE881D1602DE08B4410E94.png",
192186
"url": "https://assistantapps.com"
193187
},
188+
{
189+
"name": "WicketG0DSs",
190+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
191+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
192+
"url": "https://assistantapps.com"
193+
},
194194
{
195195
"name": "StormKingPryde",
196196
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/DF5CF7E65325CBA8C6824C232B917927.png",
@@ -257,6 +257,24 @@
257257
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/4CC889D3E7696A7657F14CBBA0A86D07.png",
258258
"url": "https://assistantapps.com"
259259
},
260+
{
261+
"name": "qcreator",
262+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/E5F40623D71D58151F0404C461488E8F.png",
263+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/E5F40623D71D58151F0404C461488E8F.png",
264+
"url": "https://assistantapps.com"
265+
},
266+
{
267+
"name": "Richard Oden",
268+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/0C0EB23E185AE0543883ED7804FB03FB.png",
269+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/0C0EB23E185AE0543883ED7804FB03FB.png",
270+
"url": "https://assistantapps.com"
271+
},
272+
{
273+
"name": "CJ Stafford",
274+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/F887496E66A43CC1588DF1AFAD539896.png",
275+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F887496E66A43CC1588DF1AFAD539896.png",
276+
"url": "https://assistantapps.com"
277+
},
260278
{
261279
"name": "Drew Robison",
262280
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/D98A2915E66F9DBF7CB53631FB278D9B.png",
@@ -286,5 +304,71 @@
286304
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/62FE8E70E895F219182214AD69CF624C.png",
287305
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/62FE8E70E895F219182214AD69CF624C.png",
288306
"url": "https://assistantapps.com"
307+
},
308+
{
309+
"name": "Victor",
310+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/18862F3E50853851B28A225EC50821E3.png",
311+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/18862F3E50853851B28A225EC50821E3.png",
312+
"url": "https://assistantapps.com"
313+
},
314+
{
315+
"name": "Helpmestephbro",
316+
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/4305E481B3918126DD664BFD5098EB7F.png",
317+
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/4305E481B3918126DD664BFD5098EB7F.png",
318+
"url": "https://assistantapps.com"
319+
},
320+
{
321+
"name": "Ulises Camarena",
322+
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Ulises C",
323+
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Ulises C",
324+
"url": "https://assistantapps.com"
325+
},
326+
{
327+
"name": "Christopher Rowan",
328+
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Christop",
329+
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Christop",
330+
"url": "https://assistantapps.com"
331+
},
332+
{
333+
"name": "Yuriy Ulianov",
334+
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Yuriy Ul",
335+
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Yuriy Ul",
336+
"url": "https://assistantapps.com"
337+
},
338+
{
339+
"name": "Iris Brintnall",
340+
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Iris Bri",
341+
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Iris Bri",
342+
"url": "https://assistantapps.com"
343+
},
344+
{
345+
"name": "Matt Gamret",
346+
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Matt Gam",
347+
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Matt Gam",
348+
"url": "https://assistantapps.com"
349+
},
350+
{
351+
"name": "Callum Conifey",
352+
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Callum C",
353+
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Callum C",
354+
"url": "https://assistantapps.com"
355+
},
356+
{
357+
"name": "adam oedekoven",
358+
"imageUrl": "https://ui-avatars.com/api/?size=128&name=adam oed",
359+
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=adam oed",
360+
"url": "https://assistantapps.com"
361+
},
362+
{
363+
"name": "Ryuu_X-71 RK_X-71",
364+
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Ryuu_X-7",
365+
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Ryuu_X-7",
366+
"url": "https://assistantapps.com"
367+
},
368+
{
369+
"name": "John Wheat",
370+
"imageUrl": "https://ui-avatars.com/api/?size=128&name=John Whe",
371+
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=John Whe",
372+
"url": "https://assistantapps.com"
289373
}
290374
]

assets/json/de/Buildings.lang.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24181,7 +24181,7 @@
2418124181
{
2418224182
"Id": "build1130",
2418324183
"Icon": "building/1130.png",
24184-
"Name": "Fiberglas-Oberlicht-Dach",
24184+
"Name": "Legierungs-Oberlicht-Dach",
2418524185
"Group": "Legierungs-Konstruktionskomponente",
2418624186
"Description": "Verstärkte <TECHNOLOGY>Legierungs<>-Gebäudekomponente. Weit verbreitet in einfachen Gebäuden in der ganzen Galaxie.\n\nEntspricht den universellen Baustandards 2.3b und gewährleistet maximale Kompatibilität mit anderen vorgefertigten Gebäuden. Das schnelle Einschnappen des Rasters ermöglicht den problemlosen Zusammenbau benutzerdefinierter Unterkünfte.",
2418724187
"BaseValueUnits": 1.0,

0 commit comments

Comments
 (0)