From 84d606d020fbaf99c23030432ad31320f10f02db Mon Sep 17 00:00:00 2001 From: Nayiem Date: Fri, 16 Dec 2022 13:06:59 +0100 Subject: [PATCH 1/2] fix: move files to mod root directory --- d53_christmas/init.lua => init.lua | 0 d53_christmas/mod.conf => mod.conf | 0 .../models => models}/christmas_nutcracker.obj | 0 .../models => models}/christmas_reindeer.obj | 0 .../models => models}/christmas_snowman.obj | 0 {d53_christmas/models => models}/christmas_sock.obj | 0 {d53_christmas/models => models}/christmas_star.obj | 0 {d53_christmas/models => models}/christmas_tree.obj | 0 .../models => models}/christmas_tree_balls.obj | 0 {d53_christmas/models => models}/sleigh.obj | 0 .../textures => textures}/christmas_bauble.png | Bin .../textures => textures}/christmas_bauble_red.png | Bin .../christmas_decor_hat_elf.png | Bin .../christmas_decor_hat_elf_inv.png | Bin .../christmas_decor_hat_santa.png | Bin .../christmas_decor_hat_santa_inv.png | Bin .../textures => textures}/christmas_lights.png | Bin .../textures => textures}/christmas_lights_inv.png | Bin .../textures => textures}/christmas_lights_left.png | Bin .../christmas_lights_left_inv.png | Bin .../christmas_lights_mleft.png | Bin .../christmas_lights_mleft_inv.png | Bin .../christmas_lights_mright.png | Bin .../christmas_lights_mright_inv.png | Bin .../christmas_lights_right.png | Bin .../christmas_lights_right_inv.png | Bin .../textures => textures}/christmas_nutcracker.png | Bin .../textures => textures}/christmas_reindeer.png | Bin .../textures => textures}/christmas_snowman.png | Bin .../textures => textures}/christmas_snowman_inv.png | Bin .../textures => textures}/christmas_sock_inv.png | Bin .../textures => textures}/christmas_star.png | Bin .../textures => textures}/christmas_star_inv.png | Bin .../textures => textures}/christmas_tree_leaves.png | Bin .../textures => textures}/green_gift_bottom.png | Bin .../textures => textures}/green_gift_d53side.png | Bin .../textures => textures}/green_gift_side.png | Bin .../textures => textures}/green_gift_top.png | Bin .../textures => textures}/red_gift_bottom.png | Bin .../textures => textures}/red_gift_side.png | Bin .../textures => textures}/red_gift_top.png | Bin {d53_christmas/textures => textures}/sleigh.png | Bin {d53_christmas/textures => textures}/sock.png | Bin 43 files changed, 0 insertions(+), 0 deletions(-) rename d53_christmas/init.lua => init.lua (100%) rename d53_christmas/mod.conf => mod.conf (100%) rename {d53_christmas/models => models}/christmas_nutcracker.obj (100%) rename {d53_christmas/models => models}/christmas_reindeer.obj (100%) rename {d53_christmas/models => models}/christmas_snowman.obj (100%) rename {d53_christmas/models => models}/christmas_sock.obj (100%) rename {d53_christmas/models => models}/christmas_star.obj (100%) rename {d53_christmas/models => models}/christmas_tree.obj (100%) rename {d53_christmas/models => models}/christmas_tree_balls.obj (100%) rename {d53_christmas/models => models}/sleigh.obj (100%) rename {d53_christmas/textures => textures}/christmas_bauble.png (100%) rename {d53_christmas/textures => textures}/christmas_bauble_red.png (100%) rename {d53_christmas/textures => textures}/christmas_decor_hat_elf.png (100%) rename {d53_christmas/textures => textures}/christmas_decor_hat_elf_inv.png (100%) rename {d53_christmas/textures => textures}/christmas_decor_hat_santa.png (100%) rename {d53_christmas/textures => textures}/christmas_decor_hat_santa_inv.png (100%) rename {d53_christmas/textures => textures}/christmas_lights.png (100%) rename {d53_christmas/textures => textures}/christmas_lights_inv.png (100%) rename {d53_christmas/textures => textures}/christmas_lights_left.png (100%) rename {d53_christmas/textures => textures}/christmas_lights_left_inv.png (100%) rename {d53_christmas/textures => textures}/christmas_lights_mleft.png (100%) rename {d53_christmas/textures => textures}/christmas_lights_mleft_inv.png (100%) rename {d53_christmas/textures => textures}/christmas_lights_mright.png (100%) rename {d53_christmas/textures => textures}/christmas_lights_mright_inv.png (100%) rename {d53_christmas/textures => textures}/christmas_lights_right.png (100%) rename {d53_christmas/textures => textures}/christmas_lights_right_inv.png (100%) rename {d53_christmas/textures => textures}/christmas_nutcracker.png (100%) rename {d53_christmas/textures => textures}/christmas_reindeer.png (100%) rename {d53_christmas/textures => textures}/christmas_snowman.png (100%) rename {d53_christmas/textures => textures}/christmas_snowman_inv.png (100%) rename {d53_christmas/textures => textures}/christmas_sock_inv.png (100%) rename {d53_christmas/textures => textures}/christmas_star.png (100%) rename {d53_christmas/textures => textures}/christmas_star_inv.png (100%) rename {d53_christmas/textures => textures}/christmas_tree_leaves.png (100%) rename {d53_christmas/textures => textures}/green_gift_bottom.png (100%) rename {d53_christmas/textures => textures}/green_gift_d53side.png (100%) rename {d53_christmas/textures => textures}/green_gift_side.png (100%) rename {d53_christmas/textures => textures}/green_gift_top.png (100%) rename {d53_christmas/textures => textures}/red_gift_bottom.png (100%) rename {d53_christmas/textures => textures}/red_gift_side.png (100%) rename {d53_christmas/textures => textures}/red_gift_top.png (100%) rename {d53_christmas/textures => textures}/sleigh.png (100%) rename {d53_christmas/textures => textures}/sock.png (100%) diff --git a/d53_christmas/init.lua b/init.lua similarity index 100% rename from d53_christmas/init.lua rename to init.lua diff --git a/d53_christmas/mod.conf b/mod.conf similarity index 100% rename from d53_christmas/mod.conf rename to mod.conf diff --git a/d53_christmas/models/christmas_nutcracker.obj b/models/christmas_nutcracker.obj similarity index 100% rename from d53_christmas/models/christmas_nutcracker.obj rename to models/christmas_nutcracker.obj diff --git a/d53_christmas/models/christmas_reindeer.obj b/models/christmas_reindeer.obj similarity index 100% rename from d53_christmas/models/christmas_reindeer.obj rename to models/christmas_reindeer.obj diff --git a/d53_christmas/models/christmas_snowman.obj b/models/christmas_snowman.obj similarity index 100% rename from d53_christmas/models/christmas_snowman.obj rename to models/christmas_snowman.obj diff --git a/d53_christmas/models/christmas_sock.obj b/models/christmas_sock.obj similarity index 100% rename from d53_christmas/models/christmas_sock.obj rename to models/christmas_sock.obj diff --git a/d53_christmas/models/christmas_star.obj b/models/christmas_star.obj similarity index 100% rename from d53_christmas/models/christmas_star.obj rename to models/christmas_star.obj diff --git a/d53_christmas/models/christmas_tree.obj b/models/christmas_tree.obj similarity index 100% rename from d53_christmas/models/christmas_tree.obj rename to models/christmas_tree.obj diff --git a/d53_christmas/models/christmas_tree_balls.obj b/models/christmas_tree_balls.obj similarity index 100% rename from d53_christmas/models/christmas_tree_balls.obj rename to models/christmas_tree_balls.obj diff --git a/d53_christmas/models/sleigh.obj b/models/sleigh.obj similarity index 100% rename from d53_christmas/models/sleigh.obj rename to models/sleigh.obj diff --git a/d53_christmas/textures/christmas_bauble.png b/textures/christmas_bauble.png similarity index 100% rename from d53_christmas/textures/christmas_bauble.png rename to textures/christmas_bauble.png diff --git a/d53_christmas/textures/christmas_bauble_red.png b/textures/christmas_bauble_red.png similarity index 100% rename from d53_christmas/textures/christmas_bauble_red.png rename to textures/christmas_bauble_red.png diff --git a/d53_christmas/textures/christmas_decor_hat_elf.png b/textures/christmas_decor_hat_elf.png similarity index 100% rename from d53_christmas/textures/christmas_decor_hat_elf.png rename to textures/christmas_decor_hat_elf.png diff --git a/d53_christmas/textures/christmas_decor_hat_elf_inv.png b/textures/christmas_decor_hat_elf_inv.png similarity index 100% rename from d53_christmas/textures/christmas_decor_hat_elf_inv.png rename to textures/christmas_decor_hat_elf_inv.png diff --git a/d53_christmas/textures/christmas_decor_hat_santa.png b/textures/christmas_decor_hat_santa.png similarity index 100% rename from d53_christmas/textures/christmas_decor_hat_santa.png rename to textures/christmas_decor_hat_santa.png diff --git a/d53_christmas/textures/christmas_decor_hat_santa_inv.png b/textures/christmas_decor_hat_santa_inv.png similarity index 100% rename from d53_christmas/textures/christmas_decor_hat_santa_inv.png rename to textures/christmas_decor_hat_santa_inv.png diff --git a/d53_christmas/textures/christmas_lights.png b/textures/christmas_lights.png similarity index 100% rename from d53_christmas/textures/christmas_lights.png rename to textures/christmas_lights.png diff --git a/d53_christmas/textures/christmas_lights_inv.png b/textures/christmas_lights_inv.png similarity index 100% rename from d53_christmas/textures/christmas_lights_inv.png rename to textures/christmas_lights_inv.png diff --git a/d53_christmas/textures/christmas_lights_left.png b/textures/christmas_lights_left.png similarity index 100% rename from d53_christmas/textures/christmas_lights_left.png rename to textures/christmas_lights_left.png diff --git a/d53_christmas/textures/christmas_lights_left_inv.png b/textures/christmas_lights_left_inv.png similarity index 100% rename from d53_christmas/textures/christmas_lights_left_inv.png rename to textures/christmas_lights_left_inv.png diff --git a/d53_christmas/textures/christmas_lights_mleft.png b/textures/christmas_lights_mleft.png similarity index 100% rename from d53_christmas/textures/christmas_lights_mleft.png rename to textures/christmas_lights_mleft.png diff --git a/d53_christmas/textures/christmas_lights_mleft_inv.png b/textures/christmas_lights_mleft_inv.png similarity index 100% rename from d53_christmas/textures/christmas_lights_mleft_inv.png rename to textures/christmas_lights_mleft_inv.png diff --git a/d53_christmas/textures/christmas_lights_mright.png b/textures/christmas_lights_mright.png similarity index 100% rename from d53_christmas/textures/christmas_lights_mright.png rename to textures/christmas_lights_mright.png diff --git a/d53_christmas/textures/christmas_lights_mright_inv.png b/textures/christmas_lights_mright_inv.png similarity index 100% rename from d53_christmas/textures/christmas_lights_mright_inv.png rename to textures/christmas_lights_mright_inv.png diff --git a/d53_christmas/textures/christmas_lights_right.png b/textures/christmas_lights_right.png similarity index 100% rename from d53_christmas/textures/christmas_lights_right.png rename to textures/christmas_lights_right.png diff --git a/d53_christmas/textures/christmas_lights_right_inv.png b/textures/christmas_lights_right_inv.png similarity index 100% rename from d53_christmas/textures/christmas_lights_right_inv.png rename to textures/christmas_lights_right_inv.png diff --git a/d53_christmas/textures/christmas_nutcracker.png b/textures/christmas_nutcracker.png similarity index 100% rename from d53_christmas/textures/christmas_nutcracker.png rename to textures/christmas_nutcracker.png diff --git a/d53_christmas/textures/christmas_reindeer.png b/textures/christmas_reindeer.png similarity index 100% rename from d53_christmas/textures/christmas_reindeer.png rename to textures/christmas_reindeer.png diff --git a/d53_christmas/textures/christmas_snowman.png b/textures/christmas_snowman.png similarity index 100% rename from d53_christmas/textures/christmas_snowman.png rename to textures/christmas_snowman.png diff --git a/d53_christmas/textures/christmas_snowman_inv.png b/textures/christmas_snowman_inv.png similarity index 100% rename from d53_christmas/textures/christmas_snowman_inv.png rename to textures/christmas_snowman_inv.png diff --git a/d53_christmas/textures/christmas_sock_inv.png b/textures/christmas_sock_inv.png similarity index 100% rename from d53_christmas/textures/christmas_sock_inv.png rename to textures/christmas_sock_inv.png diff --git a/d53_christmas/textures/christmas_star.png b/textures/christmas_star.png similarity index 100% rename from d53_christmas/textures/christmas_star.png rename to textures/christmas_star.png diff --git a/d53_christmas/textures/christmas_star_inv.png b/textures/christmas_star_inv.png similarity index 100% rename from d53_christmas/textures/christmas_star_inv.png rename to textures/christmas_star_inv.png diff --git a/d53_christmas/textures/christmas_tree_leaves.png b/textures/christmas_tree_leaves.png similarity index 100% rename from d53_christmas/textures/christmas_tree_leaves.png rename to textures/christmas_tree_leaves.png diff --git a/d53_christmas/textures/green_gift_bottom.png b/textures/green_gift_bottom.png similarity index 100% rename from d53_christmas/textures/green_gift_bottom.png rename to textures/green_gift_bottom.png diff --git a/d53_christmas/textures/green_gift_d53side.png b/textures/green_gift_d53side.png similarity index 100% rename from d53_christmas/textures/green_gift_d53side.png rename to textures/green_gift_d53side.png diff --git a/d53_christmas/textures/green_gift_side.png b/textures/green_gift_side.png similarity index 100% rename from d53_christmas/textures/green_gift_side.png rename to textures/green_gift_side.png diff --git a/d53_christmas/textures/green_gift_top.png b/textures/green_gift_top.png similarity index 100% rename from d53_christmas/textures/green_gift_top.png rename to textures/green_gift_top.png diff --git a/d53_christmas/textures/red_gift_bottom.png b/textures/red_gift_bottom.png similarity index 100% rename from d53_christmas/textures/red_gift_bottom.png rename to textures/red_gift_bottom.png diff --git a/d53_christmas/textures/red_gift_side.png b/textures/red_gift_side.png similarity index 100% rename from d53_christmas/textures/red_gift_side.png rename to textures/red_gift_side.png diff --git a/d53_christmas/textures/red_gift_top.png b/textures/red_gift_top.png similarity index 100% rename from d53_christmas/textures/red_gift_top.png rename to textures/red_gift_top.png diff --git a/d53_christmas/textures/sleigh.png b/textures/sleigh.png similarity index 100% rename from d53_christmas/textures/sleigh.png rename to textures/sleigh.png diff --git a/d53_christmas/textures/sock.png b/textures/sock.png similarity index 100% rename from d53_christmas/textures/sock.png rename to textures/sock.png From 8bfa1fc12a81f3e39643337a2c0e4a725b0adbd2 Mon Sep 17 00:00:00 2001 From: milkshake <120337338+XMilkshake@users.noreply.github.com> Date: Fri, 16 Dec 2022 15:22:12 +0300 Subject: [PATCH 2/2] Update init.lua --- init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 0b0309c..ad2a064 100644 --- a/init.lua +++ b/init.lua @@ -256,7 +256,7 @@ minetest.register_node("d53_christmas:topper", { }) minetest.register_craft({ - output = "d53_christmas:topper", + output = "d53_christmas:star", recipe = { {"","dye:yellow",""}, {"dye:yellow","default:torch","dye:yellow"}, @@ -266,7 +266,7 @@ minetest.register_craft({ minetest.register_craft({ - output = "d53_christmas:ornament", + output = "d53_christmas:bauble_red", recipe = { {"","dye:red",""}, {"dye:red","default:torch","dye:red"},