Skip to content

Commit

Permalink
🔀 Merge pull request #243 from AssistantNMS/develop
Browse files Browse the repository at this point in the history
🔖 2.22.0
  • Loading branch information
Khaoz-Topsy authored Feb 5, 2024
2 parents 038739f + edd4634 commit 23a9b0c
Show file tree
Hide file tree
Showing 35 changed files with 285 additions and 387 deletions.
23 changes: 16 additions & 7 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.kurtlourens.no_mans_sky_recipes">
<application android:label="Assistant for No Man's Sky" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:usesCleartextTraffic="true">
<activity android:exported="true" android:name="io.flutter.embedding.android.FlutterActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.kurtlourens.no_mans_sky_recipes">
<application android:label="Assistant for No Man's Sky" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round" android:usesCleartextTraffic="true">
<activity android:exported="true"
android:name="io.flutter.embedding.android.FlutterActivity"
android:launchMode="singleTop" android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<meta-data android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="ca-app-pub-6788092250018822~2121998241" />
<meta-data android:name="com.google.android.gms.ads.APPLICATION_ID"
android:value="ca-app-pub-6788092250018822~2121998241" />
<meta-data android:name="com.google.android.gms.wallet.api.enabled" android:value="true" />
<receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
<receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
<receiver
android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
<receiver android:exported="true"
android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED">
</action>
Expand All @@ -19,4 +28,4 @@
<meta-data android:name="flutterEmbedding" android:value="2" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
</manifest>
</manifest>
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": "4.47",
"GameBuildNumber": 12971329,
"GeneratedDate": "2024-01-02"
"GameVersion": "4.48",
"GameBuildNumber": 13084894,
"GeneratedDate": "2024-02-05"
}
78 changes: 36 additions & 42 deletions assets/data/patronsBackup.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,30 @@
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/ED9C91D2FE5AAD1EE73BC335262D137F.png",
"url": "https://assistantapps.com"
},
{
"name": "Miked",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/F1B99D864863A4B973E1CC17FEBBCB22.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F1B99D864863A4B973E1CC17FEBBCB22.png",
"url": "https://assistantapps.com"
},
{
"name": "Robert J. Grasmuck",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/7BC69DFF9073C4095CDFF66E3FF59F73.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7BC69DFF9073C4095CDFF66E3FF59F73.png",
"url": "https://assistantapps.com"
},
{
"name": "Miked",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/F1B99D864863A4B973E1CC17FEBBCB22.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F1B99D864863A4B973E1CC17FEBBCB22.png",
"url": "https://assistantapps.com"
},
{
"name": "Zig Justice",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/678B05CAC113685E13841EDA3A55EC5D.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/678B05CAC113685E13841EDA3A55EC5D.png",
"url": "https://assistantapps.com"
},
{
"name": "evanjpw",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/DD21247329CC4E7DCE5B2F8F58C1D8CE.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DD21247329CC4E7DCE5B2F8F58C1D8CE.png",
"url": "https://assistantapps.com"
},
{
"name": "cyberpunk2350",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/2710524A9D208523926238EA123749E9.png",
Expand Down Expand Up @@ -59,18 +65,6 @@
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9D164DB8AB45EC2616D52CA92EEE2CBF.png",
"url": "https://assistantapps.com"
},
{
"name": "evanjpw",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/DD21247329CC4E7DCE5B2F8F58C1D8CE.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DD21247329CC4E7DCE5B2F8F58C1D8CE.png",
"url": "https://assistantapps.com"
},
{
"name": "christopher perkins",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/FA9FE210914BA3B97BA99F05F233924D.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/FA9FE210914BA3B97BA99F05F233924D.png",
"url": "https://assistantapps.com"
},
{
"name": "chrisagiddings",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/AD2DB07A3A0A976AAC85AA5B0FF4E898.png",
Expand All @@ -84,9 +78,9 @@
"url": "https://assistantapps.com"
},
{
"name": "nyxsis",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/D5D8C41865D8A28075F8BFD30E93BFA2.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D5D8C41865D8A28075F8BFD30E93BFA2.png",
"name": "christopher perkins",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/FA9FE210914BA3B97BA99F05F233924D.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/FA9FE210914BA3B97BA99F05F233924D.png",
"url": "https://assistantapps.com"
},
{
Expand All @@ -95,6 +89,12 @@
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D994924AA5EF51C5BDFBFBDAC12A04FF.png",
"url": "https://assistantapps.com"
},
{
"name": "nyxsis",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/D5D8C41865D8A28075F8BFD30E93BFA2.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D5D8C41865D8A28075F8BFD30E93BFA2.png",
"url": "https://assistantapps.com"
},
{
"name": "Alistair",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/48CFDD47C31B9CA61068EAF6762E9932.png",
Expand Down Expand Up @@ -149,12 +149,6 @@
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/BCD210FF084C2EA92DA567C0E2D3C08C.png",
"url": "https://assistantapps.com"
},
{
"name": "hedge",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/AAA55602849BBC341939275ED809BC4A.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/AAA55602849BBC341939275ED809BC4A.png",
"url": "https://assistantapps.com"
},
{
"name": "Ryan Plucker",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/7E4A8CDEB3F3702F32B1DCCD7BD11A1E.png",
Expand Down Expand Up @@ -192,9 +186,9 @@
"url": "https://assistantapps.com"
},
{
"name": "Bob Hicks",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/DD1C7D1D53DF36A2EE6BEE497DFA5F59.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DD1C7D1D53DF36A2EE6BEE497DFA5F59.png",
"name": "HunterFlakeDigitalContent",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/9562503CD06F0D1C493E08873DAE7F00.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9562503CD06F0D1C493E08873DAE7F00.png",
"url": "https://assistantapps.com"
},
{
Expand All @@ -203,6 +197,12 @@
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F747B6016A3E3C3F8F1A60CF3494CA58.png",
"url": "https://assistantapps.com"
},
{
"name": "MEOGI",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/931F9C05676AC1EAA21F3B68FEE879F9.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/931F9C05676AC1EAA21F3B68FEE879F9.png",
"url": "https://assistantapps.com"
},
{
"name": "Palis Airuta",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/48F55AF63BF651EA9264F22310E716C5.png",
Expand All @@ -227,18 +227,6 @@
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9CF50630ADBF46DD1F8C3BC5874B518F.png",
"url": "https://assistantapps.com"
},
{
"name": "Arcadie",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/7B48FDA94614713E7E91CB53CCAF1552.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7B48FDA94614713E7E91CB53CCAF1552.png",
"url": "https://assistantapps.com"
},
{
"name": "Galactic Monkeh",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/4422CEA6F012C8F338994799459CF3A8.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/4422CEA6F012C8F338994799459CF3A8.png",
"url": "https://assistantapps.com"
},
{
"name": "Jdia Plum",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/97A74E429C4BDDDE7FA1A82AF690CB64.png",
Expand All @@ -257,6 +245,12 @@
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/64547E8411DE881D1602DE08B4410E94.png",
"url": "https://assistantapps.com"
},
{
"name": "Galactic Monkeh",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/4422CEA6F012C8F338994799459CF3A8.png",
"thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/4422CEA6F012C8F338994799459CF3A8.png",
"url": "https://assistantapps.com"
},
{
"name": "Nick",
"imageUrl": "https://cdn-usr.assistantapps.com/patreon/1290AD2AC8E1EB7EF8A40B17D0561DC3.png",
Expand Down
10 changes: 10 additions & 0 deletions assets/data/updates.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
[
{
"guid": "68cc6afa-ffeb-4fcf-ad22-941460a68591",
"title": "Holiday 2023 Expeditions",
"icon": "update/expeditionsRevisited2023.png",
"gameVersion": "4.46",
"updateType": 2,
"releaseDate": "2023-12-08T00:00:00",
"postUrl": "https://www.nomanssky.com/2023/12/holiday-2023-expeditions/",
"itemIds": []
},
{
"guid": "30f117ed-cdd9-4781-a26d-b2460c9a43ae",
"title": "Echoes",
Expand Down
Binary file added assets/guide/HowToCreateAutoDoor/firstPart.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 69 additions & 0 deletions assets/guide/HowToCreateAutoDoor/guide.en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"guid": "f0ae51c5-9e29-a3d5-cb3f-a53c2bacb144",
"title": "How to Create an Automatic Door",
"shortTitle": "Automatic Door",
"showCreatedByUser": true,
"author": "Muhaddil",
"image": "guide.png",
"languageCode": "en",
"minutes": 10,
"date": "2024-01-13T22:01:09.776Z",
"tags": [
"Echoes",
"Construction"
],
"sections": [
{
"heading": "Requirements",
"items": [
{
"type": "text",
"content": "You need any kind of switch you wantand the most important part, the power inverter."
},
{
"type": "image",
"image": "requirements.png"
}
]
},
{
"heading": "First part (easy)",
"items": [
{
"type": "text",
"content": "Firstly we place the switch, in my case I'm using the proximity switch, but you can use other switches only thing that changes it's the switch position. "
},
{
"type": "image",
"image": "firstPart.jpeg"
}
]
},
{
"heading": "Second Part",
"items": [
{
"type": "image",
"image": "secondPart.jpg"
},
{
"type": "text",
"content": "We put a power inverter anywhere we want. Then we connect a cable that has current to the input of the switch and to the input of the inverter (it is important that it is to the input that is replicated on the opposite side). Secondly, we connect the output of the switch to the input that is not replicated of the inverter, that is, to the one that is perpendicular to the one to which we have previously connected the live cable. Finally, we connect a cable to the free input of the inverter and connect it to the door.And we would have our door that opens automatically when we approach."
}
]
},
{
"heading": "Other examples",
"items": [
{
"type": "text",
"content": "If you don't want to use the proximity switch you can always use other switches like the floor switch, here is an example of that.\nWe do the same as in the previous example but we connect it to the new switch, here is a scheme"
},
{
"type": "image",
"image": "otherExample.jpg"
}
]
}
]
}
Binary file added assets/guide/HowToCreateAutoDoor/guide.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/guide/HowToCreateAutoDoor/secondPart.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions assets/json/de/Guides.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,9 @@
{
"folder": "TheLoreAndPlot",
"file": "guide.en"
},
{
"folder": "HowToCreateAutoDoor",
"file": "guide.en"
}
]
4 changes: 4 additions & 0 deletions assets/json/en/Guides.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,9 @@
{
"folder": "TheLoreAndPlot",
"file": "guide.en"
},
{
"folder": "HowToCreateAutoDoor",
"file": "guide.en"
}
]
4 changes: 4 additions & 0 deletions assets/json/es/Guides.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,9 @@
{
"folder": "TheLoreAndPlot",
"file": "guide.en"
},
{
"folder": "HowToCreateAutoDoor",
"file": "guide.en"
}
]
4 changes: 4 additions & 0 deletions assets/json/fr/Guides.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,9 @@
{
"folder": "TheLoreAndPlot",
"file": "guide.en"
},
{
"folder": "HowToCreateAutoDoor",
"file": "guide.en"
}
]
4 changes: 4 additions & 0 deletions assets/json/it/Guides.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,9 @@
{
"folder": "TheLoreAndPlot",
"file": "guide.en"
},
{
"folder": "HowToCreateAutoDoor",
"file": "guide.en"
}
]
4 changes: 4 additions & 0 deletions assets/json/pt-br/Guides.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,9 @@
{
"folder": "TheLoreAndPlot",
"file": "guide.en"
},
{
"folder": "HowToCreateAutoDoor",
"file": "guide.en"
}
]
10 changes: 5 additions & 5 deletions assets/lang/language.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,9 @@
"tapAndHoldToDrag": "Mantén pulsado un objeto para arrastrarlo y cambiar el orden ",
"copiedToClipboard": "Copiado al portapapeles",
"ukrainian": "Ucraniano",
"showReduxExpeditions": "Show Redux Expeditions",
"optional": "Optional",
"dataFromNMSCD": "Data below supplied by the NMSCD",
"communityMissionProgressTracker": "Community Mission Progress Tracker",
"hashCode": "872D3747F0395AAB30E3125F42210284"
"showReduxExpeditions": "Mostrar las Expediciones Redux",
"optional": "Opcional",
"dataFromNMSCD": "Datos a continuación proporcionados por NMSCD",
"communityMissionProgressTracker": "Seguimiento del Progreso de la Misión Comunitaria",
"hashCode": "03EF18131FF50800832D3FA489622D92"
}
10 changes: 5 additions & 5 deletions assets/lang/language.fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,9 @@
"tapAndHoldToDrag": "Touchez et tirez un objet pour changer l’ordre",
"copiedToClipboard": "Copié dans le presse-papier",
"ukrainian": "Ukrainien",
"showReduxExpeditions": "Show Redux Expeditions",
"optional": "Optional",
"dataFromNMSCD": "Data below supplied by the NMSCD",
"communityMissionProgressTracker": "Community Mission Progress Tracker",
"hashCode": "34141907A1878ECA344DC3B6A26C781B"
"showReduxExpeditions": "Afficher les expéditions Redux",
"optional": "Facultatif",
"dataFromNMSCD": "Données ci-dessous fournies par le NMSCD",
"communityMissionProgressTracker": "Suivi des progrès de la mission communautaire",
"hashCode": "BE1F686F362FBD510295B64553B1E594"
}
Loading

0 comments on commit 23a9b0c

Please sign in to comment.