Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

.gitignore

@@ -28,7 +28,6 @@ config/customloadingscreen_timings.nbt
 config/simplelogin.cfg
 config/fml.toml
 config/forge-client.toml
-config/xaerominimap_entities.json
 # config/xaerominimap.txt
 # config/xaeroworldmap.txt
 config/fancymenu/menu_identifiers.db
@@ -48,6 +47,7 @@ config/stellarcore_stitcher_cache_vanilla.dat
 
 .vs/
 .vscode/
+.vs/
 .idea/
 .bobby/
 .mixin.out/
@@ -100,6 +100,7 @@ optionsof.txt
 optionsshaders.txt
 OpenComputersMod-*
 hei_bookmarks.ini
+gtceu/prospection_cache/
 
 # Server data
 .pakku/server-overrides/libraries