-
Notifications
You must be signed in to change notification settings - Fork 352
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge new-book
into main
#893
Conversation
Book structure
Book structure
Enabled the anchor links in every `_index.md` file inside of the `content/learn/book` section. I ported the changes made in bevyengine#275 over to the `new_book` branch. Closes bevyengine#274 Closes bevyengine#275
# Objective Migrates bevyengine#203 Closes bevyengine#83 # Solution - [x] Add code validation - [x] ~~Add code format checking~~ Removed to unblock the code validation changes # Problems During the implementation of the code validation and the format checking I encountered some problems which I would appreciate guidance or help with. ## Need to be addressed 1. ~~Zola doesn't highlight the code blocks using the rust syntax if you add more than just the language to the code block attributes. Example `rust` highlights the code correctly, `rust,no_run` doesn't. So currently the code highlighting is broken.~~ Zola is order dependent for attributes (as noted by @mockersf). So changing the attribute order from `rust,no_run` to `no_run,rust` works just fine. 1. Running `cargo fmt` doesn't format the doc examples. Adding the `rustfmt.toml` option `format_code_in_doc_comments = true` enables this, but requires nightly. In my tests it also only works if you add the code examples directly without using `#[doc = include_str!("_index.md")]`. So currently the format checking is not working. ## Nice to have 1. The `lib.rs` file of the `code-validation` crate has to be manually updated each time a new `_index.md` file is added or removed. It might be a good idea to dive deeper and see if we can implement a solution where this work is done automatically. For now this should be more than fine though. Co-authored-by: KDecay <[email protected]>
- Fixes bevyengine#207 # Status - [x] Split the PR - [x] Merge bevyengine#272 (do first to reduce dumb merge conflicts). - [x] Fix all mdlint violations - [x] Update CI to target `master` rather than `main` (or fix the branch name per bevyengine#140 ) - [x] Add local rules to ignore the same lints to improve contributor experience. I followed [these instructions](https://github.com/DavidAnson/vscode-markdownlint#configure); simply renaming the version in the .github folder didn't resolve the problem for me.
Quick follow-up to bevyengine#281.
I intend to close and split bevyengine#182 to improve both development and review workflows. This is a tiny PR to make reviewing that work less painful by reducing weird branch issues.
This allows us to verify that our code *will* work on 0.7, even if it currently doesn't on 0.6. Obviously this should be revised shortly after each crates.io release.
Merge master to new-book branch
Extracted from bevyengine#182. # Status - [x] Simplify example - [x] Avoid database analogy - [x] Edit and revise for clarity and quality - [x] Fix dead links - [x] Refactor Breakout example on Bevy repo - [x] Update text to sync closely with Breakout example
Ported from bevyengine#182. # Status - [x] revisit and revise - [x] remove all use of direct world APIs - [x] distinguish between `Entity` type and entity concept
The existing contributing instructions are incomplete, and spread across the README and CONTRIBUTING.md. This PR attempts to improve them and document the subtle process steps involved.
Sync `new-book` with latest changes in `master`. This should unblock bevyengine#405. There weren't really any major conflicts, the only thing I noticed is that in the `new-book` the `getting-started` section doesn't exist anymore (now is `welcome`). I've merged the `getting-started` files from `master` anyway and added a note in `ROADMAP.md` (which I presume you were using to track the new-book TODO). **I haven't done a rebase, just merged `master` into `sync-with-master`**. Which will probably mess with the co-authored information… 😇 cc @alice-i-cecile Co-authored-by: Carter Anderson <[email protected]> Co-authored-by: Federico Rinaldi <[email protected]> Co-authored-by: Charles <[email protected]> Co-authored-by: Rob Parrett <[email protected]> Co-authored-by: Forest Anderson <[email protected]> Co-authored-by: SuperSamus <[email protected]> Co-authored-by: Roryl-c <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: François <[email protected]> Co-authored-by: raffimolero <[email protected]> Co-authored-by: Afonso Lage <[email protected]> Co-authored-by: Nathan Stocks <[email protected]> Co-authored-by: Bude <[email protected]> Co-authored-by: TimJentzsch <[email protected]>
This PR adds an utility app that automatically writes [`hide_lines` Zola annotations](https://www.getzola.org/documentation/content/syntax-highlighting/#annotations) on book contents. Fixes bevyengine#373
…ine#513) - Updates `write-rustdoc-hide-lines` so it also updates `rs` code blocks.
…ngine#512) - Re-enable `test-code` CI job - Update failing examples to Bevy `0.9`
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Mike <[email protected]> Co-authored-by: Charles <[email protected]> Co-authored-by: François <[email protected]> Co-authored-by: Carter Anderson <[email protected]> Co-authored-by: TimJentzsch <[email protected]> Co-authored-by: Fracey <[email protected]> Co-authored-by: Pand9 <[email protected]> Co-authored-by: Hank Jordan <[email protected]> Co-authored-by: Nicola Papale <[email protected]> Co-authored-by: Berlian Gur <[email protected]> Co-authored-by: Rob Parrett <[email protected]> Co-authored-by: Charles <[email protected]> Co-authored-by: Andre Popovitch <[email protected]> Co-authored-by: Denis Pekdemir <[email protected]> Co-authored-by: Lee Reilly <[email protected]> Co-authored-by: Zearin <[email protected]> Co-authored-by: Alice Cecile <[email protected]> Co-authored-by: thejohnbackes <[email protected]> Co-authored-by: thejohnbackes <[email protected]> Co-authored-by: Valentin Geyer <[email protected]> Co-authored-by: Trayshar <[email protected]> Co-authored-by: Lemonzy <[email protected]> Co-authored-by: Tomasz Galkowski <[email protected]> Co-authored-by: Gary R Krause <[email protected]> Co-authored-by: Erick Melo <[email protected]> Co-authored-by: Caio <[email protected]> Co-authored-by: Caio César Oliveira <[email protected]> Co-authored-by: Mike <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Asier Illarramendi <[email protected]> Co-authored-by: Ida "Iyes <[email protected]> Co-authored-by: MikaT-code <[email protected]> Co-authored-by: Vezquex <[email protected]> Co-authored-by: Ciro Costa <[email protected]> Co-authored-by: Victor Lima <[email protected]> Co-authored-by: Ame <[email protected]> Co-authored-by: James Liu <[email protected]> Co-authored-by: ickk <[email protected]> Co-authored-by: Robert Swain <[email protected]> Co-authored-by: 张林伟 <[email protected]> Co-authored-by: Paul Kupper <[email protected]> Co-authored-by: Boxy <[email protected]> Co-authored-by: JoJoJet <[email protected]> Co-authored-by: Aevyrie <[email protected]> Co-authored-by: Marco Buono <[email protected]> Co-authored-by: Aceeri <[email protected]> Co-authored-by: Jay Pavlina <[email protected]> Co-authored-by: Greg Sparrow <[email protected]> Co-authored-by: Andreas Weibye <[email protected]> Co-authored-by: Adrian Kappel <[email protected]> Co-authored-by: Kellen Cataldo <[email protected]> Co-authored-by: Gian Zellweger <[email protected]> Co-authored-by: laund <[email protected]> Co-authored-by: Lars-Kristian <[email protected]> Co-authored-by: Gingeh <[email protected]> Co-authored-by: Kenneth Brooks <[email protected]> Co-authored-by: Paul Hansen <[email protected]> Co-authored-by: ira <[email protected]> Co-authored-by: Martin Lysell <[email protected]> Co-authored-by: Sélène Amanita <[email protected]> Co-authored-by: Leonardo Gatti <[email protected]> Co-authored-by: Zeke Gabrielse <[email protected]> Co-authored-by: Matt Fellenz <[email protected]> Co-authored-by: Brian Merchant <[email protected]> Co-authored-by: Jerome Humbert <[email protected]> Co-authored-by: Nicola Papale <[email protected]> Co-authored-by: robtfm <[email protected]> Co-authored-by: JMS55 <[email protected]> Co-authored-by: Gino Valente <[email protected]> Co-authored-by: mwbryant <[email protected]> Co-authored-by: Dot32 <[email protected]> Co-authored-by: IDEDARY <[email protected]> Co-authored-by: Nuutti Kotivuori <[email protected]> Co-authored-by: Elabajaba <[email protected]> Co-authored-by: Carl Engström <[email protected]> Co-authored-by: Opstic <[email protected]> Co-authored-by: SpecificProtagonist <[email protected]> Co-authored-by: Garden Gim <[email protected]> Co-authored-by: NiseVoid <[email protected]> Co-authored-by: lelo <[email protected]> Co-authored-by: Dorian Bucur <[email protected]> Co-authored-by: Simon Kindström <[email protected]> Co-authored-by: Max Heyer <[email protected]> Co-authored-by: wackbyte <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: alexmadeathing <[email protected]> Co-authored-by: KshitijAucharmal <[email protected]> Co-authored-by: Connor King <[email protected]> Co-authored-by: Matthew Miller <[email protected]> Co-authored-by: Michael Tidwell <[email protected]> Co-authored-by: BrayMatter <[email protected]> Co-authored-by: Tim Siegel <[email protected]> Co-authored-by: DevinLeamy <[email protected]> Co-authored-by: Cameron <[email protected]> Co-authored-by: Noah <[email protected]> Co-authored-by: Trashtalk217 <[email protected]> Co-authored-by: Joona Aalto <[email protected]> Co-authored-by: Nolan Darilek <[email protected]> Co-authored-by: Pascal Hertleif <[email protected]> Co-authored-by: NotAFile <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: cart <[email protected]> Co-authored-by: pyu <[email protected]> Co-authored-by: homersimpsons <[email protected]> Co-authored-by: Konstantin Kostiuk <[email protected]> Co-authored-by: Mikkel Rasmussen <[email protected]> Co-authored-by: TheBlckbird <[email protected]> Co-authored-by: Romain 'Maz' BILLOIR <[email protected]> Co-authored-by: TheBlckbird <[email protected]> Co-authored-by: Nia <[email protected]> Co-authored-by: Davide Paci <[email protected]>
I am kind of new to the website internals so bear with me for my missing knowledge. 1. A quick check that this didn't clobber anything it shouldn't. I have gone through all the sections, on main and in this PR, and I have not found anything missing, but the quick-start replacing the book as expected. 2. Local validation using zola that the new book won't be visible to end users. The new book, is hidden from links, and has the 'hidden' paragraph shown, but can still be accessed with the direct link URL/learn/book/, both when serving locally and when creating a build locally. I am not sure if the latter is intended, or if the final web-site is build differently than just 3. Local validation using zola that contributors can show drafts and check their built pages. I have been able to add a page and show my drafts, but I am not sure I did it the usual expected, I have yet to explicitly contribute pages to the site. a more seasoned contributor should double check this. I did not use the formal 'review approved' as I feel my yet limited knowledge requires more seasoned/knowledgeable contributors to approve :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are some tiny changes:
- a typo
- some link changes to avoid white blinking due to a redirection for the new quick start url
- codestyle
But my main concerns are about seo.
There is a redirection to handle the new url of the quick start, faq and migration guides but it sounds like Zola doesn't create redirection in children pages.
This mean that all the search engine referenced pages under /learn/book
path, (excluding /learn/book/quick-start
which is aliased by this PR) will now lead to a 404.
I am not sure Zola provides an easy way to handle this [Edit: I am now sure as this is a feature request]
To avoid this, we need create aliases for each page manually.
@TrialDragon to not do the job twice, I've submitted a PR in your branch, just merge it and all my review will be fixed.
content/learn/links.toml
Outdated
title = "The Bevy Book" | ||
url = "/learn/book/introduction" | ||
title = "The Quick Start Guide" | ||
url = "/learn/book/quick-start" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/learn/book/quick-start
redirects to /learn/quick-start/introduction
, we probably want to directly link this page instead to avoid white blinking redirection.
} | ||
``` | ||
|
||
Nice and simple right? Copy the code above into your ```main.rs``` file, then run: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only one backtick is needed here on main.rs
@@ -126,6 +154,8 @@ You can interpret the `Query` above as: "iterate over every `Name` component for | |||
Now we just register the system in our `App`. Note that you can pass more than one system into an `add_systems` call by using a tuple! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing [App
] and [add_systems
] link here to follow the page semantics.
Same on line 152, shouldn't we link Query struct?
@@ -64,31 +74,42 @@ fn main() { | |||
} | |||
``` | |||
|
|||
The {{rust_type(type="struct" crate="bevy_app", name="App" method="add_systems" no_struct=true)}} function adds the system to your App's {{rust_type(type="struct", crate="bevy_app", name="Update")}} {{rust_type(type="struct", crate="bevy_ecs", mod="schedule" no_mod=true name="Schedule")}}, but we'll cover that more later. | |||
The [`add_system`] function adds the system to your App's [`Update`] [`Schedule`], but we'll cover that more later. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo: the function name is add_system**s**
|
||
Now run your app again using `cargo run`. You should see `hello world!` printed once in your terminal. | ||
|
||
[`add_system`]: https://docs.rs/bevy_app/latest/bevy_app/struct.App.html#method.add_system |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To reflect the previous typo fix, this line should be:
[`add_systems`]: https://docs.rs/bevy_app/latest/bevy_app/struct.App.html#method.add_systems`
struct GreetTimer(Timer); | ||
|
||
fn greet_people( | ||
time: Res<Time>, mut timer: ResMut<GreetTimer>, query: Query<&Name, With<Person>>) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Codestyle, closing parenthesis and opening bracket should be on a new line, and should we expand the parameters on three lines to emphase them individually?
fn greet_people(
time: Res<Time>,
mut timer: ResMut<GreetTimer>,
query: Query<&Name, With<Person>>
) {
@@ -50,12 +50,14 @@ It also has many features most people expect from a modern, general purpose engi | |||
|
|||
That being said, Bevy is still in the very early stages. I consider it to be in the "prototyping" phase: features are missing, APIs will change, and documentation is sparse. <span class="warning">I don't yet recommend using Bevy in serious projects unless you are willing to deal with gaps and instability</span>. | |||
|
|||
Hopefully at this point you are either (1) jazzed about Bevy or (2) not reading anymore. If you want to dive in right now, [The Bevy Book](https://bevyengine.org/learn/book/introduction/) is the best place to get started. You can also keep reading to find out what the current state of Bevy is and where we'd like to take it. | |||
Hopefully at this point you are either (1) jazzed about Bevy or (2) not reading anymore. If you want to dive in right now, [The Quick Start Guide](/learn/book/quick-start/) is the best place to get started. You can also keep reading to find out what the current state of Bevy is and where we'd like to take it. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The quick start guide link should be on /learn/quick-start/introduction
to avoid white page redirection blink as mentioned previously.
The problem is present in all the news, I won't mention all of them to not bloat this review.
TL;DR;I fixed the issue described here in the PR of the @TrialDragon branch Description of the problem@alice-i-cecile My review mostly concern only the first point you wanted to check,
For the second point,
With the actual configuration, it's not totally the case, let me explain. Even if there isn't direct internal link to the book, Zola will generate these pages and as confirmed by @BorisBoutillier, they will be accessible for the users who know the direct url. This could be just ok, but our enemy are robots here. Plus, if we activate the internal Zola search bar, it will display those pages too. Looking into the Zola documentation and with some local tests, we can fix this using this configuration in the ignored_content = ['*/learn/book/**'] But!! Doing so, we break your third concern:
By adding this configuration, the pages are not generated and the contributors can't see their draft pages anymore. Not sure how you would tackle this? We can add a notice into the website contributor guide to disable this option in local? Or maybe there is a way with environment variable to let it enable but activate the [EDIT] A basic example: +++
title = "Assets"
weight = 5
sort_by = "weight"
template = "docs-section.html"
page_template = "docs-section.html"
insert_anchor_links = "right"
[extra]
hidden = true
+++ With a sitemap template like this one (not tested): <?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
{%- for sitemap_entry in entries %}
{%- if !sitemap_entry.hidden %}
<url>
<loc>{{ sitemap_entry.permalink | escape_xml | safe }}</loc>
{%- if sitemap_entry.updated %}
<lastmod>{{ sitemap_entry.updated }}</lastmod>
{%- endif %}
</url>
{%- endif %}
{%- endfor %}
</urlset> |
Don't we already hide the public draft pages from the site map like this via robots.txt and disallowing all public draft pages? Edit: Reading thru this again, apparently not. I wonder if it doesn't disallow children pages and sections of public draft sections meaning every single page and section has to be explicitly marked public draft... I'll look into this asap and see if that is avoidable in the macros for deciding which pages are disallowed. |
Fixing my review for bevyengine#893
So, public draft does disallow children in robots.txt, but as Romain has shown stuff was still in sitemap, meaning disallowing isn't removing stuff from sitemap (maybe that isn't how it works to solve the issue? Not sure how that is supposed to work in zola), or public draft code for doing that is flawed. Either way I'm bringing in Romain's solution of marking everything hidden for now since it should work. |
Inspecting the diff, this looks good.
No links are present, and I suspect this shouldn't get hidden.
This was easy to do by navigating to |
Reviewed and approved by @RomainMazB, as discussed on Discord. I'm merging this now: follow-up work can be done in other PRs that are less terrible to review. |
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Alice Cecile <[email protected]> Co-authored-by: KDecay <[email protected]> Co-authored-by: IceSentry <[email protected]> Co-authored-by: Carter Anderson <[email protected]> Co-authored-by: Asier Illarramendi <[email protected]> Co-authored-by: Federico Rinaldi <[email protected]> Co-authored-by: Rob Parrett <[email protected]> Co-authored-by: Forest Anderson <[email protected]> Co-authored-by: SuperSamus <[email protected]> Co-authored-by: Roryl-c <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: François <[email protected]> Co-authored-by: raffimolero <[email protected]> Co-authored-by: Afonso Lage <[email protected]> Co-authored-by: Nathan Stocks <[email protected]> Co-authored-by: Bude <[email protected]> Co-authored-by: TimJentzsch <[email protected]> Co-authored-by: Mike <[email protected]> Co-authored-by: Fracey <[email protected]> Co-authored-by: Pand9 <[email protected]> Co-authored-by: Hank Jordan <[email protected]> Co-authored-by: Nicola Papale <[email protected]> Co-authored-by: Berlian Gur <[email protected]> Co-authored-by: Charles <[email protected]> Co-authored-by: Andre Popovitch <[email protected]> Co-authored-by: Denis Pekdemir <[email protected]> Co-authored-by: Lee Reilly <[email protected]> Co-authored-by: Zearin <[email protected]> Co-authored-by: thejohnbackes <[email protected]> Co-authored-by: thejohnbackes <[email protected]> Co-authored-by: Valentin Geyer <[email protected]> Co-authored-by: Trayshar <[email protected]> Co-authored-by: Lemonzy <[email protected]> Co-authored-by: Tomasz Galkowski <[email protected]> Co-authored-by: Gary R Krause <[email protected]> Co-authored-by: Erick Melo <[email protected]> Co-authored-by: Caio <[email protected]> Co-authored-by: Caio César Oliveira <[email protected]> Co-authored-by: Mike <[email protected]> Co-authored-by: Ida "Iyes <[email protected]> Co-authored-by: MikaT-code <[email protected]> Co-authored-by: Vezquex <[email protected]> Co-authored-by: Ciro Costa <[email protected]> Co-authored-by: Victor Lima <[email protected]> Co-authored-by: Ame <[email protected]> Co-authored-by: James Liu <[email protected]> Co-authored-by: ickk <[email protected]> Co-authored-by: Robert Swain <[email protected]> Co-authored-by: 张林伟 <[email protected]> Co-authored-by: Paul Kupper <[email protected]> Co-authored-by: Boxy <[email protected]> Co-authored-by: JoJoJet <[email protected]> Co-authored-by: Aevyrie <[email protected]> Co-authored-by: Marco Buono <[email protected]> Co-authored-by: Aceeri <[email protected]> Co-authored-by: Jay Pavlina <[email protected]> Co-authored-by: Greg Sparrow <[email protected]> Co-authored-by: Andreas Weibye <[email protected]> Co-authored-by: Adrian Kappel <[email protected]> Co-authored-by: Kellen Cataldo <[email protected]> Co-authored-by: Gian Zellweger <[email protected]> Co-authored-by: laund <[email protected]> Co-authored-by: Lars-Kristian <[email protected]> Co-authored-by: Gingeh <[email protected]> Co-authored-by: Kenneth Brooks <[email protected]> Co-authored-by: Paul Hansen <[email protected]> Co-authored-by: ira <[email protected]> Co-authored-by: Martin Lysell <[email protected]> Co-authored-by: Sélène Amanita <[email protected]> Co-authored-by: Leonardo Gatti <[email protected]> Co-authored-by: Zeke Gabrielse <[email protected]> Co-authored-by: Matt Fellenz <[email protected]> Co-authored-by: Brian Merchant <[email protected]> Co-authored-by: Jerome Humbert <[email protected]> Co-authored-by: Nicola Papale <[email protected]> Co-authored-by: robtfm <[email protected]> Co-authored-by: JMS55 <[email protected]> Co-authored-by: Gino Valente <[email protected]> Co-authored-by: mwbryant <[email protected]> Co-authored-by: Dot32 <[email protected]> Co-authored-by: IDEDARY <[email protected]> Co-authored-by: Nuutti Kotivuori <[email protected]> Co-authored-by: Elabajaba <[email protected]> Co-authored-by: Carl Engström <[email protected]> Co-authored-by: Opstic <[email protected]> Co-authored-by: SpecificProtagonist <[email protected]> Co-authored-by: Garden Gim <[email protected]> Co-authored-by: NiseVoid <[email protected]> Co-authored-by: lelo <[email protected]> Co-authored-by: Dorian Bucur <[email protected]> Co-authored-by: Simon Kindström <[email protected]> Co-authored-by: Max Heyer <[email protected]> Co-authored-by: wackbyte <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: alexmadeathing <[email protected]> Co-authored-by: KshitijAucharmal <[email protected]> Co-authored-by: Connor King <[email protected]> Co-authored-by: Matthew Miller <[email protected]> Co-authored-by: Michael Tidwell <[email protected]> Co-authored-by: BrayMatter <[email protected]> Co-authored-by: Tim Siegel <[email protected]> Co-authored-by: DevinLeamy <[email protected]> Co-authored-by: Cameron <[email protected]> Co-authored-by: Noah <[email protected]> Co-authored-by: Trashtalk217 <[email protected]> Co-authored-by: Joona Aalto <[email protected]> Co-authored-by: Nolan Darilek <[email protected]> Co-authored-by: Pascal Hertleif <[email protected]> Co-authored-by: NotAFile <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: cart <[email protected]> Co-authored-by: pyu <[email protected]> Co-authored-by: homersimpsons <[email protected]> Co-authored-by: Konstantin Kostiuk <[email protected]> Co-authored-by: Mikkel Rasmussen <[email protected]> Co-authored-by: TheBlckbird <[email protected]> Co-authored-by: Romain 'Maz' BILLOIR <[email protected]> Co-authored-by: TheBlckbird <[email protected]> Co-authored-by: Nia <[email protected]> Co-authored-by: Davide Paci <[email protected]> Co-authored-by: Maz <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Alice Cecile <[email protected]> Co-authored-by: KDecay <[email protected]> Co-authored-by: IceSentry <[email protected]> Co-authored-by: Carter Anderson <[email protected]> Co-authored-by: Asier Illarramendi <[email protected]> Co-authored-by: Federico Rinaldi <[email protected]> Co-authored-by: Rob Parrett <[email protected]> Co-authored-by: Forest Anderson <[email protected]> Co-authored-by: SuperSamus <[email protected]> Co-authored-by: Roryl-c <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: François <[email protected]> Co-authored-by: raffimolero <[email protected]> Co-authored-by: Afonso Lage <[email protected]> Co-authored-by: Nathan Stocks <[email protected]> Co-authored-by: Bude <[email protected]> Co-authored-by: TimJentzsch <[email protected]> Co-authored-by: Mike <[email protected]> Co-authored-by: Fracey <[email protected]> Co-authored-by: Pand9 <[email protected]> Co-authored-by: Hank Jordan <[email protected]> Co-authored-by: Nicola Papale <[email protected]> Co-authored-by: Berlian Gur <[email protected]> Co-authored-by: Charles <[email protected]> Co-authored-by: Andre Popovitch <[email protected]> Co-authored-by: Denis Pekdemir <[email protected]> Co-authored-by: Lee Reilly <[email protected]> Co-authored-by: Zearin <[email protected]> Co-authored-by: thejohnbackes <[email protected]> Co-authored-by: thejohnbackes <[email protected]> Co-authored-by: Valentin Geyer <[email protected]> Co-authored-by: Trayshar <[email protected]> Co-authored-by: Lemonzy <[email protected]> Co-authored-by: Tomasz Galkowski <[email protected]> Co-authored-by: Gary R Krause <[email protected]> Co-authored-by: Erick Melo <[email protected]> Co-authored-by: Caio <[email protected]> Co-authored-by: Caio César Oliveira <[email protected]> Co-authored-by: Mike <[email protected]> Co-authored-by: Ida "Iyes <[email protected]> Co-authored-by: MikaT-code <[email protected]> Co-authored-by: Vezquex <[email protected]> Co-authored-by: Ciro Costa <[email protected]> Co-authored-by: Victor Lima <[email protected]> Co-authored-by: Ame <[email protected]> Co-authored-by: James Liu <[email protected]> Co-authored-by: ickk <[email protected]> Co-authored-by: Robert Swain <[email protected]> Co-authored-by: 张林伟 <[email protected]> Co-authored-by: Paul Kupper <[email protected]> Co-authored-by: Boxy <[email protected]> Co-authored-by: JoJoJet <[email protected]> Co-authored-by: Aevyrie <[email protected]> Co-authored-by: Marco Buono <[email protected]> Co-authored-by: Aceeri <[email protected]> Co-authored-by: Jay Pavlina <[email protected]> Co-authored-by: Greg Sparrow <[email protected]> Co-authored-by: Andreas Weibye <[email protected]> Co-authored-by: Adrian Kappel <[email protected]> Co-authored-by: Kellen Cataldo <[email protected]> Co-authored-by: Gian Zellweger <[email protected]> Co-authored-by: laund <[email protected]> Co-authored-by: Lars-Kristian <[email protected]> Co-authored-by: Gingeh <[email protected]> Co-authored-by: Kenneth Brooks <[email protected]> Co-authored-by: Paul Hansen <[email protected]> Co-authored-by: ira <[email protected]> Co-authored-by: Martin Lysell <[email protected]> Co-authored-by: Sélène Amanita <[email protected]> Co-authored-by: Leonardo Gatti <[email protected]> Co-authored-by: Zeke Gabrielse <[email protected]> Co-authored-by: Matt Fellenz <[email protected]> Co-authored-by: Brian Merchant <[email protected]> Co-authored-by: Jerome Humbert <[email protected]> Co-authored-by: Nicola Papale <[email protected]> Co-authored-by: robtfm <[email protected]> Co-authored-by: JMS55 <[email protected]> Co-authored-by: Gino Valente <[email protected]> Co-authored-by: mwbryant <[email protected]> Co-authored-by: Dot32 <[email protected]> Co-authored-by: IDEDARY <[email protected]> Co-authored-by: Nuutti Kotivuori <[email protected]> Co-authored-by: Elabajaba <[email protected]> Co-authored-by: Carl Engström <[email protected]> Co-authored-by: Opstic <[email protected]> Co-authored-by: SpecificProtagonist <[email protected]> Co-authored-by: Garden Gim <[email protected]> Co-authored-by: NiseVoid <[email protected]> Co-authored-by: lelo <[email protected]> Co-authored-by: Dorian Bucur <[email protected]> Co-authored-by: Simon Kindström <[email protected]> Co-authored-by: Max Heyer <[email protected]> Co-authored-by: wackbyte <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: alexmadeathing <[email protected]> Co-authored-by: KshitijAucharmal <[email protected]> Co-authored-by: Connor King <[email protected]> Co-authored-by: Matthew Miller <[email protected]> Co-authored-by: Michael Tidwell <[email protected]> Co-authored-by: BrayMatter <[email protected]> Co-authored-by: Tim Siegel <[email protected]> Co-authored-by: DevinLeamy <[email protected]> Co-authored-by: Cameron <[email protected]> Co-authored-by: Noah <[email protected]> Co-authored-by: Trashtalk217 <[email protected]> Co-authored-by: Joona Aalto <[email protected]> Co-authored-by: Nolan Darilek <[email protected]> Co-authored-by: Pascal Hertleif <[email protected]> Co-authored-by: NotAFile <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: cart <[email protected]> Co-authored-by: pyu <[email protected]> Co-authored-by: homersimpsons <[email protected]> Co-authored-by: Konstantin Kostiuk <[email protected]> Co-authored-by: Mikkel Rasmussen <[email protected]> Co-authored-by: TheBlckbird <[email protected]> Co-authored-by: Romain 'Maz' BILLOIR <[email protected]> Co-authored-by: TheBlckbird <[email protected]> Co-authored-by: Nia <[email protected]> Co-authored-by: Davide Paci <[email protected]> Co-authored-by: Maz <[email protected]>
Merges the
new-book
branch intomain
resolving conflicts along the way.Closes #870
Closes #602