Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Behold the german spyware merge (aka the kuukiyomi merge) #1709

Closed
wants to merge 8 commits into from
Closed

Behold the german spyware merge (aka the kuukiyomi merge) #1709

wants to merge 8 commits into from

Conversation

LuftVerbot
Copy link
Member

No description provided.

@LuftVerbot
Squashed commit of the following:
eaa556d 
commit b33b06bbbfbf2cd5a66139740ccc119b1e5023a5
Author: LuftVerbot <[email protected]>
Date:   Thu Jul 18 10:35:22 2024 +0200

    fuck detekt & fix errors

commit 16f97f384ae45080abfae66c7238d8be60af8b2d
Merge: eb163aede 58817c724
Author: LuftVerbot <[email protected]>
Date:   Wed Jul 17 14:49:03 2024 +0200

    Merge branch 'master' into kuukiyomi

commit eb163aeded17dfa0e2e933a9a1c7a22a1a06a808
Author: LuftVerbot <[email protected]>
Date:   Wed Jul 17 13:29:11 2024 +0200

    fuck detekt

commit a186d4e5061350d6b898ad4c0df0973468e9bae5
Author: LuftVerbot <[email protected]>
Date:   Wed Jul 17 12:05:44 2024 +0200

    fuck detekt again

commit 3ae4d11e21826e5d0339268bcbfcdbb699bc8643
Author: LuftVerbot <[email protected]>
Date:   Wed Jul 17 11:48:48 2024 +0200

    fuck detekt

commit 8169d0f529c5c43412b06f4485ad928df0fc5969
Author: LuftVerbot <[email protected]>
Date:   Tue Jul 9 14:44:34 2024 +0200

    fuck detekt

commit e3df5f0a29ecc3d86bcabc86b53b31fecc3daa08
Author: LuftVerbot <[email protected]>
Date:   Tue Jul 9 14:22:58 2024 +0200

    Update build.gradle.kts

commit 86b923570f04d49535d67b71f7bf2e1f2e71a971
Merge: 4862fd953 69b9db4e8
Author: LuftVerbot <[email protected]>
Date:   Tue Jul 9 14:13:31 2024 +0200

    Merge branch 'master' into kuukiyomi

commit 4862fd953c687cec46fc93b076b29b2a770a708c
Merge: 0d48a8b84 a24a0730d
Author: LuftVerbot <[email protected]>
Date:   Sat Jun 15 19:38:48 2024 +0200

    Merge pull request #120 from Diegopyl1209/fix-torrent-downloads

commit a24a0730d05f17673926a57253cd59fc38513971
Author: DiegoPYL1209 <[email protected]>
Date:   Sat Jun 15 12:59:29 2024 -0400

    fuck lint

commit 5f1027cdc1e2995d30e1f6bc7645622a84682115
Author: DiegoPYL1209 <[email protected]>
Date:   Sat Jun 15 12:46:36 2024 -0400

    fix torrent downloads

commit 0d48a8b841b7cac8577941c3b78757552988accf
Author: LuftVerbot <[email protected]>
Date:   Sat Jun 15 13:12:38 2024 +0200

    fuck lint

commit 518a55fc7184f8bcb326b3e97f963a4219443241
Author: LuftVerbot <[email protected]>
Date:   Sat Jun 15 13:06:03 2024 +0200

    Fix more sync stuff

commit 69dac79e37d573932d0cc4e0180802379364ef6a
Author: LuftVerbot <[email protected]>
Date:   Sat Jun 15 11:58:00 2024 +0200

    Probably fix some sync stuff

commit 848a800803a7423c556242a1d93591af972352d3
Author: LuftVerbot <[email protected]>
Date:   Sat Jun 15 11:57:34 2024 +0200

    Chnage some UAs

commit c91473e592bc8e66e68f39a3cf7470890538164c
Merge: e59011fbb e1087abfb
Author: LuftVerbot <[email protected]>
Date:   Sat Jun 15 11:25:24 2024 +0200

    Merge branch 'master' into kuukiyomi

commit e59011fbba769a65f84aeccdbd225c621318a342
Author: LuftVerbot <[email protected]>
Date:   Wed Jun 5 22:26:54 2024 +0200

    Fix icon again (hopefully)

commit 6e1f5d32459ee8983358ab843606cc2b3f0d74c0
Merge: 6d1663521 a48a9f416
Author: LuftVerbot <[email protected]>
Date:   Wed Jun 5 18:54:47 2024 +0200

    Merge branch 'master' into kuukiyomi

commit 6d166352174b5981a28fcaace7e80b45a83abd27
Merge: 8b3634f60 a7feccd1e
Author: LuftVerbot <[email protected]>
Date:   Fri May 31 14:00:06 2024 +0200

    Merge branch 'master' into kuukiyomi

commit 8b3634f60fc6375e3e15df35f82d51fd323994bd
Author: LuftVerbot <[email protected]>
Date:   Tue May 28 21:47:23 2024 +0200

    fix fucking app icon

commit 60106be1367bdf4660069a93388c9a39857dd36c
Author: LuftVerbot <[email protected]>
Date:   Sun May 26 17:47:21 2024 +0200

    fuck lint

commit efc07b031f9c3d44c368781e50096e5f0d75d6a9
Author: LuftVerbot <[email protected]>
Date:   Sun May 26 17:34:04 2024 +0200

    Small changes

commit d4d0b68dbea6e3d2389e8be4c0877947f71edc41
Merge: 0f6ecc659 a23eea980
Author: LuftVerbot <[email protected]>
Date:   Sun May 26 17:08:37 2024 +0200

    Merge branch 'master' into kuukiyomi

commit 0f6ecc659ef427d557235a763262b18def02c76c
Author: LuftVerbot <[email protected]>
Date:   Sun May 26 17:03:40 2024 +0200

    Merge branch 'master' into kuukiyomi

commit 92e4ec3f3660782401fe1c4d83c2e083a710794d
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sun May 19 17:27:29 2024 +0000

    Add compiled torrserver library

commit 946833bbe9b4082a5c81d1500607294411471ede
Merge: 9e474dd67 a4796674e
Author: LuftVerbot <[email protected]>
Date:   Sun May 19 19:24:06 2024 +0200

    Merge pull request #117 from Diegopyl1209/expose-trackers-to-extensions

commit 9e474dd6783190d2732d854fb05bf49af1d0b125
Merge: 7064c0e1f e414c55b1
Author: LuftVerbot <[email protected]>
Date:   Sun May 19 19:23:30 2024 +0200

    Merge pull request #118 from Diegopyl1209/accept-trackers-without-commas

commit 7064c0e1ff2da7265e6bb432cac7cdbc452b993f
Merge: 5c1cd0857 224430ec0
Author: LuftVerbot <[email protected]>
Date:   Sun May 19 19:22:15 2024 +0200

    Merge branch 'master' into kuukiyomi

commit e414c55b12a423b28a03d08666ab15b1a96bcc0b
Author: DiegoPYL1209 <[email protected]>
Date:   Fri May 17 22:43:26 2024 -0400

    accept trackers without comma

commit a4796674ead807f0620ba726a647c06b809e1571
Author: DiegoPYL1209 <[email protected]>
Date:   Fri May 17 22:37:39 2024 -0400

    fuck lint

commit 7571bf3581632f9fae37c0905cda8cbbbfda2357
Author: DiegoPYL1209 <[email protected]>
Date:   Fri May 17 22:13:00 2024 -0400

    expose trackers to extensions

commit 0b07fca47140b86e0cc992aa382b87feaabf0f75
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sat May 18 01:25:30 2024 +0000

    Add compiled torrserver library

commit 5c1cd08575c854a720b983657b9506c41e37afe3
Author: LuftVerbot <[email protected]>
Date:   Wed May 15 21:34:14 2024 +0200

    Fix local manga not loading

    Closes #115

