Merge branch 'master' into contentdb

2020-02-12 08:10:09 +01:00 · 2020-02-12 08:10:09 +01:00 · af8212a1bd
parent 361d0222ca 55dc55f2dd
commit af8212a1bd
1 changed files with 1 additions and 5 deletions
--- a/skinlist.lua
+++ b/skinlist.lua
@ -2,11 +2,7 @@ local skins_dir_list = minetest.get_dir_list(skins.modpath.."/textures")

 for _, fn in pairs(skins_dir_list) do
 	local name, sort_id, assignment, is_preview, playername
-	local nameparts = {
-		fn:match("^%w+"),
-		fn:gsub("^%w+_", ""):gsub("%.%w+$", ""),
-		fn:match("%w+$"),
-	}
+	local nameparts = string.gsub(fn, "[.]", "_"):split("_")

 	-- check allowed prefix and file extension
 	if (nameparts[1] == 'player' or nameparts[1] == 'character') and