Merge branch 'beta' into early

# Conflicts:
#	src/renderer/components

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "EmuDeck",
-  "version": "2.0.38",
+  "version": "2.1.1",
   "description": "Play all your RetroGames",
   "license": "MIT",
   "author": {

src/renderer/pages/EmulatorsPage.jsx

@@ -227,8 +227,21 @@ function EmulatorsPage() {
 
   useEffect(() => {
     if (showNotification === false) {
-      const updates = diff(newDesiredVersions, stateCurrentConfigs);
+      //const updates = diff(newDesiredVersions, stateCurrentConfigs);
+
+
+      const obj1 = newDesiredVersions;
+      const obj2 = stateCurrentConfigs;
+
+      const updates = {};
+
+      for (const key in obj1) {
+        if (JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
+          updates[key] = obj1[key];
+        }
+      }
       console.log({ updates });
+
       setStatePage({
         ...statePage,
         updates: updates,

src/renderer/pages/WelcomePage.jsx

@@ -385,7 +385,7 @@ function WelcomePage() {
         alert={
           second
             ? ``
-            : 'Do you need help installing EmuDeck for the first time? <a href="https://youtu.be/rs9jDHIDKkU" target="_blank">Check out this guide</a>'
+            : 'Do you need help installing EmuDeck for the first time? <a href="https://youtu.be/Y5r2WZAImuY" target="_blank">Check out this guide</a>'
         }
         alertCSS="alert--info"
         onClick={selectMode}