From c6523ad2c77f600e8bde48b1c40a680bb84f3baa Mon Sep 17 00:00:00 2001 From: Code-Ac <76821666+Code-Ac@users.noreply.github.com> Date: Sun, 22 Aug 2021 11:45:55 +0200 Subject: [PATCH 1/6] npm install --- package-lock.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d387a8d4..084ee4cea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "gdlauncher", - "version": "1.1.13", + "version": "1.1.14", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -16332,6 +16332,13 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, + "nan": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", + "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==", + "dev": true, + "optional": true + }, "nanoid": { "version": "3.1.25", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", @@ -23825,7 +23832,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "glob-parent": { @@ -24475,7 +24483,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "glob-parent": { From 511af67962b8cde48f7227d5a5428eb7a85c9ba2 Mon Sep 17 00:00:00 2001 From: Code-Ac <76821666+Code-Ac@users.noreply.github.com> Date: Sun, 22 Aug 2021 12:02:18 +0200 Subject: [PATCH 2/6] ignore MacOS system folder ".DS_Store" --- src/app/desktop/utils/getInstances.js | 10 +++++++--- src/app/desktop/utils/modsFingerprintsScan.js | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/app/desktop/utils/getInstances.js b/src/app/desktop/utils/getInstances.js index 830c6d663..63c573c8f 100644 --- a/src/app/desktop/utils/getInstances.js +++ b/src/app/desktop/utils/getInstances.js @@ -103,9 +103,13 @@ const getInstances = async instancesPath => { return null; }; const folders = await getDirectories(instancesPath); - const instances = await pMap(folders, mapFolderToInstance, { - concurrency: 5 - }); + const instances = await pMap( + folders.filter(folder => folder !== '.DS_Store'), + mapFolderToInstance, + { + concurrency: 5 + } + ); const hashMap = {}; // eslint-disable-next-line for (const instance of instances) { diff --git a/src/app/desktop/utils/modsFingerprintsScan.js b/src/app/desktop/utils/modsFingerprintsScan.js index 598db0cbb..d2a05066f 100644 --- a/src/app/desktop/utils/modsFingerprintsScan.js +++ b/src/app/desktop/utils/modsFingerprintsScan.js @@ -149,9 +149,13 @@ const modsFingerprintsScan = async instancesPath => { }; const folders = await getDirectories(instancesPath); - const instances = await pMap(folders, mapFolderToInstance, { - concurrency: 5 - }); + const instances = await pMap( + folders.filter(folder => folder !== '.DS_Store'), + mapFolderToInstance, + { + concurrency: 5 + } + ); const hashMap = {}; // eslint-disable-next-line for (const instance of instances) { From 9a35c5632a9edad056b83ed829f2644af65c2ee1 Mon Sep 17 00:00:00 2001 From: Code-Ac <76821666+Code-Ac@users.noreply.github.com> Date: Sun, 22 Aug 2021 14:01:02 +0200 Subject: [PATCH 3/6] modIcon fully shown --- src/common/modals/ModsBrowser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/modals/ModsBrowser.js b/src/common/modals/ModsBrowser.js index 2ca8dce9f..2bd2ae227 100644 --- a/src/common/modals/ModsBrowser.js +++ b/src/common/modals/ModsBrowser.js @@ -175,7 +175,7 @@ const ModsListWrapper = ({
Date: Sun, 22 Aug 2021 14:12:02 +0200 Subject: [PATCH 4/6] error detected by IDE --- src/common/modals/InstanceManager/Mods.js | 2 +- src/common/modals/ModOverview.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/modals/InstanceManager/Mods.js b/src/common/modals/InstanceManager/Mods.js index fd3b0c19f..32f8a0a1a 100644 --- a/src/common/modals/InstanceManager/Mods.js +++ b/src/common/modals/InstanceManager/Mods.js @@ -145,7 +145,7 @@ const NotItemsAvailable = styled.div` const DragEnterEffect = styled.div` position: absolute; display: flex; - flex-direction; column; + flex-direction: column; justify-content: center; align-items: center; border: solid 5px ${props => props.theme.palette.primary.main}; diff --git a/src/common/modals/ModOverview.js b/src/common/modals/ModOverview.js index ca040bb8a..3b08226c8 100644 --- a/src/common/modals/ModOverview.js +++ b/src/common/modals/ModOverview.js @@ -373,7 +373,7 @@ const Container = styled.div` perspective: 1px; transform-style: preserve-3d; height: calc(100% - 70px); - width; 100%; + width: 100%; overflow-x: hidden; overflow-y: scroll; `; From d185730315bc34fad52fb52ca87c87bd72232cd1 Mon Sep 17 00:00:00 2001 From: Code-Ac <76821666+Code-Ac@users.noreply.github.com> Date: Sun, 22 Aug 2021 15:40:14 +0200 Subject: [PATCH 5/6] fixed error when beta channel is selected --- src/common/reducers/actions.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/reducers/actions.js b/src/common/reducers/actions.js index 4c14e7483..6219b2c5e 100644 --- a/src/common/reducers/actions.js +++ b/src/common/reducers/actions.js @@ -3044,7 +3044,11 @@ export const getAppLatestVersion = async () => { if (!isAppUpdated(latestStablerelease)) { return latestStablerelease; } - if (!isAppUpdated(latestPrerelease) && releaseChannel !== 0) { + if ( + latestPrerelease && + !isAppUpdated(latestPrerelease) && + releaseChannel !== 0 + ) { return latestPrerelease; } From 3eb4b8664969bf21794a307d5eb576b2a296ab73 Mon Sep 17 00:00:00 2001 From: Code-Ac <76821666+Code-Ac@users.noreply.github.com> Date: Sun, 22 Aug 2021 17:55:30 +0200 Subject: [PATCH 6/6] lint fix --- src/common/modals/InstanceManager/Mods.js | 4 ++-- src/common/modals/JavaSetup.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/modals/InstanceManager/Mods.js b/src/common/modals/InstanceManager/Mods.js index 32f8a0a1a..21e589226 100644 --- a/src/common/modals/InstanceManager/Mods.js +++ b/src/common/modals/InstanceManager/Mods.js @@ -161,8 +161,8 @@ const DragEnterEffect = styled.div` backdrop-filter: blur(4px); background: linear-gradient( 0deg, - rgba(0, 0, 0, .3) 40%, - rgba(0, 0, 0, .3) 40% + rgba(0, 0, 0, 0.3) 40%, + rgba(0, 0, 0, 0.3) 40% ); opacity: ${({ transitionState }) => transitionState === 'entering' || transitionState === 'entered' ? 1 : 0}; diff --git a/src/common/modals/JavaSetup.js b/src/common/modals/JavaSetup.js index 675c727ba..862780846 100644 --- a/src/common/modals/JavaSetup.js +++ b/src/common/modals/JavaSetup.js @@ -16,7 +16,6 @@ import Modal from '../components/Modal'; import { downloadFile } from '../../app/desktop/utils/downloader'; import { convertOSToJavaFormat, - get7zPath, isLatestJavaDownloaded } from '../../app/desktop/utils'; import { _getTempPath } from '../utils/selectors';