Merge iuzx's changes (mostly) into develop-1.8

kepler155c · Jul 7, 2023 · b9bf773 · b9bf773
2 parents 6247784 + e351ab6
commit b9bf773
Show file tree

Hide file tree

Showing 9 changed files with 6,645 additions and 4,452 deletions.
diff --git a/core/apis/nameDB.lua b/core/apis/nameDB.lua
@@ -23,14 +23,10 @@ function nameDB:loadDirectory(directory)
 					error('Unable to read ' .. fs.combine(directory, file))
 				end
 
-				for strId, block in pairs(blocks) do
+				for strId, blockName in pairs(blocks) do
 					strId = string.format('%s:%s', mod, strId)
-					if type(block.name) == 'string' then
-						self.data[strId .. ':0'] = block.name
-					else
-						for nid,name in pairs(block.name) do
-							self.data[strId .. ':' .. (nid-1)] = name
-						end
+					if type(blockName) == 'string' then
+						self.data[strId] = blockName
 					end
 				end