Merge branch 'refs/heads/1.20' into 1.21

# Conflicts:
#	src/main/java/folk/sisby/antique_atlas/AntiqueAtlas.java
#	src/main/java/folk/sisby/antique_atlas/AtlasStructureLandmark.java
#	src/main/java/folk/sisby/antique_atlas/MarkerTexture.java
#	src/main/java/folk/sisby/antique_atlas/TerrainTiling.java
#	src/main/java/folk/sisby/antique_atlas/TileTexture.java
#	src/main/java/folk/sisby/antique_atlas/gui/AtlasScreen.java
#	src/main/java/folk/sisby/antique_atlas/gui/BookmarkButton.java
#	src/main/java/folk/sisby/antique_atlas/gui/MarkerModal.java
#	src/main/java/folk/sisby/antique_atlas/gui/core/Component.java
#	src/main/java/folk/sisby/antique_atlas/gui/core/ScrollBoxComponent.java
#	src/main/java/folk/sisby/antique_atlas/reloader/BiomeTileProviders.java
#	src/main/java/folk/sisby/antique_atlas/reloader/MarkerTextures.java
#	src/main/java/folk/sisby/antique_atlas/reloader/StructureTileProviders.java
#	src/main/java/folk/sisby/antique_atlas/reloader/TileTextures.java
#	src/main/java/folk/sisby/antique_atlas/util/DrawBatcher.java
#	src/main/java/folk/sisby/antique_atlas/util/ForgeTags.java