From 633893cea037285c3f77cc9dae3d95bde7f65e19 Mon Sep 17 00:00:00 2001 From: Tom Hudson Date: Thu, 2 Feb 2023 15:03:54 +0000 Subject: [PATCH] Change precedence of quiet and JSON output to favour JSON (#570) * Changes precedence of quiet and JSON output to favour JSON * Adds JSON output precedence change to CHANGELOG; TomNomNom to CONTRIBUTORS --------- Co-authored-by: Joona Hoikkala --- CHANGELOG.md | 3 ++- CONTRIBUTORS.md | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f73933e..f9b3adf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ - Multiline output prints out alphabetically sorted by keyword - Default configuration directories now follow `XDG_CONFIG_HOME` variable (less spam in your home directory) - Fixed issue with autocalibration of line & words filter - - Fixed issue with `-json` when used in conjunction with silent mode + - Made JSON (`-json`) output format take precedence over quiet output mode, to allow JSON output without the banner etc + - v1.5.0 - New diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index e23c76af..28c73236 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -30,6 +30,7 @@ * [justinsteven](https://github.com/justinsteven) * [jvesiluoma](https://github.com/jvesiluoma) * [Kiblyn11](https://github.com/Kiblyn11) +* [l4yton](https://github.com/l4yton) * [lc](https://github.com/lc) * [mprencipe](https://github.com/mprencipe) * [nnwakelam](https://twitter.com/nnwakelam) @@ -42,5 +43,6 @@ * [Shaked](https://github.com/Shaked) * [Skyehopper](https://github.com/Skyehopper) * [SolomonSklash](https://github.com/SolomonSklash) -* [l4yton](https://github.com/l4yton) -* [xfgusta](https://github.com/xfgusta) \ No newline at end of file +* [TomNomNom](https://github.com/tomnomnom) +* [xfgusta](https://github.com/xfgusta) +