commit 26c8ed5bd69fa1f92f1500fc03eecb15a1d4a1ec
Merge: caf50794d 9c30b3633
Author: LuftVerbot <[email protected]>
Date:   Wed May 15 13:31:14 2024 +0200

    Merge branch 'master' into kuukiyomi

commit caf50794d96387c504c2d4ba1279bfa4044b9f66
Author: LuftVerbot <[email protected]>
Date:   Sat May 11 16:07:03 2024 +0200

    fuck lint

commit 84a8413432013ddde09fe9b5baf1478c1fadc4ef
Merge: 6f7b739dd 72a4d0923
Author: LuftVerbot <[email protected]>
Date:   Sat May 11 16:05:10 2024 +0200

    Merge branch 'kuukiyomi' of https://github.com/LuftVerbot/kuukiyomi into kuukiyomi

commit 6f7b739ddbef049598b9cfb11a2b5b7e4cf25fed
Merge: 8eccd0d58 c91fb86e4
Author: LuftVerbot <[email protected]>
Date:   Sat May 11 16:04:54 2024 +0200

    Merge branch 'master' into kuukiyomi

commit 72a4d0923458c74336acad40ac4e61716efcff8c
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sat May 11 14:03:10 2024 +0000

    Add compiled torrserver library

commit 8eccd0d58a7a01e873e80c8d303c5e35cfcb8219
Author: LuftVerbot <[email protected]>
Date:   Sat May 11 15:59:39 2024 +0200

    cleanup torrserver code

commit 24d5ac6cbf1c35070ac65907d00f5b85886f99e6
Merge: 36093b478 04af1f2b8
Author: LuftVerbot <[email protected]>
Date:   Sat May 11 15:55:08 2024 +0200

    Merge pull request #113 from Diegopyl1209/kuukiyomi

commit 04af1f2b8aa5f2d6ce3b443432758c1d6995509f
Author: DiegoPYL1209 <[email protected]>
Date:   Mon May 6 17:08:37 2024 -0400

    Fuck android 14

commit 36093b47803f283fa34d3814b53a1b3c9d791758
Author: LuftVerbot <[email protected]>
Date:   Sun May 5 15:44:45 2024 +0200

    fuck lint + cleanup

commit ba308241a2de49d892f733639cb72fd76a00af79
Author: LuftVerbot <[email protected]>
Date:   Sun May 5 15:35:23 2024 +0200

    fuck lint

commit 9500ec98abcad2c311b4048573358a7db8d29370
Author: LuftVerbot <[email protected]>
Date:   Sun May 5 15:28:08 2024 +0200

    Update AppUpdater

commit 80cb081bc68598699c43f43e895ef4f1e503d0f6
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri May 3 19:09:37 2024 +0000

    Add compiled torrserver library

commit e4af4c0094e72bdc582347af3b834e4936d6df8b
Merge: e874e3a10 1a6933c46
Author: LuftVerbot <[email protected]>
Date:   Fri May 3 21:06:16 2024 +0200

    Merge pull request #112 from Diegopyl1209/kuukiyomi

commit 1a6933c4644b878695a10cf44d91fb2ae99b7507
Author: DiegoPYL1209 <[email protected]>
Date:   Tue Apr 30 21:00:18 2024 -0400

    Update PlayerActivity.kt

commit a34588c49dea8019da58af9ed570c3adf3a8d528
Author: DiegoPYL1209 <[email protected]>
Date:   Tue Apr 30 20:36:36 2024 -0400

    Update TorrentUtils.kt

commit 17ea7980bccca295b9269dfb3c7764c97573658a
Author: DiegoPYL1209 <[email protected]>
Date:   Tue Apr 30 20:24:03 2024 -0400

    WTF IS lexicographic AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

commit 48f198f12b8c697fef85e96e5f44fa56bf93dbc7
Author: DiegoPYL1209 <[email protected]>
Date:   Tue Apr 30 20:11:48 2024 -0400

    fuck lint

commit ec153f165b454247a6d7a8a3da896b8a0ad95efc
Author: DiegoPYL1209 <[email protected]>
Date:   Tue Apr 30 20:05:21 2024 -0400

    Fix amnis player bug in magnet links and other things

commit 3fe47a70569fa2bc49b5c78b2c174f8fc960ee87
Author: DiegoPYL1209 <[email protected]>
Date:   Mon Apr 29 19:25:52 2024 -0400

    fuck lint: second edition

commit 9e3cfbb6ad2272b9d1c47b3ac9bad519b51b371a
Author: DiegoPYL1209 <[email protected]>
Date:   Mon Apr 29 19:18:39 2024 -0400

    fuck lint

commit 9f58f086f98170b339d2c7ac9c46c0a794ee4423
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Apr 29 17:25:10 2024 +0000

    Add compiled torrserver library

commit 6393b4d8931a8ff776fd54858037e49e6d191fcf
Author: DiegoPYL1209 <[email protected]>
Date:   Mon Apr 29 13:22:02 2024 -0400

    Update server.go

commit 47249e2cdae4dc33c99257cff363445729792061
Author: DiegoPYL1209 <[email protected]>
Date:   Mon Apr 29 13:16:52 2024 -0400

    fix(torrent): Bruh

commit c0c52791a4178ab35b6b003b5f4cbd635e4a9ad0
Author: DiegoPYL1209 <[email protected]>
Date:   Sun Apr 28 19:44:24 2024 -0400

    delete unused stuff

commit af122964698cff595af41586474cf4c765c499e0
Author: DiegoPYL1209 <[email protected]>
Date:   Sun Apr 28 16:07:48 2024 -0400

    test torrent support

commit e874e3a10b4c24c895df65db5d9eae8af5c9f12d
Author: LuftVerbot <[email protected]>
Date:   Fri Apr 26 23:19:30 2024 +0200

    fuck lint

commit 751681d449892068a4a0d625454c2122cee36e34
Author: LuftVerbot <[email protected]>
Date:   Fri Apr 26 21:22:51 2024 +0200

    remove smt

commit 677ddd2b25ce46eef41bc769ea667511730e9506
Author: LuftVerbot <[email protected]>
Date:   Fri Apr 26 21:15:29 2024 +0200

    Fix Anilist login

commit 322a364e113a95de7ab7c0c589991ab05dacfa74
Author: LuftVerbot <[email protected]>
Date:   Fri Apr 26 21:08:37 2024 +0200

    Fix MAL login

commit 1c032d42416f95aba6999f1f6d476e674c0550e7
Author: LuftVerbot <[email protected]>
Date:   Fri Apr 26 20:56:00 2024 +0200

    fuck lint

commit b25278bb36fe6fa255d462c56f5aca2d9c24e368
Merge: 3fd880f72 b6aa5e34d
Author: LuftVerbot <[email protected]>
Date:   Fri Apr 26 20:33:35 2024 +0200

    Merge branch 'master' into kuukiyomi

commit 3fd880f72beaee1d4a54d4a355607731612cbb12
Author: LuftVerbot <[email protected]>
Date:   Thu Apr 25 20:42:51 2024 +0200

    fuck lint

commit 2f665ffb4ec855481f8d4757f1b94cf7ca52eed8
Author: LuftVerbot <[email protected]>
Date:   Thu Apr 25 14:13:03 2024 +0200

    fuck lint

commit 94fefaef4712220fc2c290643fe7fb2770ae0d5d
Author: LuftVerbot <[email protected]>
Date:   Thu Apr 25 14:10:11 2024 +0200

    Update SyncService.kt

commit c04f58a3944dd9fe8b70a55dd6eccef5d7e9b7c6
Author: LuftVerbot <[email protected]>
Date:   Wed Apr 24 21:59:34 2024 +0200

    more changes

commit 995a8614e31a63bbc9587c67e30117e1c6894499
Author: LuftVerbot <[email protected]>
Date:   Wed Apr 24 20:32:58 2024 +0200

    some changes

