From c726b61dccd59cad2866f29e0429b7670982d7be Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 26 May 2023 06:44:58 +0530
Subject: [PATCH] version 6.18.0

---
 Changelog.txt            | 54 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 4ba88bfc70..a14691592a 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -23,6 +23,60 @@
 # - title by author
 # }}}
 
+{{{ 6.18.0 2023-05-26
+
+:: new features
+
+- [2020603] Cover download: Allowing saving alternate covers to disk or in the book's data folder by right clicking on the cover
+
+- [2020237] Content server: Allow disabling full text search via the web interface
+
+- [2020233] When sending books to the device confirm the overwrite if the book already exists on the device
+
+- E-book viewer: Handle horizontal wheel events as section jumps in paged mode
+
+- Comic Input: When grayscaling comic images use 16bit gray instead of 8bit for better fidelity
+
+  When using the PNG format for images this results in larger files but with better grayscaling fidelity.
+
+- Add a new option in Preferences->Searching to disable keyboard searching in book list (i.e. you can turn off the behavior that pressing a key will jump to the first book whose title starts with that letter)
+
+- [2018423] Manage categories dialog: Use alternating row colors and allow adjusting row height
+
+- Allow assigning a keyboard shortcut in Preferences->Shortcuts to open the data folder of a book
+
+- Various improvements to syntax highlighting for the Markdown long text editor
+
+:: bug fixes
+
+- [2018025] Fix a regression in 6.16 that broke restoring of the database
+
+- Tag browser: Fix using F2 to edit items not allowing completion
+
+- Book details: Fix formatting of text when copying all book details in narrow mode
+
+- Book details: Fix copy all not respecting line breaks in fields
+
+- [2018660] Fix a regression in previous release that broke scrolling when using the scroll_per_row tweak
+
+- [2018548] Fix a regression in the previous release that broke the category manager dialog in some situations
+
+
+:: improved recipes
+- NYTimes
+- Economist
+- Washington Post
+- Irish Independent and Irish Times
+- Live Mint
+- Psych
+- Hindu
+
+:: new recipes
+- Irish Times Free by unkn0wn
+- elEconomista.es and El Confidencial by Hugo Meza
+
+}}}
+
 {{{ 6.17.0 2023-04-26
 
 :: new features
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 00cefe2d8e..ce1539c382 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -5,7 +5,7 @@ from functools import lru_cache
 import sys, locale, codecs, os, collections, collections.abc
 
 __appname__   = 'calibre'
-numeric_version = (6, 17, 0)
+numeric_version = (6, 18, 0)
 __version__   = '.'.join(map(str, numeric_version))
 git_version   = None
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"