Merge branch 'refs/heads/1.20' into 1.21

CREDITS

@@ -109,6 +109,9 @@ H         |     cliffs_clouds.png
 H         |     grass_acacia_1.png
 H         |     grass_acacia_2.png
 H         |     grass_acacia_3.png
+HL        |     dripstone_caves.png
+HL        |     lush_caves.png
+HL        |     lush_caves_aquifer.png
 H         |     end_chorus_island.png
 H         |     end_chorus_sparse_island.png
 H         |     end_island_1.png
@@ -329,17 +332,17 @@ H         |     export.png
 H         |     hide_markers.png
 H         |     show_markers.png
 0         |     arrow.png
-H         |     book.png
-H         |     book_frame.png
-HS        |     book_frame_fullscreen.png
-HS        |     book_frame_fullscreen_r.png
-H         |     book_frame_narrow.png
-HS        |     book_frame_narrow_fullscreen.png
-HS        |     book_frame_narrow_fullscreen_r.png
-HS        |     book_fullscreen.png
-HS        |     book_fullscreen_r.png
-HS        |     bookmark_left.png
-HS        |     bookmark_right.png
+0         |     book.png
+0         |     book_frame.png
+0         |     book_frame_fullscreen.png
+0         |     book_frame_fullscreen_r.png
+0         |     book_frame_narrow.png
+0         |     book_frame_narrow_fullscreen.png
+0         |     book_frame_narrow_fullscreen_r.png
+0         |     book_fullscreen.png
+0         |     book_fullscreen_r.png
+0         |     bookmark_left.png
+0         |     bookmark_right.png
 H         |     eraser.png
 H         |     frame.png
 H         |     frame_selected.png