Merge upstream up to d4dfa9a

Squashed commit of the following:

commit 49c30b3
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 19:28:32 2023 +0100

    fuck lint

commit 06f3f7e
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 19:26:41 2023 +0100

    cleanup

commit 807ea3d
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 18:51:04 2023 +0100

    merge41

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/d4dfa9a2c2a6e627256e99efb08e150a6d234964

commit 2b9fe5c
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 15:18:03 2023 +0100

    fix anime tracker & airing sort

commit eafc64a
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 14:40:45 2023 +0100

    fuck lint

commit eef4ef7
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 14:20:10 2023 +0100

    fix weird "explore tabs" behaviour

commit 4baf786
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 13:43:13 2023 +0100

    use formatTime function

commit df6a85a
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 13:38:39 2023 +0100

    fix AnimeScreen crash

commit 91de0ed
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 01:44:41 2023 +0100

    merge40

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/69aa13bc5655813f1366b2020343091c8d2da009

commit 375a252
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 21:09:34 2023 +0100

    merge39

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/634ceeec50b09da25726d74c5dea6657133e1de5

commit d7aee03
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 19:42:37 2023 +0100

    merge38

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/1d144e67678a99ec7198e5efcb1410b5da4bc42e

commit 89777e9
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 17:54:17 2023 +0100

    merge37

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/aca36f962516f04bbbac67c9bf54723a13076c1c

commit 3fba4cb
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 15:09:18 2023 +0100

    merge36

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/64ad25d1b5cd68457d36fda67d96f99812a53528

commit a60268e
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 13:39:08 2023 +0100

    lint cleanup

commit c6f81b7
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 13:38:22 2023 +0100

    merge35

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/eed57b80be077a9f73c36d8dc572f34f59c1ba8d

commit 5f78244
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 00:22:45 2023 +0100

    merge34.5

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/8e4cedf1735f80c604f971b0a03bf72b040cdade

commit e4283fe
Merge: e4d3105 adb571f
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 23:21:58 2023 +0100

    Merge branch 'master' into merge_upstream

commit e4d3105
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 23:07:20 2023 +0100

    cleanup

commit 150d43e
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 23:06:00 2023 +0100

    merge34

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/489d22720a4343f198c81fe10f69d5b212bfc41a

commit 76df725
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 20:16:18 2023 +0100

    merge33

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/b7d282235dd233aac3bbdba3c9cfe7cac877b2e1

commit c07cc8d
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 16:59:50 2023 +0100

    merge32

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/8a8afa46e91bfb156c58f9008ba871156bf353f9

commit a654a54
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 23 23:01:52 2023 +0100

    Update build_push.yml

commit 325e625
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 23 22:44:56 2023 +0100

    merge31

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/86edce0d8705beb4f7f750a0c6f5fa4b353ec3c0

commit b8cdb9d
Author: LuftVerbot <[email protected]>
Date:   Mon Nov 20 21:47:46 2023 +0100

    small Episode Tracker change

commit f6d430d
Author: LuftVerbot <[email protected]>
Date:   Mon Nov 20 21:18:01 2023 +0100

    fuck lint

commit 99eea59
Author: LuftVerbot <[email protected]>
Date:   Mon Nov 20 21:15:15 2023 +0100

    crash fix & add forgotten commit

    No idea how I didn't add it yet. Commit: https://github.com/tachiyomiorg/tachiyomi/commit/efabe801be56476bf9ee536747f39ab8d486ca12

commit 18e04b7
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 19:38:42 2023 +0100

    merge30

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/1668be85875522721ee971afac4b46aa7da343c6

commit 3a31153
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 16:45:34 2023 +0100

    ktlint formt

commit ea2b7fe
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 16:05:25 2023 +0100

    ktlint format again

commit 05f9124
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 15:47:42 2023 +0100

    klint format again

commit 6215528
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 15:37:56 2023 +0100

    ktlint format

commit b1f728e
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 15:24:35 2023 +0100

    fix ConcurrentHashMap crash