commit 798870c5aca218cbe8e0e329882547f2cadc2037
Author: LuftVerbot <[email protected]>
Date:   Tue Apr 23 20:38:00 2024 +0200

    Delete output-metadata.json

commit 0a165293465c1504d3591403025c18bc36a768cf
Author: LuftVerbot <[email protected]>
Date:   Tue Apr 23 20:37:40 2024 +0200

    Delete output-metadata.json

commit 88478929e2099cf85e6ee80e8313b7b7de60619f
Author: LuftVerbot <[email protected]>
Date:   Tue Apr 23 20:35:15 2024 +0200

    Update .gitignore

commit 453a34a7cb480c4ed93df619a25712fada90d509
Author: LuftVerbot <[email protected]>
Date:   Tue Apr 23 20:28:40 2024 +0200

    Update SyncPreferences.kt

commit 18a37133d7c057654344c97f1072cd49a6bbc175
Author: LuftVerbot <[email protected]>
Date:   Tue Apr 23 20:26:22 2024 +0200

    fuck lint

commit 683eadacb06520a3c2b3ed6aa1166f2cb10ea690
Author: LuftVerbot <[email protected]>
Date:   Tue Apr 23 20:24:22 2024 +0200

    Add Cross Sync feature

    Made by @kaiserbh. This feature is made by his efforts and work. I just added it to kuukiyomi. On behalf of all I thank you for making this possible

commit 681c05a6b5c598be467c222304232f5ffbe3985e
Author: LuftVerbot <[email protected]>
Date:   Sun Apr 21 09:24:44 2024 +0200

    Aktualisieren von README.md

commit 1ee1980192e165d00ead7a280fc4122568bb4fa3
Author: LuftVerbot <[email protected]>
Date:   Sat Apr 20 21:42:36 2024 +0200

    Delete output-metadata.json

commit 83c86a02849cc83bce60fa4a8ac2b1bc4f9a9d6d
Author: LuftVerbot <[email protected]>
Date:   Sat Apr 20 21:38:06 2024 +0200

    It's showtime

commit 5effa813716c2f119c010f2ba4f4a1244e879ed2
Author: LuftVerbot <[email protected]>
Date:   Sat Apr 20 13:36:02 2024 +0200

    First step to abomination

commit 4746f6336ceca3a0d456de6c592091b47e4b94bb
Merge: f653c6e1d 2a561d565
Author: LuftVerbot <[email protected]>
Date:   Sun Apr 14 15:01:31 2024 +0200

    Merge pull request #95 from uzuto/m3u

commit f653c6e1dd016a7af07c946deae6bc4b5445c3c0
Author: LuftVerbot <[email protected]>
Date:   Sun Apr 14 13:58:01 2024 +0200

    fix simkl login

commit 3b462edc621444dcf37c9139f0006dc3938b5f63
Author: LuftVerbot <[email protected]>
Date:   Sun Apr 14 13:20:39 2024 +0200

    fuck lint

commit 9150145121c03ecfa4b248e5b7def29467e2c94f
Author: LuftVerbot <[email protected]>
Date:   Sun Apr 14 13:12:56 2024 +0200

    Maybe fix app updates getting stuck sometimes

commit 8bf22621227aabd6764914c44e590cf320728309
Author: LuftVerbot <[email protected]>
Date:   Sun Apr 14 12:35:55 2024 +0200

    fix: Rotate and split wide images

commit 18b07c7451942a7101dfd0f4c93f25c4f4c0253d
Merge: 938011415 cffb5a8ae
Author: LuftVerbot <[email protected]>
Date:   Sun Apr 14 12:35:24 2024 +0200

    Merge branch 'master' into kuukiyomi

commit 938011415ec1ffb4066f4e86bd6b28ae65d3811f
Author: LuftVerbot <[email protected]>
Date:   Sat Apr 6 12:46:22 2024 +0200

    use right img decoder ver

commit 77250851e3ab9f4e9d0be38adc4438f91acc951f
Author: LuftVerbot <[email protected]>
Date:   Sat Apr 6 12:42:09 2024 +0200

    fuck lint

commit d8dda7871f210a7513b1c9f9f63f64c7e3d7cced
Author: LuftVerbot <[email protected]>
Date:   Sat Apr 6 12:34:26 2024 +0200

    small renaming

commit ace260e000dd606e9178a6209160cbb4e6b47d94
Merge: 61133daed 9145411e3
Author: LuftVerbot <[email protected]>
Date:   Sat Apr 6 12:31:06 2024 +0200

    Merge branch 'master' into kuukiyomi

commit 61133daed06c8e06d9e145ca20b8d9d2524dca21
Author: LuftVerbot <[email protected]>
Date:   Sat Mar 9 22:06:02 2024 +0100

    fix(discord): Fix default images for rpc

    The images were hosted on dc but now that there is a expire date on uploaded files this isn't possible anymore. But I still found a sneaky way *cough* dc emojis *cough*

commit eb3624e2e11e6a5e45d67df63040172b5d61f56f
Merge: a7b4641a7 5121e9014
Author: LuftVerbot <[email protected]>
Date:   Tue Mar 5 19:49:03 2024 +0100

    Merge pull request #99 from Diegopyl1209/fix-torrent-notification

commit 5121e901462a18ee3add21514d08e06ff0141278
Author: DiegoPYL1209 <[email protected]>
Date:   Mon Mar 4 14:59:17 2024 -0300

    fix(torrenServer): fix stop button when app is killed

commit a7b4641a793642ca17e5a72ca9417269903a5168
Merge: 1ec200213 ab30b43d5
Author: LuftVerbot <[email protected]>
Date:   Sun Feb 18 20:23:33 2024 +0100

    Merge branch 'master' into kuukiyomi

commit 1ec200213b3edb39e4162ee54d3967b0ee4e0010
Merge: cfb4d5f00 024abb780
Author: LuftVerbot <[email protected]>
Date:   Wed Feb 14 13:52:01 2024 +0100

    Merge branch 'master' into kuukiyomi

commit 2a561d5655fccf13514e59ef96c9246c4fd90168
Author: UzutoNarumaki <[email protected]>
Date:   Mon Feb 12 19:03:34 2024 +0530

    Added m3u support to local source

commit cfb4d5f006d30a88f02de0ce7c0211dbf16324cb
Merge: 7366c9f8d 4a2018182
Author: LuftVerbot <[email protected]>
Date:   Mon Feb 12 13:05:22 2024 +0100

    Merge branch 'master' into kuukiyomi

commit 7366c9f8dff150bdd529dd699d98b17d3910ec35
Author: LuftVerbot <[email protected]>
Date:   Fri Feb 9 10:47:59 2024 +0100

    Make v0.3.2 ready

commit 90b3ec3c5dbd37c571436c8fdbc11a257bf5e5f3
Author: LuftVerbot <[email protected]>
Date:   Thu Feb 8 15:04:53 2024 +0100

    fuck lint

commit 42895d031d1816d032c5ef6b1c4fcd95af2fd870
Merge: 824ee47df aec789309
Author: LuftVerbot <[email protected]>
Date:   Thu Feb 8 14:50:50 2024 +0100

    Merge branch 'master' into kuukiyomi

commit 824ee47dfc5a34c5b54605b0a37be2d9c594c92f
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 8 04:42:44 2024 +0000

    Add compiled torrserver library

commit 4181b17ed1f63d2e5b9735d5baf172af70149021
Merge: d109ab25c 30fbdd610
Author: LuftVerbot <[email protected]>
Date:   Thu Feb 8 05:39:08 2024 +0100

    Merge pull request #91 from Diegopyl1209/betterAddTrackers

    better way to add custom trackers

