Mergy Mergy (#1399)

* Added scripts to produce separated macOS builds for different architectures

* yeet cache

* bye cache

* remove local playback ( it's a mess)

* ok

* some raop fix

* local store

* Update pt_BR.json

* chore: Updated Lockfile

* fix versioning for main

* Revert "fix versioning for main"

This reverts commit 905514225c.

* chore: Prettified Code
 [ci skip]

* temp

* verbose tmp

* chore: Prettified Code
 [ci skip]

* ci trigger

* Fixed remove primary artist stuff for lastfm

* chore: Prettified Code
 [ci skip]

* Update zh_CN.json (#1394)

* Increased timeout for lastfm to 40 seconds

* Added token link without callback to settings

* Fix for #1390

* Automatic locale setting

* chore: Prettified Code
 [ci skip]

* window control hidden when native title bar on

* Change Album Search and Pagination Layout (#1397)

* Updated Dutch translations

Updated Dutch translations

* Update nl_NL.json

* chore: Prettified Code
 [ci skip]

* Update en_OWO.json

* chore: Prettified Code
 [ci skip]

Co-authored-by: Sherlock Luk <sherlockluk@outlook.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: Core <core@coredev.uk>
Co-authored-by: Arth Attack <86346283+ArthAttack@users.noreply.github.com>
Co-authored-by: vapormusic <vapormusic@users.noreply.github.com>
Co-authored-by: yazninja <yazlesean@gmail.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: coredev-uk <coredev-uk@users.noreply.github.com>
Co-authored-by: 椎名アヤネ <53814845+sakura0224@users.noreply.github.com>
Co-authored-by: Monochromish <79590499+Monochromish@users.noreply.github.com>
Co-authored-by: Sjoerd69 <74538108+Sjoerd-69@users.noreply.github.com>
Co-authored-by: GamingLiamStudios <58615717+GamingLiamStudios@users.noreply.github.com>
Co-authored-by: GamingLiamStudios <GamingLiamStudios@users.noreply.github.com>
This commit is contained in:
cryptofyre 2022-08-29 23:49:33 -05:00 committed by GitHub
parent b4db2d1826
commit 88f7b9004d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 410 additions and 960 deletions

View file

@ -27,6 +27,8 @@
"pack": "electron-builder --dir",
"dist": "npm run build && electron-builder",
"dist:macarm": "npm run build && electron-builder --mac --arm64",
"slim-build:macarm": "ditto --arch arm64 ./dist/mac-universal/Cider.app ./dist/mac-universal/arm64/Cider.app",
"slim-build:macintel": "ditto --arch x86_64 ./dist/mac-universal/Cider.app ./dist/mac-universal/x86_x64/Cider.app",
"dist:universalNotWorking": "npm run build && electron-builder --mac --universal",
"dist:all": "npm run build && electron-builder -mwl",
"testdist": "npm run build && electron-builder --dir",
@ -39,8 +41,6 @@
"dependencies": {
"@sentry/electron": "^4.0.0",
"@sentry/integrations": "^7.8.1",
"@types/pouchdb": "^6.4.0",
"@types/pouchdb-node": "^6.1.4",
"adm-zip": "0.4.10",
"airtunes2": "git+https://github.com/ciderapp/node_airtunes2.git",
"castv2-client": "^1.2.0",
@ -58,16 +58,11 @@
"get-port": "5.1.1",
"jimp": "^0.16.1",
"lastfmapi": "^0.1.1",
"level": "^8.0.0",
"leveldown": "^6.1.1",
"mdns-js": "git+https://github.com/ciderapp/node-mdns-js.git",
"mpris-service": "^2.1.2",
"music-metadata": "7.12.6",
"node-gyp": "^9.1.0",
"node-ssdp": "^4.0.1",
"pouchdb-adapter-leveldb": "^7.3.0",
"pouchdb-node": "^7.3.0",
"pouchdb-upsert": "^2.2.0",
"qrcode": "^1.5.1",
"request": "^2.88.2",
"run-script-os": "^1.1.6",