Skip to content

Commit 6ed8ecc

Browse files
Khaoz-TopsyKhaoz-Topsy
authored
🔀 Merge pull request #271 from AssistantNMS/develop
🔖 2.28.0
2 parents d645ae2 + e74976f commit 6ed8ecc

File tree

236 files changed

+59685
-5563
lines changed

Some content is hidden

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

236 files changed

+59685
-5563
lines changed

‎.metadata

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
# This file tracks properties of this Flutter project.
22
# Used by Flutter tool to assess capabilities and perform upgrades etc.
33
#
4-
# This file should be version controlled.
4+
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
8-
channel: master
7+
revision: "4cf269e36de2573851eaef3c763994f8f9be494d"
8+
channel: "stable"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
17-
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
16+
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
17+
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
1818
- platform: android
19-
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
20-
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
19+
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
20+
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
2121
- platform: ios
22-
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
23-
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
22+
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
23+
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
2424
- platform: linux
25-
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
26-
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
25+
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
26+
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
2727
- platform: macos
28-
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
29-
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
28+
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
29+
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
3030
- platform: web
31-
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
32-
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
31+
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
32+
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
3333
- platform: windows
34-
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
35-
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
34+
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
35+
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
3636

3737
# User provided section
3838

‎android/app/build.gradle

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if (releaseKeystorePropertiesFile.exists()) {
3333
}
3434