commit 30fbdd61099797a19f42d6d0cc3eb755aa18ed4a
Author: Diego Peña y Lillo <[email protected]>
Date:   Wed Feb 7 21:25:48 2024 -0300

    fuck lint

commit ba3ec17680ab141120e4c054337a2e80a465baab
Author: Diego Peña y Lillo <[email protected]>
Date:   Wed Feb 7 21:14:37 2024 -0300

    delete default trackers from torrserver

commit c274a15ae6dea581618aaf4b2a705b817ac7bd06
Author: Diego Peña y Lillo <[email protected]>
Date:   Wed Feb 7 21:13:25 2024 -0300

    better way to add custom trackers

commit d109ab25c44d24a0decf780c0771b08c40d4b247
Merge: bdfd814b1 8180a0878
Author: LuftVerbot <[email protected]>
Date:   Wed Feb 7 19:29:38 2024 +0100

    Merge pull request #89 from Diegopyl1209/localtorrent

commit bdfd814b19fc8547267a3581acb30319ac3dfaf8
Author: LuftVerbot <[email protected]>
Date:   Wed Feb 7 19:28:18 2024 +0100

    add torrent download

commit 8180a0878a180ea40fc829a97782fea5877fbf22
Author: Diego Peña y Lillo <[email protected]>
Date:   Wed Feb 7 15:09:43 2024 -0300

    fuck lint

commit 966175e1d44a6cc13fe1b003363cb2fa85bf615d
Author: Diego Peña y Lillo <[email protected]>
Date:   Wed Feb 7 14:57:47 2024 -0300

    removed logs

commit 489c0e47b6f57264f5af5ad46adc42c9ebc36408
Author: Diego Peña y Lillo <[email protected]>
Date:   Wed Feb 7 14:56:46 2024 -0300

    added torrent support to localsource

commit eabab807d0ac74f0222732f72e7c91014cec5ce3
Merge: 1202f2182 0bd1bb37b
Author: LuftVerbot <[email protected]>
Date:   Wed Feb 7 13:42:22 2024 +0100

    Merge branch 'master' into kuukiyomi

commit 1202f2182e3a971b98980946732e381cc297e5dc
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Feb 7 04:45:35 2024 +0000

    Add compiled torrserver library

commit e1ca9075cef23133cbcf785f95aec5e7166d3119
Merge: 13ba24701 1ed670a79
Author: LuftVerbot <[email protected]>
Date:   Wed Feb 7 05:42:27 2024 +0100

    Merge pull request #88 from Diegopyl1209/fix-indexstart

    fix index dont start in 0 when torrent only have 1 file

commit 1ed670a7996c78c5caad410899497d7f185ff085
Author: Diego Peña y Lillo <[email protected]>
Date:   Tue Feb 6 19:40:30 2024 -0300

    fix index dont start in 0 when torrent only have 1 file

commit 13ba247013140af985c73b669b77b44aece22e3a
Author: LuftVerbot <[email protected]>
Date:   Mon Feb 5 19:46:18 2024 +0100

    Update build.gradle.kts

commit 370f83cdb4b5471eb8ee3681da3ae308fe1225c1
Author: LuftVerbot <[email protected]>
Date:   Mon Feb 5 19:35:47 2024 +0100

    fix: long strip transition animation

commit 08c321b297a3541d88c0b9e58401813180b66fbb
Author: LuftVerbot <[email protected]>
Date:   Sat Feb 3 13:36:50 2024 +0100

    fix crash in arabic language

commit d52f07265b2490ff6e3e73b62cc2b876a8acac91
Author: LuftVerbot <[email protected]>
Date:   Sat Feb 3 12:22:04 2024 +0100

    Make v0.3 ready

commit 0c7538c38ddf9ac84efaa8e2c68c16d2429c56f3
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sat Feb 3 10:57:53 2024 +0000

    Add compiled torrserver library

commit 2b1fce033a462de07ece49bbaf88943e79841168
Merge: 6c63ddfe1 a7d5082b1
Author: LuftVerbot <[email protected]>
Date:   Sat Feb 3 11:54:07 2024 +0100

    Merge branch 'Diegopyl1209-maybe-fixfileidx' into kuukiyomi

commit a7d5082b1d5514dfb70f026df71700a20e5c6d13
Merge: 6c63ddfe1 af05e1e08
Author: LuftVerbot <[email protected]>
Date:   Sat Feb 3 11:53:47 2024 +0100

    Merge branch 'maybe-fixfileidx' of https://github.com/Diegopyl1209/kuukiyomi into Diegopyl1209-maybe-fixfileidx

commit 6c63ddfe1d4d90a3ce6f93d4e792ddf0a3f02fc1
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sat Feb 3 10:42:32 2024 +0000

    Add compiled torrserver library

commit 0ea0b5e78a05938ac29c9d99de515722ec33db06
Merge: 6b1225cc5 934a1d4cb
Author: LuftVerbot <[email protected]>
Date:   Sat Feb 3 11:39:11 2024 +0100

    Merge pull request #86 from Diegopyl1209/kuukiyomi

commit af05e1e08403ae57726fb7f997039020b8bfe8e8
Author: Diego Peña y Lillo <[email protected]>
Date:   Sat Feb 3 02:27:18 2024 -0300

    fix file index

commit 934a1d4cb06c1db6d52a2280adcf6e278d0ddce1
Author: diegopyl1209 <[email protected]>
Date:   Thu Feb 1 03:22:21 2024 -0300

    Finnaly fix stop button and fix crash on start video

commit 1ed067230d76abe785aae3c5c6292f78898a6f52
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 1 05:56:11 2024 +0000

    Add compiled torrserver library

commit 98ac4d406aa32d58419a1ec850ce5b929bf200a8
Author: diegopyl1209 <[email protected]>
Date:   Thu Feb 1 02:52:39 2024 -0300

    Update server.go

commit 577e0f2c169fa306b9d4e622464555f28b26fd46
Author: diegopyl1209 <[email protected]>
Date:   Thu Feb 1 02:51:59 2024 -0300

    Update server.go

commit 6b1225cc51ba80a703d179e736e02b359e50fd14
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 1 04:47:19 2024 +0000

    Add compiled torrserver library

commit 1e5abae81245cbc18228dbdd0331a3d54c611769
Merge: 01cd486e1 782c37f21
Author: LuftVerbot <[email protected]>
Date:   Thu Feb 1 05:43:52 2024 +0100

    Merge pull request #85 from Diegopyl1209/patch-1

    Fix crash on stop server

commit 782c37f21d8d85590feac31090cb7ee41e0c5931
Author: Diego Peña y Lillo <[email protected]>
Date:   Wed Jan 31 21:12:26 2024 -0300

    Fix crash on stop server

commit 01cd486e1fcfc8eee348253f5c525b96fbffc213
Author: LuftVerbot <[email protected]>
Date:   Wed Jan 31 21:00:39 2024 +0100

    fuck lint

commit c135f53948f9ef685e1afd466dec8a15074b4df9
Author: LuftVerbot <[email protected]>
Date:   Wed Jan 31 20:59:52 2024 +0100

    Delete output-metadata.json

commit a4c978e859cecba1c1992c3bee499b240ca176a4
Author: LuftVerbot <[email protected]>
Date:   Wed Jan 31 20:53:24 2024 +0100

    rework standard torrent trackers

commit 3a68a3f60539ce88f0f1a6cae8ae22ac0261fc4b
Merge: c9f40c4e0 bb9cf4497
Author: LuftVerbot <[email protected]>
Date:   Wed Jan 31 18:40:31 2024 +0100

    Merge branch 'kuukiyomi' into torrent

commit bb9cf4497aa29ab1a0443a56b7197a1ceead7c7c
Author: LuftVerbot <[email protected]>
Date:   Wed Jan 31 18:36:23 2024 +0100

    change torrent notification icon

    SUAVE

