Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main_master' into fix_nav_bar_home
# Conflicts: # dist/bilibili-evolved.preview.user.js # dist/bilibili-evolved.user.js # registry/dist/components/feeds/copy-link.js # registry/dist/components/feeds/disable-details.js # registry/dist/components/feeds/extend-live.js # registry/dist/components/feeds/filter.js # registry/dist/components/feeds/fixed-sidebars.js # registry/dist/components/feeds/fold-comments.js # registry/dist/components/feeds/full-content.js # registry/dist/components/feeds/full-title.js # registry/dist/components/feeds/unfold.js # registry/dist/components/live/auto-draw.js # registry/dist/components/live/badge-helper.js # registry/dist/components/live/danmaku-sendbar.js # registry/dist/components/live/download-records.js # registry/dist/components/live/gift-box.js # registry/dist/components/live/home-mute.js # registry/dist/components/live/pip.js # registry/dist/components/live/remove-watermark.js # registry/dist/components/live/showgirl.js # registry/dist/components/live/side-bar.js # registry/dist/components/style/always-show-duration.js # registry/dist/components/style/auto-hide-sidebar.js # registry/dist/components/style/custom-navbar.js # registry/dist/components/style/dark-mode.js # registry/dist/components/style/dark-mode/follow-system.js # registry/dist/components/style/dark-mode/schedule.js # registry/dist/components/style/hide/bangumi/reviews.js # registry/dist/components/style/hide/bangumi/sponsors.js # registry/dist/components/style/hide/banner.js # registry/dist/components/style/hide/video/recommended-live.js # registry/dist/components/style/hide/video/related-videos.js # registry/dist/components/style/hide/video/top-mask.js # registry/dist/components/style/player-on-top.js # registry/dist/components/style/player-shadow.js # registry/dist/components/style/scrollbar.js # registry/dist/components/style/sidebar-offset.js # registry/dist/components/style/simplify/comments.js # registry/dist/components/style/special-danmaku.js # registry/dist/components/style/v1-panel.js # registry/dist/components/touch/combo-like.js # registry/dist/components/touch/double-click-control.js # registry/dist/components/touch/mini-player.js # registry/dist/components/touch/player-control.js # registry/dist/components/touch/player-gestures.js # registry/dist/components/utils/change-update-urls.js # registry/dist/components/utils/check-in-center.js # registry/dist/components/utils/column-unlock.js # registry/dist/components/utils/comments/copy-link.js # registry/dist/components/utils/download-audio.js # registry/dist/components/utils/image-exporter.js # registry/dist/components/utils/image-resolution.js # registry/dist/components/utils/keymap.js # registry/dist/components/utils/remove-promotions.js # registry/dist/components/utils/url-params-clean.js # registry/dist/components/utils/v1-migrate.js # registry/dist/components/utils/view-cover.js # registry/dist/components/utils/watchlater-redirect.js # registry/dist/components/video/biliplus-redirect.js # registry/dist/components/video/bvid-convert.js # registry/dist/components/video/danmaku/airborne.js # registry/dist/components/video/danmaku/download.js # registry/dist/components/video/danmaku/expand.js # registry/dist/components/video/download.js # registry/dist/components/video/full-description.js # registry/dist/components/video/full-episode-title.js # registry/dist/components/video/outer-watchlater.js # registry/dist/components/video/player/auto-light.js # registry/dist/components/video/player/control-background.js # registry/dist/components/video/player/default-mode.js # registry/dist/components/video/player/double-click-fullscreen.js # registry/dist/components/video/player/focus.js # registry/dist/components/video/player/intersection-actions.js # registry/dist/components/video/player/legacy-auto-play.js # registry/dist/components/video/player/preserve-danmaku-input.js # registry/dist/components/video/player/remember-speed.js # registry/dist/components/video/player/remove-popup.js # registry/dist/components/video/player/screenshot.js # registry/dist/components/video/player/seek-by-frames.js # registry/dist/components/video/player/show-cover.js # registry/dist/components/video/player/skip-charge-list.js # registry/dist/components/video/quick-favorite.js # registry/dist/components/video/seo-redirect.js # registry/dist/components/video/subtitle/download.js # registry/dist/plugins/launch-bar/trending-search.js # registry/dist/plugins/settings-panel/recent-components.js # registry/dist/plugins/style/custom-navbar-dark-mode.js # registry/dist/plugins/utils/keymap-dark-mode.js # registry/dist/plugins/utils/keymap-empty-action.ts.js # registry/dist/plugins/v-loading/reimu.js # registry/dist/plugins/video/download/aria2-output.js # registry/dist/plugins/video/download/idm-output.js # registry/dist/plugins/video/download/mpv-output.js
- Loading branch information