From 6f953a4cbb20f4a92a5e905f6f8e1b0e556b2805 Mon Sep 17 00:00:00 2001
From: Dpeta <jasprose@protonmail.com>
Date: Tue, 24 Aug 2021 15:55:57 +0200
Subject: [PATCH] Squashed commit of the following:

commit de8116899c63767c504b3787f090bbd6a7ee5604
Author: Dpeta <69427753+Dpeta@users.noreply.github.com>
Date:   Tue Aug 10 23:08:27 2021 +0000

    Update CHANGELOG.md

commit c4dd2dcee524c5f784ed27fda56ce2fca61990ae
Author: BuildTools <Jasprose@protonmail.com>
Date:   Wed Aug 11 00:37:02 2021 +0200

    added logging.conf to setup.py & pyinstaller.py
---
 CHANGELOG.md   | 7 ++++---
 pyinstaller.py | 3 ++-
 setup.py       | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90ff979..56d06ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,14 +22,15 @@
 ### Fixed
 - Crash when opening invite-only memo. (My bad-)
 - Random encounters occasionally not being disabled when switched off. (RE bot is now updated after connect and on profile switch.)
-- A few memo/convo related syntax errors in a few themes
+- A few memo/convo related syntax errors in a few themes.
 - nothing.png being missing in some themes.
-- 64-bit crt for PyInstaller 
-- Manual sort not working
+- 64-bit crt for PyInstaller.
+- Manual chumroll sorting not working.
 
 ### Changed
 - Honk emote now only triggers when typing ':honk:' instead of on every 'honk'.
 - Logging is now configured in logging.conf and logs are also writen to pesterchum.log by default.
+- Warnings/Errors are now logged to pesterchum.log as well as console.
 
 ## [v2.1.2] - 2021-4-16
 
diff --git a/pyinstaller.py b/pyinstaller.py
index 3728743..4b2821f 100644
--- a/pyinstaller.py
+++ b/pyinstaller.py
@@ -92,7 +92,8 @@ add_data = ['quirks;quirks',
         'LICENSE;.',
         'CHANGELOG.md;.',
         'PCskins.png;.',
-        'Pesterchum.png;.']
+        'Pesterchum.png;.',
+        'logging.conf;.']
 
 upx_exclude = ["qwindows.dll",
     "Qt5Core.dll",
diff --git a/setup.py b/setup.py
index 484b19d..abb03c2 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,8 @@ includefiles = ["quirks",
                 "LICENSE",
                 "CHANGELOG.md",
                 "PCskins.png",
-                "Pesterchum.png"]
+                "Pesterchum.png",
+                "logging.conf"]
 build_exe_options = {
 ##    "includes": ["PyQt5.QtCore",
 ##                 "PyQt5.QtGui",