From d8ff559c7e3ae39c12c4fd08ec96ffcfeb798516 Mon Sep 17 00:00:00 2001 From: Andrew McGregor Date: Thu, 2 Jan 2025 20:41:22 +1100 Subject: [PATCH 1/4] Add missing git fetch to README (#514) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3685bbce6..0cc07003c 100644 --- a/README.md +++ b/README.md @@ -184,6 +184,7 @@ Can switch back to mainline klipper at any time via a `git checkout upstream_mai ```bash cd ~/klipper git remote add kalico https://github.com/KalicoCrew/kalico.git +git fetch kalico git checkout -b upstream-main origin/master git branch -D master git checkout -b main kalico/main From e1c44ace6112158091a63dd4b598e0832b432cb8 Mon Sep 17 00:00:00 2001 From: Pedro Lamas Date: Thu, 2 Jan 2025 09:51:35 +0000 Subject: [PATCH 2/4] Fixes typo in pid_calibrate.py (#509) --- klippy/extras/pid_calibrate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/klippy/extras/pid_calibrate.py b/klippy/extras/pid_calibrate.py index cd117342b..cb59e1b93 100644 --- a/klippy/extras/pid_calibrate.py +++ b/klippy/extras/pid_calibrate.py @@ -129,7 +129,9 @@ def temperature_update(self, read_time, temp, target_temp): if not self.started and temp >= self.temp_low: self.errored = True self.finish(read_time) - self.gcode.respond_info("temperature to high to start calibration") + self.gcode.respond_info( + "temperature is too high to start calibration" + ) return else: self.started = True From 736e76c6e8259cc234bfb73f0a0784634e232a7d Mon Sep 17 00:00:00 2001 From: KaruroChori Date: Thu, 2 Jan 2025 10:03:27 +0000 Subject: [PATCH 3/4] Fixing admonitions blocks on docs (#511) Co-authored-by: checkroom --- docs/_kalico/mkdocs-requirements.txt | 1 + docs/_kalico/mkdocs.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/_kalico/mkdocs-requirements.txt b/docs/_kalico/mkdocs-requirements.txt index cef94e35c..50f6b19f4 100644 --- a/docs/_kalico/mkdocs-requirements.txt +++ b/docs/_kalico/mkdocs-requirements.txt @@ -8,3 +8,4 @@ mdx-truly-sane-lists==1.3 mdx-breakless-lists==1.0.1 py-gfm==2.0.0 markdown==3.6 +mkdocs-github-admonitions-plugin==0.0.3 \ No newline at end of file diff --git a/docs/_kalico/mkdocs.yml b/docs/_kalico/mkdocs.yml index 4de153ee3..ca73d0a14 100644 --- a/docs/_kalico/mkdocs.yml +++ b/docs/_kalico/mkdocs.yml @@ -31,6 +31,7 @@ plugins: mkdocs-simple-hooks: hooks: on_page_markdown: "docs._kalico.mkdocs_hooks:transform" + gh-admonitions: # Website layout configuration (using mkdocs-material theme) theme: From 4089c357b08d8092dcdd1b6ca91b90f3072e220a Mon Sep 17 00:00:00 2001 From: KaruroChori Date: Thu, 2 Jan 2025 10:32:06 +0000 Subject: [PATCH 4/4] Fix #511 (#515) The markdown extension for admonitions must be enabled as well. --- docs/_kalico/mkdocs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/_kalico/mkdocs.yml b/docs/_kalico/mkdocs.yml index ca73d0a14..c7728ff4a 100644 --- a/docs/_kalico/mkdocs.yml +++ b/docs/_kalico/mkdocs.yml @@ -25,6 +25,7 @@ markdown_extensions: - mdx_partial_gfm - mdx_truly_sane_lists - mdx_breakless_lists + - admonition plugins: search: lang: en @@ -154,4 +155,4 @@ nav: - TSL1401CL_Filament_Width_Sensor.md - Hall_Filament_Width_Sensor.md - Contact.md - - Sponsors.md \ No newline at end of file + - Sponsors.md