From e6242926080661a7f6a5221e851038bb83e82a0e Mon Sep 17 00:00:00 2001
From: jesopo
Date: Thu, 10 Oct 2019 13:36:55 +0100
Subject: v1.12.0 release

---
 CHANGELOG.md  | 25 +++++++------------------
 src/IRCBot.py |  2 +-
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bfd5f93..26f0f2c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,7 @@
-# 2019-10-10 - BitBot v1.12.0-rc2
+# 2019-10-10 - BitBot v1.12.0
 
 Added:
 - Basic lock file mechanics (`src/LockFile.py`)
-- Single-line normalisation of fediverse Notes by vaguely parsing HTML
-- Single-line normalisation of RSS titles
-- Single-line normalisation of tweets
-
-Changed:
-- `!editserver` should work for currently-disconnected servers
-- Also count `"/"` as a word split for checking how different a `<title>` is from a URL (`title.py`)
-- `INFO` logging should go to a file - stdout should only be `WARN`
-
-Fixed:
-- Wasn't catching `timers.add()` output as `timer` var in reconnection logic
-- Multi-word markov seeds should have failed if no new data was found
-- `masterlogin` should only allow you to bypass `permission` checks, not e.g. `require_access` or `require_mode`
-
-# 2019-10-09 - BitBot v1.12.0-rc1
-
-Added:
 - `external_modules` - an arbitrary directory in which to look for modules
 - `channel_blacklist.py` - rewrite `JOIN`s and send instant `PART`s to avoid the bot being in certain channels
 - Ability to specify different `channel_op.py` `ban-mask` for users with accounts
@@ -49,6 +32,9 @@ Added:
 - `strip_otr.py` - remove trail whitespace used for automated OTR handshakes
 - Support disabling `words.py` word tracking for a while channel
 - `utils.deadline_process` - like `@utils.deadline` but uses a subprocess
+- Single-line normalisation of fediverse Notes by vaguely parsing HTML
+- Single-line normalisation of RSS titles
+- Single-line normalisation of tweets
 
 Changed:
 - REST API only listens on localhost now, for security reasons
@@ -82,6 +68,8 @@ Changed:
 - `utils.http.request()` now supports a complex request object
 - `utils.http.request()` now uses more factors to detect a HTML page's encoding
 - `utils.http.is_localhost()` -> `utils.http.host_permitted()` and reject more IP ranges
+- `!editserver` should work for currently-disconnected servers
+- `INFO` logging should go to a file - stdout should only be `WARN`
 
 Fixed:
 - `badges.py` now forces UTC
@@ -89,6 +77,7 @@ Fixed:
 - `!cignore` was not working for non-bot-admin users
 - `!tw` should be asking for `tweet_mode="extended"`
 - Fix `server.send_invite()` arg order
+- `masterlogin` should only allow you to bypass `permission` checks, not e.g. `require_access` or `require_mode`
 
 Removed:
 - `books.py`
diff --git a/src/IRCBot.py b/src/IRCBot.py
index 101d3d7b..8760f610 100644
--- a/src/IRCBot.py
+++ b/src/IRCBot.py
@@ -3,7 +3,7 @@ import typing, uuid
 from src import EventManager, Exports, IRCServer, Logging, ModuleManager
 from src import PollHook, Socket, Timers, utils
 
-VERSION = "v1.12.0-rc2"
+VERSION = "v1.12.0"
 SOURCE = "https://git.io/bitbot"
 URL = "https://bitbot.dev"
 
-- 
cgit v1.3.1-10-gc9f91