commit 31333615396cec43b535ce49aef75d993b85e5aa
Merge: e1b9b82d2 89795945a
Author: LuftVerbot <[email protected]>
Date:   Wed Jan 31 16:13:21 2024 +0100

    Merge branch 'master' into kuukiyomi

commit c9f40c4e07dfa6af683001187ba4152f013c3d34
Author: LuftVerbot <[email protected]>
Date:   Wed Jan 31 15:52:36 2024 +0100

    feat: add standard torrent trackers

    Will probably rework it a bit more before merging. Also I want that the user is able to add his own trackers

commit e1b9b82d275db5c1cb2449c1eee8128590794f29
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Jan 31 12:40:34 2024 +0000

    Add compiled torrserver library

commit 9628b224a835f64714680db15b894c8856d7bed5
Merge: aec7a09ae 7e044dfd6
Author: LuftVerbot <[email protected]>
Date:   Wed Jan 31 13:37:17 2024 +0100

    Merge pull request #84 from Diegopyl1209/kuukiyomi

commit 7e044dfd6e5197b6058b6e0ce1a0dbe27e03eed8
Author: Diego Peña y Lillo <[email protected]>
Date:   Wed Jan 31 03:55:25 2024 -0300

    add ldflags in torrserver compilation

commit 634acb5a50a9dab61e4ccc9976efebc848f05276
Author: diegopyl1209 <[email protected]>
Date:   Wed Jan 31 02:21:56 2024 -0300

    fuck lint

commit 6b0b56ca0d95f042f55a58e5bf273e8d85e85ac3
Author: diegopyl1209 <[email protected]>
Date:   Wed Jan 31 02:16:26 2024 -0300

    fix stop torrserver dont work

commit 04eb3ea88b9ba36624a1b7398343d8a2c9fbcff8
Author: diegopyl1209 <[email protected]>
Date:   Wed Jan 31 02:14:35 2024 -0300

    implement torrserver as nativelib

commit 72d349743d47f0936fb4f4cd4c8dddd7410bacaa
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Jan 31 04:21:55 2024 +0000

    Add compiled torrserver library

commit 48da36f2546677420dc6afa8ecbe49cfb2452440
Author: diegopyl1209 <[email protected]>
Date:   Wed Jan 31 01:18:27 2024 -0300

    test action

commit 8bae43e62d59fa960ae95cfaedcfc84475e34ca3
Author: diegopyl1209 <[email protected]>
Date:   Wed Jan 31 01:16:47 2024 -0300

    added torrserver code and modified push action

commit 5bed074a19e68a033b6ea4a70e2d621d2644a504
Author: Diego Peña y Lillo <[email protected]>
Date:   Wed Jan 31 01:09:40 2024 -0600

    Create server.aar

commit 941ab06f9e7379bd846716c426aab3ebf28e952c
Author: Diego Peña y Lillo <[email protected]>
Date:   Tue Jan 30 22:08:12 2024 -0600

    Update .gitattributes

commit aec7a09ae5a69ed1e8d5ae47f8cbc7dd12b3ad60
Merge: c17cbe874 4295669a4
Author: LuftVerbot <[email protected]>
Date:   Tue Jan 30 13:48:31 2024 +0100

    Merge branch 'master' into kuukiyomi

commit c17cbe874d454eec60ca948a016ef4e55015ee33
Author: LuftVerbot <[email protected]>
Date:   Tue Jan 30 13:46:15 2024 +0100

    feat: Add index handler for torrents

    Will maybe rework it sometime but for now it does what it's needed for

commit 53af83580a0a92b416b33ad30d547d7f00a6a509
Author: LuftVerbot <[email protected]>
Date:   Tue Jan 30 13:44:46 2024 +0100

    fix: mal login

commit 2db10b9292c1a89012e47bf25de410d0a50e61fd
Author: LuftVerbot <[email protected]>
Date:   Tue Jan 30 13:09:55 2024 +0100

    maybe fix mal login

commit 6a9a3e86ce79ce64198063c9b947fa4aa9c5f846
Merge: 689283b2e 16361e5db
Author: LuftVerbot <[email protected]>
Date:   Mon Jan 29 13:33:08 2024 +0100

    Merge branch 'master' into kuukiyomi

commit 689283b2e91cb3d9c90531d885433b97a6b336a5
Author: LuftVerbot <[email protected]>
Date:   Sun Jan 28 19:57:08 2024 +0100

    Update EpisodeOptionsDialogScreen.kt

commit e2f1ef741fe014580b781107adde5d651eac0c1b
Author: LuftVerbot <[email protected]>
Date:   Sun Jan 28 19:47:48 2024 +0100

    strings & lint

commit 99a197536fa0e6e8595eb9e9f959a04b49e831f3
Merge: cb3001d07 69a660f7d
Author: LuftVerbot <[email protected]>
Date:   Sun Jan 28 19:24:14 2024 +0100

    Merge branch 'master' into kuukiyomi

commit cb3001d07af94411026cbbaab5d0d9122efafeef
Author: LuftVerbot <[email protected]>
Date:   Sun Jan 28 12:01:08 2024 +0100

    Update README.md

commit 479b67f120f4aa167eb63949adcffc7ee995001d
Author: LuftVerbot <[email protected]>
Date:   Sun Jan 28 10:48:17 2024 +0100

    fuck lint

commit d7f99601ee9e98031da923c8a5f36ea40bdef7fe
Merge: 794bcebed 142a7ffc4
Author: LuftVerbot <[email protected]>
Date:   Sun Jan 28 10:37:52 2024 +0100

    Merge pull request #83 from Diegopyl1209/kuukiyomi

    Will take care of the lint error. Huge thx for making this!!!

commit 142a7ffc4a9812eb7a8daeb8d7b3abfc8d72f2e0
Author: diegopyl1209 <[email protected]>
Date:   Sun Jan 28 03:27:05 2024 -0300

    maybe fix lint

commit 7aeb9605d614bb37eaf0c093dee6083a787d90a1
Author: diegopyl1209 <[email protected]>
Date:   Sun Jan 28 02:51:17 2024 -0300

    moved torrent strings to kuukiyomi strings

commit d54417bc683efe527913cef133b40523fbb1aa1f
Author: diegopyl1209 <[email protected]>
Date:   Sat Jan 27 23:55:56 2024 -0300

    feat(player): implement TorrServer client

commit 794bcebed55535b555477c4bfba5690d1cd7f1c8
Merge: f8ff1747c 97467c84d
Author: LuftVerbot <[email protected]>
Date:   Sat Jan 27 15:30:58 2024 +0100

    Merge branch 'master' into kuukiyomi

commit f8ff1747c9a332d9106ca1b40b5995175033f263
Author: LuftVerbot <[email protected]>
Date:   Sat Jan 27 15:29:30 2024 +0100

    fuck lint more

commit f82c849c4c9c2f16f08c1a6c6b31ffb7c748afa3
Author: LuftVerbot <[email protected]>
Date:   Sat Jan 27 15:24:18 2024 +0100

    fuck lint

commit 29b1fdd9a4ee7d2ee75472e90aa6328ca4a8f846
Author: LuftVerbot <[email protected]>
Date:   Sat Jan 27 15:22:21 2024 +0100

    fix(maybe) & finish stuff

commit e686e72bddfe39712f0a5da5aff7936563c3662d
Merge: 16e4bdede c2ab0db7a
Author: LuftVerbot <[email protected]>
Date:   Thu Jan 25 13:34:42 2024 +0100

    Merge branch 'master' into kuukiyomi

commit 16e4bdede7f4e46f95e6c9c9f05a5dfefc3585be
Merge: 9b73cb111 70efdd8f0
Author: LuftVerbot <[email protected]>
Date:   Sat Jan 20 11:50:29 2024 +0100

    Merge branch 'master' into kuukiyomi

