diff --git a/.github/workflows/publish-site.yml b/.github/workflows/publish-site.yml
index efac668ec89..94a959d9893 100644
--- a/.github/workflows/publish-site.yml
+++ b/.github/workflows/publish-site.yml
@@ -15,7 +15,7 @@ env:
   LUA_DOC_EXTRACTOR_VERSION: "3"
   EMMYLUA_DOC_CLI_VERSION: "0.8.2"
   JQ_VERSION: "1.8.0"
-  7Z_VERSION: "24.09"
+  SEVENZIP_VERSION: "24.09"
   RUBY_VERSION: "3.3"
   MISE_ENV: "ci"
 jobs:
diff --git a/doc/site/mise.ci.toml b/doc/site/mise.ci.toml
index 50f2d98fccb..f1d504be9db 100644
--- a/doc/site/mise.ci.toml
+++ b/doc/site/mise.ci.toml
@@ -6,6 +6,6 @@
 	hugo = "{{env.HUGO_VERSION}}"
 	"cargo:emmylua_doc_cli" = "{{env.EMMYLUA_DOC_CLI_VERSION}}"
 	"aqua:jqlang/jq" = "{{env.JQ_VERSION}}"
-	"aqua:ip7z/7zip" = "{{env.7Z_VERSION}}"
+	"aqua:ip7z/7zip" = "{{env.SEVENZIP_VERSION}}"
 	"npm:lua-doc-extractor" = "{{env.LUA_DOC_EXTRACTOR_VERSION}}"
 	"ruby" = "{{env.RUBY_VERSION}}"
diff --git a/doc/site/mise.toml b/doc/site/mise.toml
index 8604af17fac..3eac83faf22 100644
--- a/doc/site/mise.toml
+++ b/doc/site/mise.toml
@@ -8,7 +8,7 @@
 	EMMYLUA_DOC_CLI_VERSION = "0.8.2" # lua_pages lua_library lua_check
 	LUA_LANGUAGE_SERVER_VERSION = "3.15.0" # lua_check
 	JQ_VERSION = "1.8.0" # binary_pages
-	7Z_VERSION = "24.09" # binary_pages
+	SEVENZIP_VERSION = "24.09" # binary_pages
 	RUBY_VERSION = "3.3" # lua_pages
 	LUA_DOC_EXTRACTOR_SOURCE_REF = "https://github.com/beyond-all-reason/RecoilEngine/blob/master"
 	RECOIL_LUA_LIBRARY_DIR = "rts/Lua/library"
@@ -51,7 +51,7 @@
 	depends = ["latest_release_data"]
 	description = "Generate Docs from Recoil binary"
 	tools."aqua:jqlang/jq" = "{{env.JQ_VERSION}}"
-	tools."aqua:ip7z/7zip" = "{{env.7Z_VERSION}}"
+	tools."aqua:ip7z/7zip" = "{{env.SEVENZIP_VERSION}}"
 	run = '''
 		download_url=$(jq -r '.assets[] | select(.name | contains("amd64-linux.7z")).browser_download_url' {{vars.latest_release_data}})
 
diff --git a/rts/System/Sync/DumpState.cpp b/rts/System/Sync/DumpState.cpp
index 86ad1ea2788..0293f909105 100644
--- a/rts/System/Sync/DumpState.cpp
+++ b/rts/System/Sync/DumpState.cpp
@@ -687,14 +687,16 @@ void DumpState(int newMinFrameNum, int newMaxFrameNum, int newFramePeriod, std::
 		const CTeam* t = teamHandler.Team(a);
 
 		file << "\t\tteamID: " << t->teamNum << " (controller: " << t->GetControllerName() << ")\n";
-		file << "\t\t\tmetal: " << TapFloats(t->res.metal);
-		file << "\t\t\tenergy: " << TapFloats(t->res.energy);
-		file << "\t\t\tmetalPull: " << TapFloats(t->resPull.metal);
-		file << "\t\t\tenergyPull: " << TapFloats(t->resPull.energy);
-		file << "\t\t\tmetalIncome: " << TapFloats(t->resIncome.metal);
-		file << "\t\t\tenergyIncome: " << TapFloats(t->resIncome.energy);
-		file << "\t\t\tmetalExpense: " << TapFloats(t->resExpense.metal);
-		file << "\t\t\tenergyExpense: " << TapFloats(t->resExpense.energy);
+		for (const auto &[resourceID, value] : std::views::enumerate(t->res))
+			file << "\t\t\tstored[" << resourceID << "]: " << TapFloats(value);
+		for (const auto &[resourceID, value] : std::views::enumerate(t->resStorage))
+			file << "\t\t\tmaxStorage[" << resourceID << "]: " << TapFloats(value);
+		for (const auto &[resourceID, value] : std::views::enumerate(t->resPull))
+			file << "\t\t\tpull[" << resourceID << "]: " << TapFloats(value);
+		for (const auto &[resourceID, value] : std::views::enumerate(t->resIncome))
+			file << "\t\t\tincome[" << resourceID << "]: " << TapFloats(value);
+		for (const auto &[resourceID, value] : std::views::enumerate(t->resExpense))
+			file << "\t\t\texpense[" << resourceID << "]: " << TapFloats(value);
 	}
 	#endif