Commit graph

2315 commits

Author SHA1 Message Date
Maikiwi
509a425f41
sync again (#465)
* Added update check if using MSS or MAS builds. need help implementing

* fix locale / allow pl to show before list loading is fully done

* oops

* Also copy blockmap for partial download

`[2022-02-15 17:28:30.126] [error] Cannot download differentially, fallback to full download: Error: Cannot download "https://478-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-Setup-1.1.428.exe.blockmap", status 404: Not Found
    at ClientRequest.<anonymous> (C:\Program Files\Cider\resources\app.asar\node_modules\builder-util-runtime\src\httpExecutor.ts:288:11)
    at ClientRequest.emit (node:events:394:28)
    at ClientRequest.emit (node:domain:475:12)
    at SimpleURLLoaderWrapper.<anonymous> (node:electron/js2c/browser_init:105:6829)
    at SimpleURLLoaderWrapper.emit (node:events:394:28)
    at SimpleURLLoaderWrapper.emit (node:domain:475:12)`

* more lang fix

* Removed Discord clear on pause

* Linux frame

* fix #459

* Fix

* exposed --songProgressColor and --songProgressBackground

* revert

* Revert "revert"

This reverts commit 24313b53cf.

* ok?

* Revert "ok?"

This reverts commit 9218ccc887.

* ok

* fix adding/remove mvs from library

* Created audio controls menu

* Added start-renderer command for easier testing

* shitty floats shitty shitty

* LastFM can be unique and have its own call

* Revert "LastFM can be unique and have its own call"

This reverts commit d36e1b19f6.

* Revert "Merge branch 'develop' into develop"

This reverts commit 5fa345e6c8, reversing
changes made to a02b633f49.

* Revert "Revert "LastFM can be unique and have its own call""

This reverts commit f156083d48.

* lastfm changes

Co-authored-by: child_duckling <19170969+quacksire@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: JYW0803 <74043061+JYW0803@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
2022-02-16 18:44:34 -08:00
vapormusic
1ad805c04e lastfm changes 2022-02-17 09:22:36 +07:00
Core
7f5ad08da3
Revert "Merge branch 'ciderapp:develop' into develop"
This reverts commit 20fd0c05da, reversing
changes made to 4937e29fcf.
2022-02-17 01:16:31 +00:00
Core
20fd0c05da
Merge branch 'ciderapp:develop' into develop 2022-02-17 01:10:07 +00:00
Core
cb82ff482d
Revert "Revert "LastFM can be unique and have its own call""
This reverts commit f156083d48.
2022-02-17 01:06:47 +00:00
Core
604ef16db8
Revert "Merge branch 'develop' into develop"
This reverts commit 5fa345e6c8, reversing
changes made to a02b633f49.
2022-02-17 01:05:52 +00:00
Core
f156083d48
Revert "LastFM can be unique and have its own call"
This reverts commit d36e1b19f6.
2022-02-17 01:01:17 +00:00
Core
51393397e5
Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 00:58:54 +00:00
Core
d36e1b19f6
LastFM can be unique and have its own call 2022-02-17 00:58:48 +00:00
Core
4937e29fcf
Merge pull request #1 from ciderapp/develop
Develop
2022-02-17 00:29:50 +00:00
Core
5fa345e6c8
Merge branch 'develop' into develop 2022-02-17 00:23:52 +00:00
Core
a02b633f49
shitty floats shitty shitty 2022-02-17 00:20:18 +00:00
Core
64c7d53f07
Added start-renderer command for easier testing 2022-02-17 00:19:32 +00:00
Core
09825e93d3
Created audio controls menu 2022-02-17 00:19:14 +00:00
cryptofyre
a0b4693d7f Merge branch 'develop' of https://github.com/Apple-Music-Electron/Cider into develop 2022-02-16 18:04:50 -06:00
Core
16c0f8408f
Merge branch 'ciderapp:develop' into develop 2022-02-16 14:35:27 +00:00
vapormusic
edf5e43416 fix adding/remove mvs from library 2022-02-16 14:03:59 +07:00
vapormusic
3772399c01 ok 2022-02-16 13:23:59 +07:00
vapormusic
0ec0909697 Revert "ok?"
This reverts commit 9218ccc887.
2022-02-16 13:23:09 +07:00
vapormusic
9218ccc887 ok? 2022-02-16 13:22:48 +07:00
vapormusic
209d3889fb Revert "revert"
This reverts commit 24313b53cf.
2022-02-16 13:21:09 +07:00
vapormusic
cd6a5ac10d Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-16 13:04:45 +07:00
vapormusic
24313b53cf revert 2022-02-16 13:04:40 +07:00
Maikiwi
b8d299adcb Condense presets 2022-02-15 20:03:16 -08:00
cryptofyre
ced7fd9ecb Merge branch 'develop' of https://github.com/Apple-Music-Electron/Cider into develop 2022-02-15 21:59:08 -06:00
booploops
db89ab7a60 exposed --songProgressColor and --songProgressBackground 2022-02-15 19:39:53 -08:00
Maikiwi
3e38e32119 temp disable auto upd 2022-02-15 19:29:29 -08:00
Maikiwi
182e4a0611 debug messages and adding switches 2022-02-15 19:23:35 -08:00
Maikiwi
24970d1712 Merge branch 'innolab' of https://github.com/ciderapp/Cider into innolab 2022-02-15 18:33:22 -08:00
Maikiwi
3e28d65fab fix i'm blind 2022-02-15 18:33:17 -08:00
Maikiwi
453ebc2519
sync (#461)
* Added update check if using MSS or MAS builds. need help implementing

* fix locale / allow pl to show before list loading is fully done

* oops

* Also copy blockmap for partial download

`[2022-02-15 17:28:30.126] [error] Cannot download differentially, fallback to full download: Error: Cannot download "https://478-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-Setup-1.1.428.exe.blockmap", status 404: Not Found
    at ClientRequest.<anonymous> (C:\Program Files\Cider\resources\app.asar\node_modules\builder-util-runtime\src\httpExecutor.ts:288:11)
    at ClientRequest.emit (node:events:394:28)
    at ClientRequest.emit (node:domain:475:12)
    at SimpleURLLoaderWrapper.<anonymous> (node:electron/js2c/browser_init:105:6829)
    at SimpleURLLoaderWrapper.emit (node:events:394:28)
    at SimpleURLLoaderWrapper.emit (node:domain:475:12)`

* more lang fix

* fix #459

Co-authored-by: child_duckling <19170969+quacksire@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: JYW0803 <74043061+JYW0803@users.noreply.github.com>
2022-02-15 18:32:51 -08:00
cryptofyre
2e15b9f29e Merge branch 'develop' of https://github.com/Apple-Music-Electron/Cider into develop 2022-02-15 15:09:19 -06:00
Core
b57a544cd8
Merge remote-tracking branch 'origin/develop' into develop 2022-02-15 17:11:11 +00:00
Core
2f3fda5235
Fix 2022-02-15 17:11:04 +00:00
Core
35a056d6d6
Merge branch 'ciderapp:develop' into develop 2022-02-15 16:06:42 +00:00
vapormusic
b7418b9651 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-15 23:00:32 +07:00
vapormusic
f58ceeb14c fix #459 2022-02-15 23:00:22 +07:00
Core
ad86f58e47
Linux frame 2022-02-15 14:53:51 +00:00
Core
04591e605c
Removed Discord clear on pause 2022-02-15 14:35:56 +00:00
vapormusic
6c1c20a0d9
Merge pull request #455 from JYW0803/patch-1
Also copy blockmap for partial download
2022-02-15 17:50:01 +07:00
vapormusic
dd49b0eb6b more lang fix 2022-02-15 16:34:42 +07:00
JYW0803
cb8c41d379
Also copy blockmap for partial download
`[2022-02-15 17:28:30.126] [error] Cannot download differentially, fallback to full download: Error: Cannot download "https://478-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-Setup-1.1.428.exe.blockmap", status 404: Not Found
    at ClientRequest.<anonymous> (C:\Program Files\Cider\resources\app.asar\node_modules\builder-util-runtime\src\httpExecutor.ts:288:11)
    at ClientRequest.emit (node:events:394:28)
    at ClientRequest.emit (node:domain:475:12)
    at SimpleURLLoaderWrapper.<anonymous> (node:electron/js2c/browser_init:105:6829)
    at SimpleURLLoaderWrapper.emit (node:events:394:28)
    at SimpleURLLoaderWrapper.emit (node:domain:475:12)`
2022-02-15 17:30:31 +08:00
vapormusic
6d9768230f oops 2022-02-15 13:33:25 +07:00
vapormusic
34c956fe99 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-15 13:30:36 +07:00
vapormusic
13a1f1951f fix locale / allow pl to show before list loading is fully done 2022-02-15 13:30:31 +07:00
child_duckling
237d20ff6d Added update check if using MSS or MAS builds. need help implementing 2022-02-14 22:08:24 -08:00
Maikiwi
c2dc1c479e test 2022-02-14 21:51:11 -08:00
宥叡
3a7b5d8655
Update zh_TW.jsonc (#454)
Update the TW language of GitHub Themes.
2022-02-14 21:13:13 -08:00
cryptofyre
00d9292cd8 Merge branch 'develop' of https://github.com/Apple-Music-Electron/Cider into develop 2022-02-14 16:46:00 -06:00
Maikiwi
67f7af2ca5 well okay instead of hiding it and have people complain might as well as only disabling the switch 2022-02-14 11:57:23 -08:00