Merge branch 'develop' into macos-develop

diff --cc .gitmodules
index ca4c570,585671e..fe2028a
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -1,7 -1,7 +1,7 @@@
  [submodule "lib/xtra"]
        path = lib/xtra
 -      url = https://github.com/hengband/hengband.xtra
 +      url = https://github.com/backwardsEric/hengband.xtra
        ignore = dirty
- [submodule "Hengband/Hengband/libcurl"]
-       path = Hengband/Hengband/libcurl
+ [submodule "VisualStudio/Hengband/libcurl"]
+       path = VisualStudio/Hengband/libcurl
        url = https://github.com/hengband/libcurl.git