commit 9b73cb111982e399becfdaf74ce105c3526328a3
Merge: c9cb29dd4 b27ca3d9c
Author: LuftVerbot <[email protected]>
Date:   Mon Jan 15 13:52:33 2024 +0100

    Merge branch 'master' into kuukiyomi

commit c9cb29dd4bdc27761825718f01dd592e144327ea
Author: LuftVerbot <[email protected]>
Date:   Sun Jan 14 15:56:42 2024 +0100

    fuck lint

commit 7cbe51e4a724c86c78a85bca7368c5997c1c2aa3
Author: LuftVerbot <[email protected]>
Date:   Sun Jan 14 15:50:12 2024 +0100

    fix crash on start

commit 44bcd7a01c2960f0e1810fb7dca7674a77abaca9
Author: LuftVerbot <[email protected]>
Date:   Sun Jan 14 14:45:43 2024 +0100

    small changes & fuck lint

commit 2295d0b061a73982bd12973e4fe3b2cb8309d67d
Merge: ccfc2c6ee bfa68d180
Author: LuftVerbot <[email protected]>
Date:   Sun Jan 14 14:37:44 2024 +0100

    Merge branch 'master' into kuukiyomi

commit ccfc2c6ee63500a9ba6c12649c6a51735eb31826
Merge: d96eba639 4697f5b9d
Author: LuftVerbot <[email protected]>
Date:   Thu Dec 21 13:35:58 2023 +0100

    Merge branch 'master' into kuukiyomi

commit d96eba6396f821fec11a4faaf024eee3e3d43b83
Author: LuftVerbot <[email protected]>
Date:   Mon Dec 18 20:30:08 2023 +0100

    Small changes

commit 181f647f81d7ba83d05c6b310ff3556b6f37121a
Merge: c5b28bc8c d23ce6070
Author: LuftVerbot <[email protected]>
Date:   Mon Dec 18 12:31:35 2023 +0100

    Merge branch 'master' into kuukiyomi

commit c5b28bc8c388debd532905adf63e36b123d174e1
Merge: e85f0ae02 02c6f82ee
Author: LuftVerbot <[email protected]>
Date:   Sun Dec 17 14:12:54 2023 +0100

    Merge branch 'QOL-fixes' into kuukiyomi

commit e85f0ae02f76bee683b7fb754d7f96cfa9fa9a96
Merge: 2e48a1de5 7193a25fe
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 16 20:11:18 2023 +0100

    Merge branch 'M-Fixes' into kuukiyomi

commit 2e48a1de577274bfcc3548015597fac77ed8684a
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 16 17:38:05 2023 +0100

    fuck lint

commit 35d27df3035016eb2c9d08dcc8419dfc4d540249
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 16 17:35:02 2023 +0100

    refactor missing Item test

commit 0d25bc66ceeb39856e3c427d36241101515ccd7e
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 16 17:27:41 2023 +0100

    fix lint

commit b2a5926efdb4915ca1995e50b507dbc96bedd21a
Merge: cb1e3a798 0a3f04ce4
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 16 17:25:30 2023 +0100

    Merge branch 'M-Fixes' into kuukiyomi

commit cb1e3a7987111928b14261d343f70b6624b32564
Merge: ceeb44d90 82ba1673f
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 16 12:54:10 2023 +0100

    Merge remote-tracking branch 'upstream/M-Fixes' into kuukiyomi

commit ceeb44d90754b636111b5e5039580ec192350107
Merge: 21b2adf2e 7ccd74fd8
Author: LuftVerbot <[email protected]>
Date:   Thu Dec 7 22:38:24 2023 +0100

    Merge branch 'master' into kuukiyomi

commit 02c6f82eeaa1210853b84ecb03792b52bd7ea277
Author: Quickdesh <[email protected]>
Date:   Thu Dec 7 02:46:02 2023 -0500

    fix(lint): cleanup code and fix lint

commit 89158bab75e1aed3aa9cebf974f991614be1fb5f
Author: Quickdesh <[email protected]>
Date:   Thu Dec 7 01:32:02 2023 -0500

    feat(pip): adds option to skip forward 10 seconds

commit aeb9f38f217edb9b5e553cc3d0487a59f726f8c3
Author: Quickdesh <[email protected]>
Date:   Thu Dec 7 00:11:54 2023 -0500

    feat(hwdec): Sets default codec to SW for WSA clients

commit 21b2adf2e2de3ea9770126a4d3567b8cff062333
Merge: d4016d8c4 43ce04f87
Author: LuftVerbot <[email protected]>
Date:   Wed Dec 6 23:27:20 2023 +0100

    Merge branch 'master' into kuukiyomi

commit d4016d8c4860c889b812f6e14a90ab75b9ec194e
Merge: b4764086c 575a36468
Author: LuftVerbot <[email protected]>
Date:   Wed Dec 6 23:27:02 2023 +0100

    Merge branch 'dev' into kuukiyomi

commit b4764086c4ad956045a871431ba35869bd28b91e
Author: LuftVerbot <[email protected]>
Date:   Tue Dec 5 22:01:28 2023 +0100

    fix player settings again

commit ad51e5303a11c8474af5711a8589bfb882b31213
Author: LuftVerbot <[email protected]>
Date:   Tue Dec 5 21:49:53 2023 +0100

    fuck lint

commit 0b1b9b3d0ff8711594919ae91f8be50375bdf805
Merge: 4bf7c5bda 6a37f0ae3
Author: LuftVerbot <[email protected]>
Date:   Tue Dec 5 21:44:37 2023 +0100

    Merge pull request #76 from abdallahmehiz/kuukiyomi

commit 6a37f0ae3b6f3ed0e932cb3733e7df6282d43c50
Author: Abdallah Mehiz <[email protected]>
Date:   Tue Dec 5 11:53:22 2023 +0100

    Lint

commit 675a644441e5274d9562fd0f228edc437519f0d2
Author: Abdallah Mehiz <[email protected]>
Date:   Tue Dec 5 11:52:49 2023 +0100

    clean unnecessary gradle signing config for debug

commit 7137f18584522c4bee1ce0b9d031ea75694fa63b
Author: Abdallah Mehiz <[email protected]>
Date:   Tue Dec 5 11:46:53 2023 +0100

    Show Chapter title and progress
    Show Episode title

commit 4bf7c5bdad499f4417589a79f65ece324a624ff0
Author: LuftVerbot <[email protected]>
Date:   Sun Dec 3 16:41:10 2023 +0100

    cleanup

commit 86b4dcde25557b1e6d4f9dcee4b41ac4a467b3b4
Merge: e8618bef2 34393e892
Author: LuftVerbot <[email protected]>
Date:   Sun Dec 3 16:39:48 2023 +0100

    Merge branch 'dev' into kuukiyomi

commit 34393e8926bcbf883cd7f2bbc803ac73bcef5ded
Author: LuftVerbot <[email protected]>
Date:   Sun Dec 3 16:38:57 2023 +0100

    fix: Add some left out merge stuff

commit e8618bef2dab86ff79e60d3a1d5dd18cd455ff6c
Author: LuftVerbot <[email protected]>
Date:   Sun Dec 3 16:36:51 2023 +0100

    cleanup and fixes

commit ee8ab323d739a15572efee1747e5ca2377f50142
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 23:51:44 2023 +0100

    change notification icon

commit 5fe093e91d47b0ceda981265259d4043cba4d940
Merge: 869bf187e 0bce1caf5
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 23:16:53 2023 +0100

    Merge branch 'dev' into kuukiyomi

commit 0bce1caf52ef17a6a3cb2984a87734174c32fc42
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 23:15:53 2023 +0100

    create local anime & fonts folder automatically

commit 869bf187e98d9c8db96797682b2b3061f1076c81
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 22:26:01 2023 +0100

    cleanup

commit c5c36d027148b274c1e4a252d341b439610c71a1
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 22:23:19 2023 +0100

    Update Release.kt