commit a34bc76
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 15:04:24 2023 +0100

    renaming & ktlintCheck

commit f1cd8f6
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 14:39:59 2023 +0100

    merge29

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/772db515934b79ef407b4213087c15035588d9ad

commit 2c42303
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 13:18:41 2023 +0100

    merge28

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/6922792ad110ce9194aa963674bbf2c5c1351ea1

commit fa7b842
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 00:36:58 2023 +0100

    merge27

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/7146913c7184819417d86e6cd83aaab85bd6a798

commit e29dc62
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 18 17:28:12 2023 +0100

    lint cleanup

commit 85d0e49
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 18 17:26:35 2023 +0100

    little fix

commit eeddf17
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 18 17:20:36 2023 +0100

    merge26

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/c9a1bd86b58ce4a41bfc0eeb527cac9d30802353

commit a2a445f
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 18 16:01:50 2023 +0100

    merge25

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/6a558ad119ff35336c2141deefc5da4b49cf4553

commit 1b6301c
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 18 00:21:17 2023 +0100

    merge24

    Also a little test to see how this whole github team works.

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/fe90546821092ce8916445ce515ba51404617d62

commit 4cbf9a8
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 17 20:12:49 2023 +0100

    merge23.5

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/6d69caf59e277a2185c1a851ffad8a00a4a93a30

commit 72a54cb
Merge: a439045 00fb0a7
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 17 19:52:08 2023 +0100

    Merge branch 'master' into MR

commit a439045
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 17 19:47:18 2023 +0100

    merge23

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/8ff0c9d61a1d5b1cc08a3615ef4bfa3d1f04a5d2

commit 370212c
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 17 17:00:32 2023 +0100

    merge22

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/2556e9f08c768c02a581b5c147d7ea476ff42889

commit 7174799
Author: LuftVerbot <[email protected]>
Date:   Wed Nov 15 21:25:52 2023 +0100

    Update StreamsCatalogSheet.kt

commit 563efef
Merge: 645746a 2b8000b
Author: LuftVerbot <[email protected]>
Date:   Wed Nov 15 21:11:51 2023 +0100

    Merge branch 'master' into MR

commit 645746a
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 12 15:57:35 2023 +0100

    merge21

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/7a4680603db7d80cd8a52ce83e7a8e2eef317d29

commit 4709cbe
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 12 14:40:35 2023 +0100

    merge20

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/ef7b285151f83b8ef679786417b82ca3227dab35

commit 096276c
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 11 19:09:44 2023 +0100

    merge19.5

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/34f7caa0fc4a0d9b4fcc4dfd69dc9cb52f11bf38

commit 82eb36b
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 11 18:55:20 2023 +0100

    fuck lint

commit 0271706
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 11 18:49:20 2023 +0100

    merge19

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/ec08ba05fcc6cb2c77ae64016b9eafc2125733ba

commit e7b1066
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 11 17:58:02 2023 +0100

    merge18

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/12e7ee9d0caaa56d551908d179788fa637768397

commit 61256a2
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 11 15:55:09 2023 +0100

    again repositioning

commit b9d42c9
Merge: 4732c38 236849b
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 11 15:44:21 2023 +0100

    Merge branch 'master' into MR

commit 4732c38
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 11 15:43:57 2023 +0100

    repositioning

commit 83dcd5e
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 11 15:42:22 2023 +0100

    merge17

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/9a817e49bed34e11e6b24b48d738d14583440fae

commit 338b54a
Merge: 748d610 8b1934f
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 9 19:28:19 2023 +0100

    Merge branch 'master' into MR

commit 748d610
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 9 19:24:17 2023 +0100

    small changes

commit 872fc74
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 9 18:49:35 2023 +0100

    fix downloader pause

commit bb96174
Merge: 59b4404 fd83a7e
Author: LuftVerbot <[email protected]>
Date:   Tue Nov 7 19:08:04 2023 +0100

    Merge branch 'master' into MR

