Merge branch 'develop' into adv-beta

.github/workflows/build-linux.yml

@@ -169,7 +169,7 @@ jobs:
       - name: Run cpp tests
         if: inputs.platform-files
         run: ninja -C build test
-      - name: Finalize cache
+      - name: Finalize ccache
         if: inputs.platform-files
         run: |
           ccache --show-stats --verbose

.github/workflows/watch-df-steam.yml

@@ -34,7 +34,6 @@ jobs:
       with:
         path: state
         key: watchstate-${{ matrix.df_steam_branch }}
-        restore-keys: watchstate-${{ matrix.df_steam_branch }}
     - name: Compare branch metadata
       uses: nick-fields/retry@v3
       with:

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "plugins/stonesense"]
 	path = plugins/stonesense
 	url = ../../DFHack/stonesense.git
-[submodule "plugins/isoworld"]
-	path = plugins/isoworld
-	url = ../../DFHack/isoworld.git
 [submodule "library/xml"]
 	path = library/xml
 	url = ../../DFHack/df-structures.git

ci/lint-ignore.txt

@@ -3,7 +3,6 @@
 .git/*
 
 # Old files exempt from checks for now
-plugins/isoworld/*.txt
 plugins/raw/*.txt
 plugins/stonesense/*.txt
 
@@ -22,6 +21,4 @@ library/include/df/*
 
 # Dependencies that we don't control
 depends/*
-plugins/isoworld/agui/*
-plugins/isoworld/allegro/*
 plugins/stonesense/allegro/*

ci/update-submodules.manifest

@@ -1,10 +1,10 @@
 library/xml master
 scripts master
 plugins/stonesense master
-plugins/isoworld dfhack
 depends/clsocket master
 depends/libzip dfhack
 depends/libexpat dfhack
 depends/xlsxio dfhack
 depends/luacov dfhack
 depends/jsoncpp-sub dfhack
+depends/dfhooks main

docs/dev/Remote.rst

@@ -55,7 +55,6 @@ Plugins that implement RPC methods include:
 
 - `rename`
 - `remotefortressreader`
-- `isoworldremote`
 
 Plugins that use the RPC API include:
 

plugins/CMakeLists.txt

@@ -5,20 +5,6 @@ if(BUILD_STONESENSE)
     add_subdirectory(stonesense)
 endif()
 
-option(BUILD_ISOWORLD "Build isoworld (needs a checkout first)." OFF)
-if(BUILD_ISOWORLD)
-    #add_subdirectory(isoworld)
-    if(UNIX)
-        if(APPLE)
-            # TODO: add an OSX runner script
-        else()
-        # On linux, copy our version of the df launch script which sets LD_PRELOAD
-        install(PROGRAMS ${dfhack_SOURCE_DIR}/package/linux/runisoworld
-            DESTINATION .)
-        endif()
-    endif()
-endif()
-
 option(BUILD_DEV_PLUGINS "Build developer plugins." OFF)
 if(BUILD_DEV_PLUGINS)
     add_subdirectory(devel)
@@ -125,7 +111,6 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(getplants getplants.cpp)
     dfhack_plugin(hotkeys hotkeys.cpp LINK_LIBRARIES lua)
     dfhack_plugin(infinite-sky infinite-sky.cpp LINK_LIBRARIES lua)
-    #dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote)
     #dfhack_plugin(jobutils jobutils.cpp)
     dfhack_plugin(lair lair.cpp)
     dfhack_plugin(liquids liquids.cpp Brushes.h LINK_LIBRARIES lua)