3535
android {
36-
compileSdkVersion 33
36+
compileSdkVersion 34
3737

3838
sourceSets {
3939
main.java.srcDirs += 'src/main/kotlin'
@@ -45,8 +45,8 @@ android {
4545

4646
defaultConfig {
4747
applicationId "com.kurtlourens.no_mans_sky_recipes"
48-
minSdkVersion 23
49-
targetSdkVersion 33
48+
minSdkVersion 25
49+
targetSdkVersion 34
5050
versionCode flutterVersionCode.toInteger()
5151
versionName flutterVersionName
5252
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -90,29 +90,3 @@ android {
9090
flutter {
9191
source '../..'
9292
}
93-
94-
dependencies {
95-
testImplementation 'junit:junit:4.12'
96-
androidTestImplementation 'androidx.test:runner:1.1.1'
97-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
98-
// implementation 'com.android.support:multidex:1.0.3'
99-
100-
// Android 12 bugfix
101-
implementation "androidx.work:work-runtime-ktx:2.8.0-alpha01"
102-
103-
// firebase
104-
implementation 'com.google.firebase:firebase-analytics:17.4.1'
105-
implementation 'com.google.firebase:firebase-messaging:20.1.7'
106-
107-
// Kotlin
108-
api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50'
109-
def multidex_version = "2.0.1"
110-
implementation "androidx.multidex:multidex:$multidex_version"
111-
112-
// Google Pay
113-
implementation 'com.google.android.gms:play-services-ads:19.1.0'
114-
implementation 'com.google.android.gms:play-services-wallet:18.0.0'
115-
implementation 'com.android.support:appcompat-v7:24.1.1'
116-
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
117-
}
118-
apply plugin: 'com.google.gms.google-services'

‎android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@
2828
<meta-data android:name="flutterEmbedding" android:value="2" />
2929
<uses-permission android:name="android.permission.INTERNET" />
3030
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
31+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
3132
</manifest>

‎android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:7.0.0'
13-
classpath 'com.google.gms:google-services:4.3.8'
12+
classpath 'com.android.tools.build:gradle:7.1.2'
13+
classpath 'com.google.gms:google-services:4.4.2'
1414
classpath 'com.google.errorprone:error_prone_annotations:2.3.3'
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1616
}

‎android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx4608m
22

33
android.enableR8=true
44
android.useAndroidX=true

‎assets/data/alphabetTranslations.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,5 +266,9 @@
266266
{
267267
"AppId": "build1139",
268268
"Text": "Liquidators"
269+
},
270+
{
271+
"AppId": "build1140",
272+
"Text": "Gone Fishing"
269273
}
270274
]

‎assets/data/bait.json

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
[
2+
{
3+
"Id": "FISHBAIT_1",
4+
"AppId": "cur107",
5+
"RarityBoosts": {
6+
"Junk": 0.0,
7+
"Common": 0.9,
8+
"Rare": 2.0,
9+
"Epic": 1.5,
10+
"Legendary": 1.2
11+
},
12+
"SizeBoosts": {
13+
"Small": 1.0,
14+
"Medium": 1.0,
15+
"Large": 1.0,
16+
"ExtraLarge": 1.0
17+
},
18+
"DayTimeBoost": 1.0,
19+
"NightTimeBoost": 1.0,
20+
"StormBoost": 1.0
21+
},
22+
{
23+
"Id": "FISHBAIT_2",
24+
"AppId": "cur108",
25+
"RarityBoosts": {
26+
"Junk": 0.0,
27+
"Common": 0.35,
28+
"Rare": 1.1,
29+
"Epic": 5.0,
30+
"Legendary": 1.5
31+
},
32+
"SizeBoosts": {
33+
"Small": 1.0,
34+
"Medium": 1.0,
35+
"Large": 1.0,
36+
"ExtraLarge": 1.0
37+
},
38+
"DayTimeBoost": 1.0,
39+
"NightTimeBoost": 1.0,
40+
"StormBoost": 1.0
41+
},
42+
{
43+
"Id": "FISHBAIT_3",
44+
"AppId": "cur109",
45+
"RarityBoosts": {
46+
"Junk": 0.0,
47+
"Common": 0.1,
48+
"Rare": 0.66,
49+
"Epic": 5.0,
50+
"Legendary": 2.5
51+
},
52+
"SizeBoosts": {
53+
"Small": 1.0,
54+
"Medium": 1.0,
55+
"Large": 1.0,
56+
"ExtraLarge": 1.0
57+
},
58+
"DayTimeBoost": 1.0,
59+
"NightTimeBoost": 1.0,
60+
"StormBoost": 1.0
61+
},
62+
{
63+
"Id": "FISHBAIT_DAY",
64+
"AppId": "cur110",
65+
"RarityBoosts": {
66+
"Junk": 0.0,
67+
"Common": 1.0,
68+
"Rare": 1.3,
69+
"Epic": 2.0,
70+
"Legendary": 1.5
71+
},
72+
"SizeBoosts": {
73+
"Small": 1.0,
74+
"Medium": 1.0,
75+
"Large": 1.0,
76+
"ExtraLarge": 1.0
77+
},
78+
"DayTimeBoost": 8.0,
79+
"NightTimeBoost": 1.0,
80+
"StormBoost": 1.0
81+
},
82+
{
83+
"Id": "FISHBAIT_NIGHT",
84+
"AppId": "cur111",
85+
"RarityBoosts": {
86+
"Junk": 0.0,
87+
"Common": 1.0,
88+
"Rare": 1.3,
89+
"Epic": 2.0,
90+
"Legendary": 1.5
91+
},
92+
"SizeBoosts": {
93+
"Small": 1.0,
94+
"Medium": 1.0,
95+
"Large": 1.0,
96+
"ExtraLarge": 1.0
97+
},
98+
"DayTimeBoost": 1.0,
99+
"NightTimeBoost": 8.0,
100+
"StormBoost": 1.0
101+
},
102+
{
103+
"Id": "FISHBAIT_STORM",
104+
"AppId": "cur112",
105+
"RarityBoosts": {
106+
"Junk": 0.0,
107+
"Common": 1.0,
108+
"Rare": 1.3,
109+
"Epic": 2.0,
110+
"Legendary": 1.5
111+
},
112+
"SizeBoosts": {
113+
"Small": 1.0,
114+
"Medium": 1.0,
115+
"Large": 1.0,
116+
"ExtraLarge": 1.0
117+
},
118+
"DayTimeBoost": 1.0,
119+
"NightTimeBoost": 1.0,
120+
"StormBoost": 5.2
121+
}
122+
]

‎assets/data/donationsBackup.json

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
[
2+
{
3+
"guid": "08b3e895-696f-43a5-b035-319bd2831823",
4+
"username": "Spieleklecks",
5+
"type": "BuyMeACoffee",
6+
"date": "2024-09-06T06:58:00Z"
7+
},
8+
{
9+
"guid": "6b1c2d77-3dd0-42ee-b9ff-0747d8669427",
10+
"username": "Someone",
11+
"type": "BuyMeACoffee",
12+
"date": "2024-09-06T05:23:00Z"
13+
},
214
{
315
"guid": "649fd781-6034-42af-9417-59bbf8ec699a",
416
"username": "Fatamoub",
@@ -1008,14 +1020,14 @@
10081020
"date": "2019-10-07T12:01:00Z"
10091021
},
10101022
{
1011-
"guid": "ad8a3a9b-0251-49c0-a5e5-49bddd76fb4f",
1012-
"username": "Tanguy le Blanc",
1023+
"guid": "dbec8044-d8da-4c1a-8ae1-498b24b84faa",
1024+
"username": "Randy Weeks",
10131025
"type": "Paypal",
10141026
"date": "2019-10-06T12:01:00Z"
10151027
},
10161028
{
1017-
"guid": "dbec8044-d8da-4c1a-8ae1-498b24b84faa",
1018-
"username": "Randy Weeks",
1029+
"guid": "ad8a3a9b-0251-49c0-a5e5-49bddd76fb4f",
1030+
"username": "Tanguy le Blanc",
10191031
"type": "Paypal",
10201032
"date": "2019-10-06T12:01:00Z"
10211033
},

‎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.11",
3-
"GameBuildNumber": 15605371,
4-
"GeneratedDate": "2024-09-06"
2+
"GameVersion": "5.12",
3+
"GameBuildNumber": 15728657,
4+
"GeneratedDate": "2024-09-23"
55
}

0 commit comments

Comments
 (0)