From 6625a383956b9f5f5bd4e46c0407f87f1d6a7209 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 16 Mar 2022 22:21:03 +0000
Subject: [PATCH 1/5] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e9c1a306..d729820b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
 branches:
-      ignore: i10n-develop
+      ignore: feature/i10n
 jobs:
   build:
     working_directory: ~/Cider

From 3a57be776bfcb037749f397feca13a780c2120ab Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 16 Mar 2022 22:33:56 +0000
Subject: [PATCH 2/5] Update config.yml

---
 .circleci/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d729820b..39bbb26c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,9 +25,6 @@ jobs:
           key: yarn-packages-{{ checksum "cider-yarn.lock" }}
           paths:
             - ~/.cache/yarn
-      - run:
-          name: Install Playwright
-          command: yarn playwright install --with-deps
       - run:
           name: Install system build dependencies
           command: |

From 28f78a2261bbac6e7054fb1555ae244111c1c098 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sun, 20 Mar 2022 14:21:32 +0700
Subject: [PATCH 3/5] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 68767fd9..39eb2525 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,8 @@
 -->
 [![Get it from the AUR](https://img.shields.io/badge/Get_It_From_The_AUR-100000?style=for-the-badge&logo=archlinux)](https://aur.archlinux.org/packages/cider)
 
+[![Get it from Flathub](https://img.shields.io/badge/Get_It_From_Flathub-100000?style=for-the-badge&logo=flathub)](https://flathub.org/apps/details/sh.cider.Cider)
+
 ### Compiling and Configuration
 For more information surrounding configuration, compiling and other developer documentation, see the [compilation docs](https://cider.sh/compile.html).
 

From 3c2912a2f311525e23ee31555486eb73fa4c38b4 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Mon, 21 Mar 2022 20:27:36 -0700
Subject: [PATCH 4/5] volume uniformity through sample rates

---
 src/renderer/audio/audio.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index 6252840e..1b931f87 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -58,9 +58,9 @@ const CiderAudio = {
         } catch (e) {}
         CiderAudio.source.connect(CiderAudio.context.destination);} catch(e){}
     },
-    connectContext: function (mediaElem){
-        if (!CiderAudio.context){
-        CiderAudio.context = new (window.AudioContext || window.webkitAudioContext);
+    connectContext: function (mediaElem) {
+        if (!CiderAudio.context) {
+            CiderAudio.context = new window.AudioContext({sampleRate: 96000}); // Don't ever remove the sample rate arg. Ask Maikiwi.
         }
         if (!CiderAudio.source){
         CiderAudio.source = CiderAudio.context.createMediaElementSource(mediaElem);

From a7901ba7e452ed4013de6be33be9530fcc5d69bb Mon Sep 17 00:00:00 2001
From: yazninja <71800112+yazninja@users.noreply.github.com>
Date: Wed, 23 Mar 2022 08:09:12 +0800
Subject: [PATCH 5/5] Tweak play icon to make it editable in themes

---
 src/renderer/views/components/mediaitem-list-item.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 0297dcf3..88ef0bfb 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -23,7 +23,7 @@
                         <div class="svg-icon" :style="{'--color': 'var(--keyColor)', '--url': 'url(./assets/feather/plus.svg)'}"></div>
                     </button>
                     <button v-else-if='!(showArtwork == true && (showIndex == false ||(showIndex == true && showIndexPlaylist != false)))' @click="playTrack()" style="width: 44px;margin-left: -11px;">
-                        <%- include("../svg/play.svg") %>
+                        <div class="svg-icon" :style="{'--color': 'var(--keyColor)', '--url': 'url(./assets/feather/play.svg)'}"></div>
                     </button>
                 </div>
                 <div v-if="!(app.mk.isPlaying && (((app.mk.nowPlayingItem._songId ?? (app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id ))  == item.attributes.playParams.id) || (app.mk.nowPlayingItem.id  == item.id ))) && showIndex" :style="{display: ((showIndex && !showInLibrary) ? 'block' : 'none'), 'margin-left':'11px'}">