Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java

docs/scarpet/api/BlocksAndWorldAccess.md

@@ -721,6 +721,8 @@ It returns a `map` with a report indicating how many chunks were affected, and h
  * `requested_chunks`: total number of chunks in the requested area or list
  * `affected_chunks`: number of chunks that will be removed / regenerated
  * `loaded_chunks`: number of currently loaded chunks in the requested area / list
+ * `relight_count`: number of relit chunks
+ * `relight_time`: time took to relit chunks
  * `layer_count_<status>`: number of chunks for which a `<status>` generation step has been performed
  * `layer_time_<status>`: cumulative time for all chunks spent on generating `<status>` step