commit 59b4404
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 4 22:10:05 2023 +0100

    merge16

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/16cbcecd99c24f87b087dc7d02b8ccc93f1f1251

commit 184804f
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 3 23:19:24 2023 +0100

    merge15.5

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/d32409bd6e68a3d5e32a69eb1b3afbb407741a00

commit 6bab100
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 3 22:42:04 2023 +0100

    Update ReaderActivity.kt

commit 264b0e6
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 3 22:30:37 2023 +0100

    merge15

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/cf3f2d0380e5ab70211e6aab3f45bc81da43fcf4

commit dd69ce5
Merge: d2ccb75 5fd00d4
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 3 20:14:10 2023 +0100

    Merge branch 'master' into MR

commit d2ccb75
Merge: 8f08a24 5567be6
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 2 22:04:53 2023 +0100

    Merge branch 'master' into MR

commit 8f08a24
Merge: 9509d09 082d9e3
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 2 20:58:42 2023 +0100

    Merge branch 'master' into MR

commit 9509d09
Author: LuftVerbot <[email protected]>
Date:   Wed Nov 1 18:51:57 2023 +0100

    Update AnimeDownloader.kt

commit 5415cbb
Author: LuftVerbot <[email protected]>
Date:   Wed Nov 1 18:47:21 2023 +0100

    Update AnimeDownloader.kt

commit f0180e0
Author: LuftVerbot <[email protected]>
Date:   Wed Nov 1 15:48:14 2023 +0100

    rework anime downloader

commit f3ec9da
Merge: fd1c643 67a5bcc
Author: LuftVerbot <[email protected]>
Date:   Tue Oct 31 18:37:41 2023 +0100

    Merge branch 'master' into MR

commit fd1c643
Author: LuftVerbot <[email protected]>
Date:   Sun Oct 29 15:12:39 2023 +0100

    merge14

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/f344831d5877d1d0a7772b00f498ddfb6e86da04

commit 9bb1a5d
Merge: 03ee4bc d8327e8
Author: LuftVerbot <[email protected]>
Date:   Sun Oct 29 13:58:41 2023 +0100

    Merge branch 'master' into MR

commit 03ee4bc
Author: LuftVerbot <[email protected]>
Date:   Sat Oct 28 23:05:13 2023 +0200

    merge13

    Last commit merged:  https://github.com/tachiyomiorg/tachiyomi/commit/7f0ed58b5401251c93b7edd9569a44ca044118db

commit 6dd16ca
Merge: f0783f5 509eced
Author: LuftVerbot <[email protected]>
Date:   Sat Oct 28 12:03:04 2023 +0200

    Merge branch 'master' into MR

