Skip to content

Commit

Permalink
🔀 Merge pull request #273 from AssistantNMS/develop
Browse files Browse the repository at this point in the history
🔖 2.28.1
  • Loading branch information
Khaoz-Topsy authored Sep 29, 2024
2 parents 6ed8ecc + 00732a6 commit 4c56a71
Show file tree
Hide file tree
Showing 176 changed files with 6,796 additions and 3,218 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/flutterWindows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ permissions:

# Allow one concurrent deployment
concurrency:
group: 'build-windows'
group: "build-windows"
cancel-in-progress: true

on:
workflow_dispatch:
push:
branches: ['main']
branches: ["main"]

jobs:
build:
Expand All @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v1
with:
channel: 'stable' # 'stable', 'beta', 'dev' or 'master'
channel: "stable" # 'stable', 'beta', 'dev' or 'master'

- name: Write env file
env:
Expand All @@ -46,7 +46,7 @@ jobs:
"%programfiles(x86)%\Inno Setup 6\iscc.exe" "installers\assistantNMS.iss"
- name: Upload Artifact
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: AssistantNMS_setup
path: 'installers/AssistantNMS_setup.exe'
path: "installers/AssistantNMS_setup.exe"
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
*.iws
.idea/

# Visual Studio Code related
.vscode/

# Flutter/Dart/Pub related
**/doc/api/
.dart_tool/
Expand Down
30 changes: 15 additions & 15 deletions .metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file should be version controlled and should not be manually edited.

version:
revision: "4cf269e36de2573851eaef3c763994f8f9be494d"
revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
channel: "stable"

project_type: app
Expand All @@ -13,26 +13,26 @@ project_type: app
migration:
platforms:
- platform: root
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
- platform: android
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
- platform: ios
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
- platform: linux
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
- platform: macos
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
- platform: web
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
- platform: windows
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730

# User provided section

Expand Down
19 changes: 19 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"cSpell.words": [
"assistantapps",
"Colour",
"Colours",
"cupertino",
"descrip",
"descript",
"Displayer",
"Favourite",
"favourites",
"Imgs",
"lifeform",
"NMSUI",
"Presentor",
"RGBO",
"youtubers"
]
}
6 changes: 3 additions & 3 deletions assets/data/meta.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"GameVersion": "5.12",
"GameBuildNumber": 15728657,
"GeneratedDate": "2024-09-23"
"GameVersion": "5.13",
"GameBuildNumber": 15794152,
"GeneratedDate": "2024-09-29"
}
108 changes: 96 additions & 12 deletions assets/data/patronsBackup.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,18 @@
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/BCD210FF084C2EA92DA567C0E2D3C08C.png",
"url": "https://assistantapps.com"
},
{
"name": "Arshad Omari",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.png",
"url": "https://assistantapps.com"
},
{
"name": "Jason Rich",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/3EDB6BDFBDD09DD4DEB0DEB2CEC87C04.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/3EDB6BDFBDD09DD4DEB0DEB2CEC87C04.png",
"url": "https://assistantapps.com"
},
{
"name": "Arshad Omari",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.png",
"url": "https://assistantapps.com"
},
{
"name": "Ryan Plucker",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/7E4A8CDEB3F3702F32B1DCCD7BD11A1E.png",
Expand Down Expand Up @@ -179,18 +179,18 @@
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9D055DEC18EDF3FC779761BC38B25260.png",
"url": "https://assistantapps.com"
},
{
"name": "WicketG0DSs",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
"url": "https://assistantapps.com"
},
{
"name": "griff2877",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/64547E8411DE881D1602DE08B4410E94.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/64547E8411DE881D1602DE08B4410E94.png",
"url": "https://assistantapps.com"
},
{
"name": "WicketG0DSs",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
"url": "https://assistantapps.com"
},
{
"name": "StormKingPryde",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/DF5CF7E65325CBA8C6824C232B917927.png",
Expand Down Expand Up @@ -257,6 +257,24 @@
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/4CC889D3E7696A7657F14CBBA0A86D07.png",
"url": "https://assistantapps.com"
},
{
"name": "qcreator",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/E5F40623D71D58151F0404C461488E8F.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/E5F40623D71D58151F0404C461488E8F.png",
"url": "https://assistantapps.com"
},
{
"name": "Richard Oden",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/0C0EB23E185AE0543883ED7804FB03FB.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/0C0EB23E185AE0543883ED7804FB03FB.png",
"url": "https://assistantapps.com"
},
{
"name": "CJ Stafford",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/F887496E66A43CC1588DF1AFAD539896.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F887496E66A43CC1588DF1AFAD539896.png",
"url": "https://assistantapps.com"
},
{
"name": "Drew Robison",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/D98A2915E66F9DBF7CB53631FB278D9B.png",
Expand Down Expand Up @@ -286,5 +304,71 @@
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/62FE8E70E895F219182214AD69CF624C.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/62FE8E70E895F219182214AD69CF624C.png",
"url": "https://assistantapps.com"
},
{
"name": "Victor",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/18862F3E50853851B28A225EC50821E3.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/18862F3E50853851B28A225EC50821E3.png",
"url": "https://assistantapps.com"
},
{
"name": "Helpmestephbro",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/4305E481B3918126DD664BFD5098EB7F.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/4305E481B3918126DD664BFD5098EB7F.png",
"url": "https://assistantapps.com"
},
{
"name": "Ulises Camarena",
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Ulises C",
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Ulises C",
"url": "https://assistantapps.com"
},
{
"name": "Christopher Rowan",
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Christop",
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Christop",
"url": "https://assistantapps.com"
},
{
"name": "Yuriy Ulianov",
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Yuriy Ul",
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Yuriy Ul",
"url": "https://assistantapps.com"
},
{
"name": "Iris Brintnall",
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Iris Bri",
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Iris Bri",
"url": "https://assistantapps.com"
},
{
"name": "Matt Gamret",
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Matt Gam",
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Matt Gam",
"url": "https://assistantapps.com"
},
{
"name": "Callum Conifey",
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Callum C",
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Callum C",
"url": "https://assistantapps.com"
},
{
"name": "adam oedekoven",
"imageUrl": "https://ui-avatars.com/api/?size=128&name=adam oed",
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=adam oed",
"url": "https://assistantapps.com"
},
{
"name": "Ryuu_X-71 RK_X-71",
"imageUrl": "https://ui-avatars.com/api/?size=128&name=Ryuu_X-7",
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=Ryuu_X-7",
"url": "https://assistantapps.com"
},
{
"name": "John Wheat",
"imageUrl": "https://ui-avatars.com/api/?size=128&name=John Whe",
"thumbnailUrl": "https://ui-avatars.com/api/?size=128&name=John Whe",
"url": "https://assistantapps.com"
}
]
2 changes: 1 addition & 1 deletion assets/json/de/Buildings.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -24181,7 +24181,7 @@
{
"Id": "build1130",
"Icon": "building/1130.png",
"Name": "Fiberglas-Oberlicht-Dach",
"Name": "Legierungs-Oberlicht-Dach",
"Group": "Legierungs-Konstruktionskomponente",
"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.",
"BaseValueUnits": 1.0,
Expand Down
Loading

0 comments on commit 4c56a71

Please sign in to comment.