Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	os/macosx/Info.plist.in
#	src/fileio.cpp
#	src/landscape.cpp
#	src/league_cmd.h
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.cpp

src/widgets/newgrf_debug_widget.h

@@ -47,6 +47,8 @@ enum SpriteAlignerWidgets {
 	WID_SA_LIST,        ///< Queried sprite list.
 	WID_SA_SCROLLBAR,   ///< Scrollbar for sprite list.
 	WID_SA_RESET_REL,   ///< Reset relative sprite offset
+	WID_SA_CENTRE,      ///< Toggle centre sprite.
+	WID_SA_CROSSHAIR,   ///< Toggle crosshair.
 };
 
 #endif /* WIDGETS_NEWGRF_DEBUG_WIDGET_H */