Merge branch 'master' into spread_researching

# Conflicts:
#	sharedPlugins/researchSync/dumpResearch.lua
#	sharedPlugins/researchSync/index.js
This commit is contained in:
TechnoStrife committed 2019-07-15 22:14:09 +03:00
commit 93c210f0c7
6 files changed
+107 -55

No files matched your search

@@ -9,11 +9,13 @@ for _, tech in pairs(force.technologies) do
else
progress = force.get_saved_technology_progress(tech.name);
end
local infinite = tech.enabled == true and tech.prototype.max_level == 4294967295;
local tech_data = {
tech.name,
tostring(tech.researched),
tostring(tech.level),
tostring(progress),
tostring(infinite),
}
tech_data = table.concat(tech_data, ':')
table.insert(data, tech_data);