commit b9f39f843f1ca7ea88b61287b19af728b39b97d7
Merge: 3ce0dc230 c1ff5b606
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 22:05:58 2023 +0100

    Merge branch 'dev' into kuukiyomi

commit 3ce0dc2308d5309e257a6250d7b97d1baaa8a8bf
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 17:57:09 2023 +0100

    cleanup

commit 5e329150297c6aa44618058fcfbaea71f27048ca
Merge: a3f878883 fcf503a99
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 17:56:57 2023 +0100

    Merge branch 'dualpage' into kuukiyomi

commit a3f878883ac41edf70da5d481f083c8ed94ded4c
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 17:34:24 2023 +0100

    Create strings-kuukiyomi.xml

commit e5f7d204183384b6ab2766c8ecf3ad7ede37bf1b
Merge: 2e096b64b bae795089
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 17:34:20 2023 +0100

    merge

commit 2e096b64b441c73f7a8a3426e9b1855c1bc8096e
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 17:09:45 2023 +0100

    prep

commit fcf503a990e65bf8501ff89b654912bd8534704a
Author: LuftVerbot <[email protected]>
Date:   Sat Dec 2 16:09:36 2023 +0100

    add doublepages & bottom reader button select

commit bae7950894972d654aa98cd5f3f4dff63296198a
Author: jmir1 <[email protected]>
Date:   Sat Dec 2 15:30:52 2023 +0100

    fix: Remove useless workflow job

commit 322da37df632fcc4de09a3fcfeda9ee446721266
Author: jmir1 <[email protected]>
Date:   Sat Dec 2 15:30:11 2023 +0100

    fix: Linting

commit 00690fe755a5d73a56f51388bd9fdc3733e9d2bf
Merge: 0855b603e e22eebfd0
Author: jmir1 <[email protected]>
Date:   Sat Dec 2 15:19:39 2023 +0100

    Merge branch 'upstream/master' into dev

commit a4825d6b2742924bdb46391c4f3a84b222849bae
Author: LuftVerbot <[email protected]>
Date:   Wed Nov 29 21:21:04 2023 +0100

    cleanup

commit 804ebd50fd68007c8644ddd937e77d607081ef02
Author: LuftVerbot <[email protected]>
Date:   Wed Nov 29 19:46:21 2023 +0100

    revert download storage separation

commit 16a6f4fcc3079c8ab683dcad6849797fb3a03e1a
Merge: 67d89fd38 45aa754d6
Author: LuftVerbot <[email protected]>
Date:   Wed Nov 29 19:43:04 2023 +0100

    Merge branch 'dev' into kuukiyomi

commit 67d89fd38c7a67984143661785a650d7998e02b2
Author: LuftVerbot <[email protected]>
Date:   Tue Nov 28 20:10:04 2023 +0100

    Update StreamsCatalogSheet.kt

commit 73293fd253bf67882b2e787c4214d0d9e2ffcb3d
Merge: 1785b8778 502caddb8
Author: LuftVerbot <[email protected]>
Date:   Tue Nov 28 19:06:24 2023 +0100

    Merge branch 'merge_new' into kuukiyomi

commit 502caddb804a25872e1f94afc60015c026a58458
Author: LuftVerbot <[email protected]>
Date:   Tue Nov 28 19:02:28 2023 +0100

    use separate  UpdateStrategy files for anime & manga

commit 1785b8778444d50a7de8e2664b80788d2f74a6c9
Merge: 623fc61c5 f25bc5fe5
Author: LuftVerbot <[email protected]>
Date:   Tue Nov 28 18:43:01 2023 +0100

    Merge branch 'kuuki_merge_base' into kuukiyomi

commit f25bc5fe56f36e787360d76b1c93f91c431271fc
Merge: 9dc024bb7 8f50ddfb1
Author: LuftVerbot <[email protected]>
Date:   Tue Nov 28 18:42:43 2023 +0100

    Merge branch 'merge_new' into kuuki_merge_base

commit 8f50ddfb11ec9fd6ecfcca397c9ff7c4c9485f01
Author: LuftVerbot <[email protected]>
Date:   Tue Nov 28 18:42:21 2023 +0100

    rename manga download val

commit 9dc024bb7860c0b3c670e2f08bd878bddf008b9c
Merge: 49c30b336 5bde557e2
Author: LuftVerbot <[email protected]>
Date:   Tue Nov 28 18:40:44 2023 +0100

    Merge branch 'merge_new' into kuuki_merge_base

commit 5bde557e20c135ee7845a09f2c71221813b3d78d
Author: LuftVerbot <[email protected]>
Date:   Tue Nov 28 18:20:27 2023 +0100

    separate anime & manga download location

commit 623fc61c51c8633655bf871395a6e625c5930c9d
Merge: ac003b4bc 49c30b336
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 19:28:42 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    fuck lint

commit ac003b4bc3cae6e3a08076c28564d507a50f0835
Merge: b2a403630 06f3f7e6b
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 19:27:01 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    cleanup

commit b2a4036306a5e039f5aab02acd2ee6b7df73fc36
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 19:01:51 2023 +0100

    cleanup

commit 5948b0ae87b2b9c702f2368ec7eb7c14aff9cb74
Merge: a8a6203d5 807ea3d1a
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 18:57:44 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit 807ea3d1a51b87d5b96e0d8297e3d329c5201bdb
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 a8a6203d51021f00e06cbbeeeb6cfd9a489957b6
Merge: 7c745a1bc 2b9fe5c38
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 15:18:14 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    fix anime tracker & airing sort

commit 7c745a1bc9b6eb5c1fbf33af70e442e17c6333d9
Merge: e77175110 eafc64aed
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 14:40:58 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    fuck lint

commit e77175110e3fce060f809a6dcc31b1f9f6cd19f7
Merge: 406416e79 eef4ef7ef
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 14:20:31 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    fix weird "explore tabs" behaviour

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

    use formatTime function

commit 406416e796ef9681148da9f6870e167ce081a2c0
Merge: 87da8872b df6a85a94
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 13:38:51 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    fix AnimeScreen crash

commit 87da8872bbad0ebbaed7c070e03912fcb74823e4
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 02:01:58 2023 +0100

    cleanup

commit 07f9196aa66907023e5fb0953cda8428b9d30b58
Merge: 11a23a94e 91de0ed82
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 26 02:01:42 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit 91de0ed82e3f5a4d79e6b24016c27ec42f05b9a1
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 11a23a94e4aebde14c43416b4e95c3c57dcb5512
Merge: 7bed14f8a 375a252a6
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 21:15:44 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit 375a252a69bb2bc8213490d8a4eb66222cbf417e
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 7bed14f8a516015be629ffca1794b81045663bec
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 19:53:20 2023 +0100

    cleanup

commit 14670e0afbbd9c64e4e1d44c89b21a9bf17660c0
Merge: 4340cdd40 d7aee0368
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 19:52:56 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit d7aee03688019b0ecda0bef96b7e40c21f69910b
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 4340cdd409fc5d8eef2fe98fad096b572c894984
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 18:00:50 2023 +0100

    Update AnimeUpdatesTab.kt

commit 01047ffcea1cd7b3eee693501c6f897bb0e31836
Merge: 96a079cf6 89777e98b
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 18:00:36 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit 89777e98b0e2b74d02745326a31ce8d92f83560b
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 96a079cf6b1e32a3e73ff20265bef848fd1b456b
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 15:18:47 2023 +0100

    cleanup

commit fcda3db958257e3f37a9e8671f8c105862217c75
Merge: 583761f8d 3fba4cbc2
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 15:18:34 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit 3fba4cbc2b8f76ab38383145e9c5b42d92ac985d
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 583761f8d369c318013670825777377aad474e60
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 14:32:18 2023 +0100

    cleanup

