diff --git a/skins/LucidChocolate/LucidChocolate.asm b/skins/ConLenov/LucidChocolate/LucidChocolate.asm similarity index 95% rename from skins/LucidChocolate/LucidChocolate.asm rename to skins/ConLenov/LucidChocolate/LucidChocolate.asm index 4632c0d3bb..e147706857 100644 --- a/skins/LucidChocolate/LucidChocolate.asm +++ b/skins/ConLenov/LucidChocolate/LucidChocolate.asm @@ -1,4 +1,4 @@ -include '../skin.inc' +include '../../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height diff --git a/skins/LucidChocolate/Tupfile.lua b/skins/ConLenov/LucidChocolate/Tupfile.lua similarity index 100% rename from skins/LucidChocolate/Tupfile.lua rename to skins/ConLenov/LucidChocolate/Tupfile.lua diff --git a/skins/LucidChocolate/base.bmp b/skins/ConLenov/LucidChocolate/base.bmp similarity index 100% rename from skins/LucidChocolate/base.bmp rename to skins/ConLenov/LucidChocolate/base.bmp diff --git a/skins/LucidChocolate/base_1.bmp b/skins/ConLenov/LucidChocolate/base_1.bmp similarity index 100% rename from skins/LucidChocolate/base_1.bmp rename to skins/ConLenov/LucidChocolate/base_1.bmp diff --git a/skins/LucidChocolate/build.bat b/skins/ConLenov/LucidChocolate/build.bat similarity index 100% rename from skins/LucidChocolate/build.bat rename to skins/ConLenov/LucidChocolate/build.bat diff --git a/skins/LucidChocolate/default.dtp.asm b/skins/ConLenov/LucidChocolate/default.dtp.asm similarity index 100% rename from skins/LucidChocolate/default.dtp.asm rename to skins/ConLenov/LucidChocolate/default.dtp.asm diff --git a/skins/LucidChocolate/left.bmp b/skins/ConLenov/LucidChocolate/left.bmp similarity index 100% rename from skins/LucidChocolate/left.bmp rename to skins/ConLenov/LucidChocolate/left.bmp diff --git a/skins/LucidChocolate/left_1.bmp b/skins/ConLenov/LucidChocolate/left_1.bmp similarity index 100% rename from skins/LucidChocolate/left_1.bmp rename to skins/ConLenov/LucidChocolate/left_1.bmp diff --git a/skins/LucidChocolate/oper.bmp b/skins/ConLenov/LucidChocolate/oper.bmp similarity index 100% rename from skins/LucidChocolate/oper.bmp rename to skins/ConLenov/LucidChocolate/oper.bmp diff --git a/skins/LucidChocolate/oper_1.bmp b/skins/ConLenov/LucidChocolate/oper_1.bmp similarity index 100% rename from skins/LucidChocolate/oper_1.bmp rename to skins/ConLenov/LucidChocolate/oper_1.bmp diff --git a/skins/LucidCream/LucidCream.asm b/skins/ConLenov/LucidCream/LucidCream.asm similarity index 95% rename from skins/LucidCream/LucidCream.asm rename to skins/ConLenov/LucidCream/LucidCream.asm index d6644a1222..4d6a1e040c 100644 --- a/skins/LucidCream/LucidCream.asm +++ b/skins/ConLenov/LucidCream/LucidCream.asm @@ -1,4 +1,4 @@ -include '../skin.inc' +include '../../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height diff --git a/skins/LucidCream/Tupfile.lua b/skins/ConLenov/LucidCream/Tupfile.lua similarity index 100% rename from skins/LucidCream/Tupfile.lua rename to skins/ConLenov/LucidCream/Tupfile.lua diff --git a/skins/LucidCream/base.bmp b/skins/ConLenov/LucidCream/base.bmp similarity index 100% rename from skins/LucidCream/base.bmp rename to skins/ConLenov/LucidCream/base.bmp diff --git a/skins/LucidCream/base_1.bmp b/skins/ConLenov/LucidCream/base_1.bmp similarity index 100% rename from skins/LucidCream/base_1.bmp rename to skins/ConLenov/LucidCream/base_1.bmp diff --git a/skins/LucidCream/build.bat b/skins/ConLenov/LucidCream/build.bat similarity index 100% rename from skins/LucidCream/build.bat rename to skins/ConLenov/LucidCream/build.bat diff --git a/skins/LucidCream/default.dtp.asm b/skins/ConLenov/LucidCream/default.dtp.asm similarity index 100% rename from skins/LucidCream/default.dtp.asm rename to skins/ConLenov/LucidCream/default.dtp.asm diff --git a/skins/LucidCream/left.bmp b/skins/ConLenov/LucidCream/left.bmp similarity index 100% rename from skins/LucidCream/left.bmp rename to skins/ConLenov/LucidCream/left.bmp diff --git a/skins/LucidCream/left_1.bmp b/skins/ConLenov/LucidCream/left_1.bmp similarity index 100% rename from skins/LucidCream/left_1.bmp rename to skins/ConLenov/LucidCream/left_1.bmp diff --git a/skins/LucidCream/oper.bmp b/skins/ConLenov/LucidCream/oper.bmp similarity index 100% rename from skins/LucidCream/oper.bmp rename to skins/ConLenov/LucidCream/oper.bmp diff --git a/skins/LucidCream/oper_1.bmp b/skins/ConLenov/LucidCream/oper_1.bmp similarity index 100% rename from skins/LucidCream/oper_1.bmp rename to skins/ConLenov/LucidCream/oper_1.bmp diff --git a/skins/Win10/Tupfile.lua b/skins/ConLenov/Win10/Tupfile.lua similarity index 100% rename from skins/Win10/Tupfile.lua rename to skins/ConLenov/Win10/Tupfile.lua diff --git a/skins/Win10/Win10.asm b/skins/ConLenov/Win10/Win10.asm similarity index 94% rename from skins/Win10/Win10.asm rename to skins/ConLenov/Win10/Win10.asm index f9bc379a66..7c79df93da 100644 --- a/skins/Win10/Win10.asm +++ b/skins/ConLenov/Win10/Win10.asm @@ -1,4 +1,4 @@ -include '../skin.inc' +include '../../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ diff --git a/skins/Win10/Win10.dtp b/skins/ConLenov/Win10/Win10.dtp similarity index 100% rename from skins/Win10/Win10.dtp rename to skins/ConLenov/Win10/Win10.dtp diff --git a/skins/Win10/Win10.dtp.asm b/skins/ConLenov/Win10/Win10.dtp.asm similarity index 100% rename from skins/Win10/Win10.dtp.asm rename to skins/ConLenov/Win10/Win10.dtp.asm diff --git a/skins/Win10/base.bmp b/skins/ConLenov/Win10/base.bmp similarity index 100% rename from skins/Win10/base.bmp rename to skins/ConLenov/Win10/base.bmp diff --git a/skins/Win10/base_1.bmp b/skins/ConLenov/Win10/base_1.bmp similarity index 100% rename from skins/Win10/base_1.bmp rename to skins/ConLenov/Win10/base_1.bmp diff --git a/skins/Win10/build.bat b/skins/ConLenov/Win10/build.bat similarity index 100% rename from skins/Win10/build.bat rename to skins/ConLenov/Win10/build.bat diff --git a/skins/Win10/left.bmp b/skins/ConLenov/Win10/left.bmp similarity index 100% rename from skins/Win10/left.bmp rename to skins/ConLenov/Win10/left.bmp diff --git a/skins/Win10/left_1.bmp b/skins/ConLenov/Win10/left_1.bmp similarity index 100% rename from skins/Win10/left_1.bmp rename to skins/ConLenov/Win10/left_1.bmp diff --git a/skins/Win10/oper.bmp b/skins/ConLenov/Win10/oper.bmp similarity index 100% rename from skins/Win10/oper.bmp rename to skins/ConLenov/Win10/oper.bmp diff --git a/skins/Win10/oper_1.bmp b/skins/ConLenov/Win10/oper_1.bmp similarity index 100% rename from skins/Win10/oper_1.bmp rename to skins/ConLenov/Win10/oper_1.bmp diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 69af4eb4c3..17342b5c4f 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -2,6 +2,9 @@ -- included by ../data/Tupfile.lua. skinlist = { "ConLenov/mntech/mntech.skn", +"ConLenov/LucidChocolate/LucidChocolate.skn", +"ConLenov/LucidCream/LucidCream.skn", +"ConLenov/Win10/Win10.skn", "Leency/AreaSq/AreaSq.skn", "Leency/Blueberries/Blueberries.skn", "Leency/HydrogenOS/HydrogenOS.skn", @@ -12,10 +15,7 @@ skinlist = { "Leency/Workbench/Workbench.skn", "Leency/Yeah/Yeah.skn", "loggy/loggy.skn", -"LucidChocolate/LucidChocolate.skn", -"LucidCream/LucidCream.skn", "night/night.skn", -"Win10/Win10.skn", "_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.skn", "_old/5imple Alpha/2.5imple Alpha/2.5imple Alpha.skn", "_old/5imple Alpha/3.5imple Alpha/3.5imple Alpha.skn",