commit f0783f5
Author: Quickdev <[email protected]>
Date:   Fri Oct 27 15:03:11 2023 -0400

    feat(player): Subtitle settings + refactor + crash fixes (#1152)

    Co-authored-by: jmir1 <[email protected]>
    Co-authored-by: Abdallah <[email protected]>

commit 2431d8a
Author: LuftVerbot <[email protected]>
Date:   Sat Oct 28 00:04:20 2023 +0200

    merge12

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/0d9f8e8743b1a03f30a8a3050b9a896f337ba25f

commit c6317e9
Author: LuftVerbot <[email protected]>
Date:   Fri Oct 27 23:50:37 2023 +0200

    Update AdaptiveSheet.kt

commit 692b566
Author: LuftVerbot <[email protected]>
Date:   Fri Oct 27 23:26:45 2023 +0200

    revert subs commit

commit 5b1099d
Author: LuftVerbot <[email protected]>
Date:   Fri Oct 27 21:39:46 2023 +0200

    Update AdaptiveSheet.kt

commit 7e14b6d
Merge: f51b36a 7f9255b
Author: LuftVerbot <[email protected]>
Date:   Fri Oct 27 21:36:43 2023 +0200

    Merge remote-tracking branch 'upstream/master' into MR

commit f51b36a
Author: LuftVerbot <[email protected]>
Date:   Fri Oct 27 20:27:23 2023 +0200

    merge11

    Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/34b9c82cd0ca07ded2cd079a9cc18229a02a9a81

commit 564a959
Merge: b9333be 928a62c
Author: LuftVerbot <[email protected]>
Date:   Fri Oct 27 18:50:18 2023 +0200

    Merge remote-tracking branch 'origin/master' into MR

commit b9333be
Author: LuftVerbot <[email protected]>
Date:   Thu Oct 26 19:39:29 2023 +0200

    fix download button not shown

commit 5d575f1
Merge: e282528 afb921a
Author: LuftVerbot <[email protected]>
Date:   Thu Oct 26 18:56:43 2023 +0200

    Merge remote-tracking branch 'upstream/master' into MR

commit e282528
Author: LuftVerbot <[email protected]>
Date:   Mon Oct 23 18:27:42 2023 +0200

    Revert "Translations update from Hosted Weblate (#9531)"

    This reverts commit 3a8e7d0.

commit 3a8e7d0
Author: Weblate (bot) <[email protected]>
Date:   Sat Jun 3 19:10:13 2023 +0200

    Translations update from Hosted Weblate (#9531)

    Weblate translations

    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/jv/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ne/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
    Translation: Tachiyomi/Tachiyomi 0.x

    Co-authored-by: Alessandro Jean <[email protected]>
    Co-authored-by: Ali Aljishi <[email protected]>
    Co-authored-by: AntonP <[email protected]>
    Co-authored-by: Christian Elbrianno <[email protected]>
    Co-authored-by: Clxff H3r4ld0 <[email protected]>
    Co-authored-by: Dan <[email protected]>
    Co-authored-by: Danel Dave Barbuco <[email protected]>
    Co-authored-by: DatTran MLL <[email protected]>
    Co-authored-by: Dexroneum <[email protected]>
    Co-authored-by: Eduard Ereza Martínez <[email protected]>
    Co-authored-by: FateXBlood <[email protected]>
    Co-authored-by: Ferran <[email protected]>
    Co-authored-by: Giorgio Sanna <[email protected]>
    Co-authored-by: ID-86 <[email protected]>
    Co-authored-by: Igor <[email protected]>
    Co-authored-by: Izxmi <[email protected]>
    Co-authored-by: Leonardo Falcoski <[email protected]>
    Co-authored-by: Lyfja <[email protected]>
    Co-authored-by: Milo Ivir <[email protected]>
    Co-authored-by: Pitpe11 <[email protected]>
    Co-authored-by: Rostyslav Haitkulov <[email protected]>
    Co-authored-by: Swyter <[email protected]>
    Co-authored-by: TheKingTermux <[email protected]>
    Co-authored-by: Uzuki Shimamura <[email protected]>
    Co-authored-by: altinat <[email protected]>
    Co-authored-by: stevenlele <[email protected]>

commit 974d3b5
Author: LuftVerbot <[email protected]>
Date:   Mon Oct 23 17:51:27 2023 +0200

    Revert "Translations update from Hosted Weblate (#9531)"

    This reverts commit d78159b.

commit d78159b
Author: Weblate (bot) <[email protected]>
Date:   Sat Jun 3 19:10:13 2023 +0200

    Translations update from Hosted Weblate (#9531)

    Weblate translations

    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/jv/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ne/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
    Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
    Translation: Tachiyomi/Tachiyomi 0.x

    Co-authored-by: Alessandro Jean <[email protected]>
    Co-authored-by: Ali Aljishi <[email protected]>
    Co-authored-by: AntonP <[email protected]>
    Co-authored-by: Christian Elbrianno <[email protected]>
    Co-authored-by: Clxff H3r4ld0 <[email protected]>
    Co-authored-by: Dan <[email protected]>
    Co-authored-by: Danel Dave Barbuco <[email protected]>
    Co-authored-by: DatTran MLL <[email protected]>
    Co-authored-by: Dexroneum <[email protected]>
    Co-authored-by: Eduard Ereza Martínez <[email protected]>
    Co-authored-by: FateXBlood <[email protected]>
    Co-authored-by: Ferran <[email protected]>
    Co-authored-by: Giorgio Sanna <[email protected]>
    Co-authored-by: ID-86 <[email protected]>
    Co-authored-by: Igor <[email protected]>
    Co-authored-by: Izxmi <[email protected]>
    Co-authored-by: Leonardo Falcoski <[email protected]>
    Co-authored-by: Lyfja <[email protected]>
    Co-authored-by: Milo Ivir <[email protected]>
    Co-authored-by: Pitpe11 <[email protected]>
    Co-authored-by: Rostyslav Haitkulov <[email protected]>
    Co-authored-by: Swyter <[email protected]>
    Co-authored-by: TheKingTermux <[email protected]>
    Co-authored-by: Uzuki Shimamura <[email protected]>
    Co-authored-by: altinat <[email protected]>
    Co-authored-by: stevenlele <[email protected]>

commit dfb5ca4
Merge: c19b4b5 92f9ab2
Author: LuftVerbot <[email protected]>
Date:   Mon Oct 23 17:11:37 2023 +0200

    Merge remote-tracking branch 'upstream/master' into MR

commit c19b4b5
Author: LuftVerbot <[email protected]>
Date:   Sun Oct 22 18:25:03 2023 +0200

    fuck lint (again)

commit febf046
Author: LuftVerbot <[email protected]>
Date:   Sun Oct 22 18:16:03 2023 +0200

    fuck lint

commit da3265f
Author: LuftVerbot <[email protected]>
Date:   Sun Oct 22 18:08:27 2023 +0200

    merge10

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/531e1c62bb8ba62f3fe84efce60210b5b5560368

commit c85576e
Author: LuftVerbot <[email protected]>
Date:   Sun Oct 22 14:11:21 2023 +0200

    merge9

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/4c65c2311e09bf5dcb77327c415a6fddd12123c5

commit 67d3043
Merge: c62f86f 63e95d9
Author: LuftVerbot <[email protected]>
Date:   Sat Oct 21 14:54:03 2023 +0200

    Merge branch 'aniyomiorg:master' into MR

commit c62f86f
Author: LuftVerbot <[email protected]>
Date:   Sat Oct 21 12:45:41 2023 +0200

    merge8

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/ed5a56be60d144c917b7b09bf183c688e6d54b06

commit e99e4c2
Author: LuftVerbot <[email protected]>
Date:   Fri Oct 6 18:47:44 2023 +0200

    merge7

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/152fdec855cccfb479af8f74f1d4099be0ac399c

commit b3c911e
Author: LuftVerbot <[email protected]>
Date:   Fri Oct 6 16:51:34 2023 +0200

    merge6

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/22a43725833804805055e3460bb3a87f3983d533

commit f705e19
Author: LuftVerbot <[email protected]>
Date:   Thu Oct 5 14:16:41 2023 +0200

    merge5

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/b4bb8556751353c06531b55f3b052217254314c0

commit 2ebf477
Author: LuftVerbot <[email protected]>
Date:   Wed Oct 4 21:44:23 2023 +0200

    merge4

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/44383ff9500b5e5b50de53890e37aa69116168fb

commit 14a8aeb
Author: LuftVerbot <[email protected]>
Date:   Wed Oct 4 21:33:37 2023 +0200

    merge3

    I hate Weblate commits!
    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/e15b945e16aba1dcef5d52046cf08f9f5233cb59

commit 5ceae31
Author: LuftVerbot <[email protected]>
Date:   Wed Oct 4 20:24:51 2023 +0200

    merge2

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/9a10656bf07a7dd35400fa6e42dd0e4889ddb177

commit 5a2a3fd
Author: LuftVerbot <[email protected]>
Date:   Wed Oct 4 13:19:33 2023 +0200

    fuck lint

commit c3062d2
Author: LuftVerbot <[email protected]>
Date:   Wed Oct 4 13:08:36 2023 +0200

    merge1

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/f63573f25fe5361c9c1a49a77b2c371e68072736

commit 928a62c
Author: LuftVerbot <[email protected]>
Date:   Tue Jul 25 00:25:30 2023 +0200

    Update README.md

commit a883c90
Author: LuftVerbot <[email protected]>
Date:   Tue Jul 25 00:24:31 2023 +0200

    Delete ic_launcher.png

commit c1b7b89
Author: LuftVerbot <[email protected]>
Date:   Tue Jul 25 00:23:44 2023 +0200

    Update README.md

commit c188307
Author: LuftVerbot <[email protected]>
Date:   Tue Jul 25 00:22:16 2023 +0200

    Add files via upload

.editorconfig

@@ -1,7 +1,8 @@
 [*.{kt,kts}]
-indent_size=4
-insert_final_newline=true
-ij_kotlin_allow_trailing_comma=true
-ij_kotlin_allow_trailing_comma_on_call_site=true
+max_line_length = 120
+indent_size = 4
+insert_final_newline = true
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
 ij_kotlin_name_count_to_use_star_import = 2147483647
 ij_kotlin_name_count_to_use_star_import_for_members = 2147483647

.github/ISSUE_TEMPLATE.md

@@ -5,7 +5,7 @@ I acknowledge that:
 - I have updated:
   - To the latest version of the app (stable is v0.12.3.10)
   - All extensions
-- I have gone through the FAQ (https://aniyomi.org/help/faq/) and troubleshooting guide (https://aniyomi.org/help/guides/troubleshooting/)
+- I have gone through the FAQ (https://aniyomi.org/docs/faq/general) and troubleshooting guide (https://aniyomi.org/docs/guides/troubleshooting/)
 - If this is an issue with an anime extension, that I should be opening an issue in https://github.com/aniyomiorg/aniyomi-extensions
 - I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open or closed issue
 - I will fill out the title and the information in this template

.github/ISSUE_TEMPLATE/config.yml

@@ -4,7 +4,7 @@ contact_links:
     url: https://github.com/aniyomiorg/aniyomi-extensions/issues/new/choose
     about: Issues and requests for extensions and sources should be opened in the aniyomi-extensions repository instead
   - name: 📦 Aniyomi extensions
-    url: https://aniyomi.org/extensions
+    url: https://aniyomi.org/extensions/
     about: Anime extensions and sources
   - name: 🧑‍💻 Aniyomi help discord
     url: https://discord.gg/F32UjdJZrR

.github/ISSUE_TEMPLATE/report_issue.yml

@@ -95,7 +95,7 @@ body:
           required: true
         - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/aniyomiorg/aniyomi-extensions/issues/new/choose).
           required: true
-        - label: I have gone through the [FAQ](https://aniyomi.org/help/faq/) and [troubleshooting guide](https://aniyomi.org/help/guides/troubleshooting/).
+        - label: I have gone through the [FAQ](https://aniyomi.org/docs/faq/general) and [troubleshooting guide](https://aniyomi.org/docs/guides/troubleshooting/).
           required: true
         - label: I have updated the app to version **[0.12.3.10](https://github.com/aniyomiorg/aniyomi/releases/latest)**.
           required: true

.github/renovate.json5

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "schedule": ["every sunday"],
+  "packageRules": [
+    {
+      // Compiler plugins are tightly coupled to Kotlin version
+      "groupName": "Kotlin",
+      "matchPackagePrefixes": [
+        "androidx.compose.compiler",
+        "org.jetbrains.kotlin",
+      ],
+    }
+  ]
+}

.github/workflows/build_pull_request.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Clone repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
@@ -37,4 +37,4 @@ jobs:
       - name: Build app and run unit tests
         uses: gradle/gradle-command-action@v2
         with:
-          arguments: lintKotlin assembleStandardRelease testStandardReleaseUnitTest
+          arguments: ktlintCheck assembleStandardRelease testReleaseUnitTest

.github/workflows/build_push.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Clone repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
@@ -46,7 +46,7 @@ jobs:
       - name: Build app and run unit tests
         uses: gradle/gradle-command-action@v2
         with:
-          arguments: lintKotlin assembleStandardRelease testStandardReleaseUnitTest
+          arguments: ktlintCheck assembleStandardRelease testReleaseUnitTest
 
       # Sign APK and create release for tags
 
@@ -120,3 +120,14 @@ jobs:
           prerelease: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  update-website:
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
+    steps:
+      - name: Trigger Netlify build hook
+        run: curl -s -X POST -d {} "https://api.netlify.com/build_hooks/${TOKEN}"
+        env:
+          TOKEN: ${{ secrets.NETLIFY_HOOK_RELEASE }}
+

.github/workflows/issue_moderator.yml

@@ -27,6 +27,13 @@ jobs:
                 "type": "body",
                 "regex": ".*\\* (Aniyomi version|Android version|Device): \\?.*",
                 "message": "Requested information in the template was not filled out."
+              },
+              {
+                "type": "both",
+                "regex": ".*(?:fail(?:ed|ure|s)?|can\\s*(?:no|')?t|(?:not|un).*able|(?<!n[o']?t )blocked by|error) (?:to )?(?:get past|by ?pass|penetrate)?.*cloud ?fl?are.*",
+                "ignoreCase": true,
+                "labels": ["Cloudflare protected"],
+                "message": "Refer to the **Solving Cloudflare issues** section at https://aniyomi.org/docs/guides/troubleshooting/#cloudflare. If it doesn't work, migrate to other sources or wait until they lower their protection."
               }
             ]
           auto-close-ignore-label: do-not-autoclose

.github/workflows/lock.yml

@@ -12,7 +12,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: '2'

.gitignore

@@ -3,7 +3,8 @@
 /acra.properties
 /.idea/workspace.xml
 .DS_Store
-.idea/
+.idea/*
+!.idea/icon.png
 *iml
 *.iml
 

CONTRIBUTING.md

@@ -24,13 +24,17 @@ Before you start, please note that the ability to use following technologies is
 - [Android Studio](https://developer.android.com/studio)
 - Emulator or phone with developer options enabled to test changes.
 
+## Linting
+
+To auto-fix some linting errors, run the `ktlintFormat` Gradle task.
+
 ## Getting help
 
 - Join [the Discord server](https://discord.gg/F32UjdJZrR) for online help and to ask questions while developing.
 
 # Translations
 
-Translations are done externally via Weblate. See [our website](https://aniyomi.org/help/contribution/#translation) for more details.
+Translations are done externally via Weblate. See [our website](https://aniyomi.org/docs/contribute#translation) for more details.
 
 
 # Forks

README.md

@@ -31,7 +31,7 @@ Please make sure to read the full guidelines. Your issue may be closed without w
 
 <details><summary>Issues</summary>
 
-1. **Before reporting a new issue, take a look at the already opened [issues](https://github.com/aniyomiorg/aniyomi/issues).**
+1. **Before reporting a new issue, take a look at the already opened [issues](https://aniyomi.org/changelogs/).**
 2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/841701076242530374?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/F32UjdJZrR)
 
 </details>
@@ -40,7 +40,7 @@ Please make sure to read the full guidelines. Your issue may be closed without w
 
 * Include version (More → About → Version)
  * If not latest, try updating, it may have already been solved
- * Preview version is equal to the number of commits as seen in the main page
+ * Preview version is equal to the number of commits as seen on the main page
 * Include steps to reproduce (if not obvious from description)
 * Include screenshot (if needed)
 * If it could be device-dependent, try reproducing on another device (if possible)

app/.gitignore

@@ -1,4 +1,3 @@
 /build
 *iml
-*.iml
-custom.gradle
+*.iml