Skip to content

Commit

Permalink
🔀 Merge pull request #271 from AssistantNMS/develop
Browse files Browse the repository at this point in the history
🔖 2.28.0
  • Loading branch information
Khaoz-Topsy authored Sep 23, 2024
2 parents d645ae2 + e74976f commit 6ed8ecc
Show file tree
Hide file tree
Showing 236 changed files with 59,685 additions and 5,563 deletions.
34 changes: 17 additions & 17 deletions .metadata
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled.
# This file should be version controlled and should not be manually edited.

version:
revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
channel: master
revision: "4cf269e36de2573851eaef3c763994f8f9be494d"
channel: "stable"

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: android
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: ios
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: linux
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: macos
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: web
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: windows
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d

# User provided section

Expand Down
32 changes: 3 additions & 29 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if (releaseKeystorePropertiesFile.exists()) {
}

android {
compileSdkVersion 33
compileSdkVersion 34

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -45,8 +45,8 @@ android {

defaultConfig {
applicationId "com.kurtlourens.no_mans_sky_recipes"
minSdkVersion 23
targetSdkVersion 33
minSdkVersion 25
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -90,29 +90,3 @@ android {
flutter {
source '../..'
}

dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
// implementation 'com.android.support:multidex:1.0.3'

// Android 12 bugfix
implementation "androidx.work:work-runtime-ktx:2.8.0-alpha01"

// firebase
implementation 'com.google.firebase:firebase-analytics:17.4.1'
implementation 'com.google.firebase:firebase-messaging:20.1.7'

// Kotlin
api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50'
def multidex_version = "2.0.1"
implementation "androidx.multidex:multidex:$multidex_version"

// Google Pay
implementation 'com.google.android.gms:play-services-ads:19.1.0'
implementation 'com.google.android.gms:play-services-wallet:18.0.0'
implementation 'com.android.support:appcompat-v7:24.1.1'
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
}
apply plugin: 'com.google.gms.google-services'
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@
<meta-data android:name="flutterEmbedding" android:value="2" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
</manifest>
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.google.gms:google-services:4.3.8'
classpath 'com.android.tools.build:gradle:7.1.2'
classpath 'com.google.gms:google-services:4.4.2'
classpath 'com.google.errorprone:error_prone_annotations:2.3.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
org.gradle.jvmargs=-Xmx4608m

android.enableR8=true
android.useAndroidX=true
Expand Down
4 changes: 4 additions & 0 deletions assets/data/alphabetTranslations.json
Original file line number Diff line number Diff line change
Expand Up @@ -266,5 +266,9 @@
{
"AppId": "build1139",
"Text": "Liquidators"
},
{
"AppId": "build1140",
"Text": "Gone Fishing"
}
]
122 changes: 122 additions & 0 deletions assets/data/bait.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
[
{
"Id": "FISHBAIT_1",
"AppId": "cur107",
"RarityBoosts": {
"Junk": 0.0,
"Common": 0.9,
"Rare": 2.0,
"Epic": 1.5,
"Legendary": 1.2
},
"SizeBoosts": {
"Small": 1.0,
"Medium": 1.0,
"Large": 1.0,
"ExtraLarge": 1.0
},
"DayTimeBoost": 1.0,
"NightTimeBoost": 1.0,
"StormBoost": 1.0
},
{
"Id": "FISHBAIT_2",
"AppId": "cur108",
"RarityBoosts": {
"Junk": 0.0,
"Common": 0.35,
"Rare": 1.1,
"Epic": 5.0,
"Legendary": 1.5
},
"SizeBoosts": {
"Small": 1.0,
"Medium": 1.0,
"Large": 1.0,
"ExtraLarge": 1.0
},
"DayTimeBoost": 1.0,
"NightTimeBoost": 1.0,
"StormBoost": 1.0
},
{
"Id": "FISHBAIT_3",
"AppId": "cur109",
"RarityBoosts": {
"Junk": 0.0,
"Common": 0.1,
"Rare": 0.66,
"Epic": 5.0,
"Legendary": 2.5
},
"SizeBoosts": {
"Small": 1.0,
"Medium": 1.0,
"Large": 1.0,
"ExtraLarge": 1.0
},
"DayTimeBoost": 1.0,
"NightTimeBoost": 1.0,
"StormBoost": 1.0
},
{
"Id": "FISHBAIT_DAY",
"AppId": "cur110",
"RarityBoosts": {
"Junk": 0.0,
"Common": 1.0,
"Rare": 1.3,
"Epic": 2.0,
"Legendary": 1.5
},
"SizeBoosts": {
"Small": 1.0,
"Medium": 1.0,
"Large": 1.0,
"ExtraLarge": 1.0
},
"DayTimeBoost": 8.0,
"NightTimeBoost": 1.0,
"StormBoost": 1.0
},
{
"Id": "FISHBAIT_NIGHT",
"AppId": "cur111",
"RarityBoosts": {
"Junk": 0.0,
"Common": 1.0,
"Rare": 1.3,
"Epic": 2.0,
"Legendary": 1.5
},
"SizeBoosts": {
"Small": 1.0,
"Medium": 1.0,
"Large": 1.0,
"ExtraLarge": 1.0
},
"DayTimeBoost": 1.0,
"NightTimeBoost": 8.0,
"StormBoost": 1.0
},
{
"Id": "FISHBAIT_STORM",
"AppId": "cur112",
"RarityBoosts": {
"Junk": 0.0,
"Common": 1.0,
"Rare": 1.3,
"Epic": 2.0,
"Legendary": 1.5
},
"SizeBoosts": {
"Small": 1.0,
"Medium": 1.0,
"Large": 1.0,
"ExtraLarge": 1.0
},
"DayTimeBoost": 1.0,
"NightTimeBoost": 1.0,
"StormBoost": 5.2
}
]
20 changes: 16 additions & 4 deletions assets/data/donationsBackup.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
[
{
"guid": "08b3e895-696f-43a5-b035-319bd2831823",
"username": "Spieleklecks",
"type": "BuyMeACoffee",
"date": "2024-09-06T06:58:00Z"
},
{
"guid": "6b1c2d77-3dd0-42ee-b9ff-0747d8669427",
"username": "Someone",
"type": "BuyMeACoffee",
"date": "2024-09-06T05:23:00Z"
},
{
"guid": "649fd781-6034-42af-9417-59bbf8ec699a",
"username": "Fatamoub",
Expand Down Expand Up @@ -1008,14 +1020,14 @@
"date": "2019-10-07T12:01:00Z"
},
{
"guid": "ad8a3a9b-0251-49c0-a5e5-49bddd76fb4f",
"username": "Tanguy le Blanc",
"guid": "dbec8044-d8da-4c1a-8ae1-498b24b84faa",
"username": "Randy Weeks",
"type": "Paypal",
"date": "2019-10-06T12:01:00Z"
},
{
"guid": "dbec8044-d8da-4c1a-8ae1-498b24b84faa",
"username": "Randy Weeks",
"guid": "ad8a3a9b-0251-49c0-a5e5-49bddd76fb4f",
"username": "Tanguy le Blanc",
"type": "Paypal",
"date": "2019-10-06T12:01:00Z"
},
Expand Down
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.11",
"GameBuildNumber": 15605371,
"GeneratedDate": "2024-09-06"
"GameVersion": "5.12",
"GameBuildNumber": 15728657,
"GeneratedDate": "2024-09-23"
}
Loading

0 comments on commit 6ed8ecc

Please sign in to comment.