From 2c53a880859eb7e9463908ae93a5d388e377ec45 Mon Sep 17 00:00:00 2001
From: WebSnke <websnke@tutanota.com>
Date: Thu, 25 May 2023 11:52:11 +0200
Subject: [PATCH 1/7] Resolve version number conflict

---
 manifest.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifest.json b/manifest.json
index 70526a7..71d72f9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "1.0.2",
+=======
+    "version": "1.0",
+>>>>>>> parent of e523b5e (Change version number)
     "manifest_version": 2,
     "author": "WebSnke",
     "name": "Nintendo 3DS Music",

From 2d7c6f14d16b5e04da80421cb57a74233becebac Mon Sep 17 00:00:00 2001
From: WebSnke <websnke@tutanota.com>
Date: Thu, 25 May 2023 11:52:52 +0200
Subject: [PATCH 2/7] Revert "Resolve version number conflict"

This reverts commit 2c53a880859eb7e9463908ae93a5d388e377ec45.
---
 manifest.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 71d72f9..70526a7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
     "version": "1.0.2",
-=======
-    "version": "1.0",
->>>>>>> parent of e523b5e (Change version number)
     "manifest_version": 2,
     "author": "WebSnke",
     "name": "Nintendo 3DS Music",

From e38728286609cbd0885b73a50eee4008845f3365 Mon Sep 17 00:00:00 2001
From: WebSnke <websnke@tutanota.com>
Date: Fri, 26 May 2023 13:13:00 +0200
Subject: [PATCH 3/7] Update default volume

---
 pages/settings.html   | 2 +-
 scripts/background.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/settings.html b/pages/settings.html
index 4b0517a..57ac845 100644
--- a/pages/settings.html
+++ b/pages/settings.html
@@ -28,7 +28,7 @@
                 <option value="eShop-wish.mp3">Nintendo eShop - Wish List</option>
             </select>
             <label tabindex="0">Volume</label>
-            <input id="volume-slider" type="range" min="0" max="100" value="20" step="1">
+            <input id="volume-slider" type="range" min="0" max="100" value="50" step="1">
         </form>
     </main>
     <footer>
diff --git a/scripts/background.js b/scripts/background.js
index 0a95be6..80ba154 100644
--- a/scripts/background.js
+++ b/scripts/background.js
@@ -88,6 +88,7 @@ browser.runtime.onInstalled.addListener((details) => {
         });
 
         audio.src = audioSource.health;
+        audio.volume = 0.1;
         audio.play();
     }
 });
\ No newline at end of file

From ece8674c61119bf81679a8736dd0e306807e7178 Mon Sep 17 00:00:00 2001
From: WebSnke <websnke@tutanota.com>
Date: Wed, 31 May 2023 16:16:12 +0200
Subject: [PATCH 4/7] Add Firefox settings page

---
 scripts/background.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/background.js b/scripts/background.js
index 80ba154..d55f54d 100644
--- a/scripts/background.js
+++ b/scripts/background.js
@@ -7,7 +7,7 @@ let audioSource = {
 };
 
 const regex = {
-    settings: /(duolingo|github|reddit|spotify|tutanota)\.\w{2,3}\/(settings|preferences)/,
+    settings: /(duolingo|github|reddit|spotify|tutanota)\.\w{2,3}\/(settings|preferences)|about:(?!newtab)/,
     shopping: /(?<!\.)(www\.)?(adidas|alibaba|amazon|asos|bestbuy|costco|ebay|etsy|flipkart|idealo|myntra|newegg|nike|overstock|rakuten|sephora|shopify|target|ulta|walmart|zara)\./
 };
 

From c0181c9451469506f1647c94e33d2fa780a5b85f Mon Sep 17 00:00:00 2001
From: WebSnke <websnke@tutanota.com>
Date: Wed, 31 May 2023 16:17:46 +0200
Subject: [PATCH 5/7] Change default song to internet-settings

---
 pages/settings.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/settings.html b/pages/settings.html
index 57ac845..30531c5 100644
--- a/pages/settings.html
+++ b/pages/settings.html
@@ -14,18 +14,18 @@
         <form>
             <label class="blue" tabindex="0">Settings music</label>
             <select id="settings-select" multiple>
-                <option value="amiibo-settings.mp3" selected>Amiibo - Settings</option>
+                <option value="amiibo-settings.mp3">Amiibo - Settings</option>
                 <option value="miiverse-settings.mp3">Miiverse - Settings</option>
                 <option value="settings-main.mp3">System Settings - Main Theme</option>
-                <option value="settings-internet.mp3">System Settings - Internet Settings</option>
+                <option value="settings-internet.mp3" selected>System Settings - Internet Settings</option>
             </select>
             <label class="orange" tabindex="0">Shopping music</label>
             <select id="shopping-select" multiple>
-                <option value="eShop-alternative.mp3" selected>Nintendo eShop - Alternative</option>
+                <option value="eShop-alternative.mp3">Nintendo eShop - Alternative</option>
                 <option value="eShop-main.mp3">Nintendo eShop - Main Theme</option>
                 <option value="eShop-purchase.mp3">Nintendo <span class="orange">eShop</span> - Software
                     Purchase</option>
-                <option value="eShop-wish.mp3">Nintendo eShop - Wish List</option>
+                <option value="eShop-wish.mp3" selected>Nintendo eShop - Wish List</option>
             </select>
             <label tabindex="0">Volume</label>
             <input id="volume-slider" type="range" min="0" max="100" value="50" step="1">

From 6f714dda18de40ea2fa88cdb2f2bd9b821d7b0de Mon Sep 17 00:00:00 2001
From: WebSnke <websnke@tutanota.com>
Date: Wed, 31 May 2023 16:19:27 +0200
Subject: [PATCH 6/7] Add more shops

---
 scripts/background.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/background.js b/scripts/background.js
index d55f54d..5ec779e 100644
--- a/scripts/background.js
+++ b/scripts/background.js
@@ -8,7 +8,7 @@ let audioSource = {
 
 const regex = {
     settings: /(duolingo|github|reddit|spotify|tutanota)\.\w{2,3}\/(settings|preferences)|about:(?!newtab)/,
-    shopping: /(?<!\.)(www\.)?(adidas|alibaba|amazon|asos|bestbuy|costco|ebay|etsy|flipkart|idealo|myntra|newegg|nike|overstock|rakuten|sephora|shopify|target|ulta|walmart|zara)\./
+    shopping: /(?<!\.)(www\.)?(adidas|alibaba|amazon|asos|bestbuy|costco|ebay|etsy|flipkart|idealo|myntra|newegg|nike|overstock|puma|rakuten|sephora|shopify|target|ulta|walmart|zalando|zappos|zara)\./
 };
 
 setInterval(() => {

From 18940eca36263f3f268b0dc2d20fc84f69a35977 Mon Sep 17 00:00:00 2001
From: WebSnke <websnke@tutanota.com>
Date: Wed, 31 May 2023 16:21:56 +0200
Subject: [PATCH 7/7] Change version number

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 70526a7..4cdf6b3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.2",
+    "version": "1.0.3",
     "manifest_version": 2,
     "author": "WebSnke",
     "name": "Nintendo 3DS Music",