commit eacb4379945da89b1532cb8600b32c165ce559ab
Merge: 91f10e6c9 a60268e61
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 13:41:32 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    lint cleanup

commit c6f81b7fdadfe7f1d9af557a615c172f9ae1f203
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 91f10e6c97e40db768a3da4f99a57d803f3dc96f
Merge: 4d6b95b79 5f782440c
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 25 00:22:55 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit 5f782440c62eeec9826f741b32210b04dd57dfe7
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 4d6b95b79e3521119faa5b0e3e360227cb5dc7f9
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 23:44:19 2023 +0100

    fuck lint

commit cb266fdb3d085de918816429eff064db50c6eed3
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 23:38:15 2023 +0100

    update check once a day

commit 6cee9300aa27578ce225c449db3e81d86b244540
Merge: 24ae3df8b e4283fe41
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 23:22:10 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit e4283fe41694dfde18595705b2b9416fe446c547
Merge: e4d31057f adb571fcb
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 23:21:58 2023 +0100

    Merge branch 'master' into merge_upstream

commit 24ae3df8b4d369ad78007926d614566d6568c534
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 23:17:59 2023 +0100

    cleanup

commit 536d82e1e708e5ee17dc13a3280e7f7553e86a28
Merge: 6e6504d35 e4d31057f
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 23:08:10 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    cleanup

commit 150d43e325d8172bd2e6272214ac3121c2916570
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 6e6504d35e4bd0008fb6bdff0463cb80e583e5c0
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 20:29:35 2023 +0100

    update backup

commit 0c51f6f75d9c61d6643c9ebaac41ff46e9d8c5b6
Merge: 668df0400 76df725ca
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 20:27:49 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit 76df725cabe2514a9e763e231fed9257743f9b98
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 668df0400e50d991661528193a65cca4179ef445
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 17:08:17 2023 +0100

    Update icon.png

commit e1efae826d9f5f201846ded5cf3862e590aaff04
Merge: fdd9e4402 c07cc8dc2
Author: LuftVerbot <[email protected]>
Date:   Fri Nov 24 17:06:54 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit c07cc8dc21780f19cca4bd7e4035e3ef1faec43d
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 fdd9e4402709f17e201434168c27a824262b5b64
Merge: 285dadcd3 a654a54b7
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 23 23:02:02 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    Update build_push.yml

commit 285dadcd31e0b41acb648ce95f0af0c026c3088f
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 23 23:00:09 2023 +0100

    Update BackupRestorer.kt

commit 453b4376536bb8c270564e2a44546d15fa63bf52
Merge: a624e4098 325e625ae
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 23 22:49:10 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit a624e4098df5a265d409092b4df2f013e942148e
Author: LuftVerbot <[email protected]>
Date:   Thu Nov 23 22:48:23 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit 325e625aefc75aa4c2658a7fcbad1d3931ef9042
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 7e5490999fae245ea51da258f993ba9770e45c8f
Merge: 37b5c7884 b8cdb9d55
Author: LuftVerbot <[email protected]>
Date:   Mon Nov 20 21:47:59 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    small Episode Tracker change

commit 37b5c7884819eaabe7ec851a6950f1cb97e29766
Author: LuftVerbot <[email protected]>
Date:   Mon Nov 20 21:25:18 2023 +0100

    Update ReaderViewModel.kt

commit 1b8f2ecaaa05ce9287a71a155cd094b5e9a314a1
Merge: 2e012f197 f6d430df6
Author: LuftVerbot <[email protected]>
Date:   Mon Nov 20 21:21:50 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    fuck lint

commit 99eea595c015e3ba98a772f30cc71372b6629abf
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 2e012f1973940b1d0c1dd78b9bfe0c7c48e4d135
Merge: cabb228f6 18e04b75d
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 19:42:33 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit 18e04b75dfe7317f2cb8719c83c1bd89051ab199
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 cabb228f6f4cf34dd489615ccf844653b4fa13ab
Merge: b22bb89aa 3a3115304
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 16:45:46 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    ktlint formt

commit b22bb89aa71097802683afd8912be0dff0330de0
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 16:39:28 2023 +0100

    ktlint format

commit 1b55eecb3c81d6d87dd21fc95bae3687aeafa0a1
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 16:13:43 2023 +0100

    Update build.gradle.kts

commit 706a69b50a5330db23095401ba03b2f9b4ccfe6b
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 16:09:16 2023 +0100

    format ktlint

commit 7e6d32fff6c9b17e247abbde0fa97ba39ee7884e
Merge: 0853df96b ea2b7fe7c
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 16:08:57 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    ktlint format again

commit 0853df96b496c34b1087f73aff097bd0f23dc6f4
Merge: ee2596207 05f91245a
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 15:47:54 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    klint format again

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

    ktlint format

commit 6d92e6622ee571c04e060e9b4492a5615e923873
Merge: afe2b51e6 6215528c9
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 15:41:52 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    ktlint format

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

    fix ConcurrentHashMap crash

commit afe2b51e685431669b9719e320ec39401a30eb39
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 15:14:45 2023 +0100

    renaming

commit 87a981fb3133b6a1b24b7dec6201dd6cb7617cb1
Merge: a1c7a5c30 a34bc764b
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 15:04:54 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    renaming & ktlintCheck

commit a1c7a5c3083da503bf16ba133d9d6b807daeaa44
Merge: c03ea1052 f1cd8f69d
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 14:42:17 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit f1cd8f69d378d299fd9442d5efbcbcae0f431050
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 c03ea1052f4c22cfe8cf25ade22ac4a302874ada
Merge: 51a7c16db 2c4230376
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 13:21:09 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit 2c4230376c09c80969b48dc9dee9b78b9b7ddb2b
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 51a7c16dbdddb3fb151592cbcadbf9d68d2ddb42
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 00:45:30 2023 +0100

    readd getResourceColor

commit 63d3b65704cb2d6a6464e20d702114ff2217fa55
Merge: 8e7d1188d fa7b8427a
Author: LuftVerbot <[email protected]>
Date:   Sun Nov 19 00:39:04 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit fa7b8427a21971b5a1e41a54be0110878cd62918
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 8e7d1188def24738c9fe2cf6b378c5fc3673cca3
Merge: 0eda6a857 e29dc6283
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 18 17:28:26 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    lint cleanup

commit 0eda6a8573cdb4481527fe0677642cbe3f5f7fec
Merge: e99e21819 85d0e49fd
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 18 17:26:48 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

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

    little fix

commit e99e21819aa7833ed8f2f078d3db7fae52c6ce78
Merge: 77e979373 eeddf1769
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 18 17:20:49 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit eeddf176912086a113fc1a5643d1dd945b146dd8
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 77e97937381bbe70061c4cdd72f4d085c372a8ae
Merge: 1ddb52768 a2a445fdc
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 18 16:08:36 2023 +0100

    Merge branch 'merge_upstream' into kuukiyomi

commit a2a445fdc5bab555c55a7488b47e35bdfdc0d7db
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 1ddb527689bc7d0a00d5955744ac54c5e8a79389
Author: LuftVerbot <[email protected]>
Date:   Sat Nov 18 00:32:57 2023 +0100

    fuck lint

commit a280d446cd1eea6c4a30a0357f9abd6cb61df295
Merge: adaa860da 1b6301cc9
Au…
@LuftVerbot
First changes
ed3d29a
@LuftVerbot
more changes
9cf6c14
@LuftVerbot
remove mistakes
6b075d8
@LuftVerbot
Delete ISSUE_TEMPLATE.md
9f40457
@LuftVerbot
Update README.md
9b08937
@LuftVerbot
Merge branch 'master' into KuukiAniMerge
6b15fb0
@LuftVerbot
Update ReaderPage.kt
47a9d50
@LuftVerbot LuftVerbot closed this Jul 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@LuftVerbot