diff --git a/.gitignore b/.gitignore index 7c100d3e2..4ef6d733f 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ tags ## Configuration/log files minetest.conf debug.txt +Thumbs.db ## Doxygen files doc/Doxyfile diff --git a/games/MultiCraft_game/files/default/nodes.lua b/games/MultiCraft_game/files/default/nodes.lua index 9af430169..c65b67f99 100644 --- a/games/MultiCraft_game/files/default/nodes.lua +++ b/games/MultiCraft_game/files/default/nodes.lua @@ -374,44 +374,6 @@ multicraft.register_node("default:haybale", { sounds = default.node_sound_wood_defaults(), }) -multicraft.register_node("default:sea_lantern", { - description = "Sea Lantern", - paramtype2 = "facedir", - stack_max = 64, - light_source = LIGHT_MAX, - drop = { - max_items = 1, - items = { - { items = {'default:prismarine_cry 2'} }, - { items = {'default:prismarine_cry 3'}, rarity = 2 } - } - }, - tiles = {"default_sea_lantern.png"}, - groups = {dig_immediate=2, building = 1}, -}) - -multicraft.register_node("default:prismarine", { - description = "Prismarine", - stack_max = 64, - tiles = {{name="default_prismarine_anim.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=45.0}}}, - groups = {cracky=3, building = 1}, -}) - -multicraft.register_node("default:prismarine_brick", { - description = "Prismarine Brick", - stack_max = 64, - tiles = {"default_prismarine_bricks.png"}, - groups = {cracky=2, building = 1}, -}) - -multicraft.register_node("default:prismarine_dark", { - description = "Dark Prismarine", - stack_max = 64, - tiles = {"default_prismarine_dark.png"}, - groups = {cracky=2, building = 1}, -}) - - -- Normal tree -- diff --git a/games/MultiCraft_game/files/default/textures/hud_armor_bg.png b/games/MultiCraft_game/files/default/textures/hud_armor_bg.png index bdb3317c4..663589393 100644 Binary files a/games/MultiCraft_game/files/default/textures/hud_armor_bg.png and b/games/MultiCraft_game/files/default/textures/hud_armor_bg.png differ diff --git a/games/MultiCraft_game/files/default/textures/hud_heart_bg.png b/games/MultiCraft_game/files/default/textures/hud_heart_bg.png index 60f93953f..adef12c47 100644 Binary files a/games/MultiCraft_game/files/default/textures/hud_heart_bg.png and b/games/MultiCraft_game/files/default/textures/hud_heart_bg.png differ diff --git a/games/MultiCraft_game/files/default/textures/hud_hunger_bg.png b/games/MultiCraft_game/files/default/textures/hud_hunger_bg.png index eede155af..19434f214 100644 Binary files a/games/MultiCraft_game/files/default/textures/hud_hunger_bg.png and b/games/MultiCraft_game/files/default/textures/hud_hunger_bg.png differ diff --git a/textures/base/pack/Thumbs.db b/textures/base/pack/Thumbs.db index 934af7b81..f1a60da2a 100644 Binary files a/textures/base/pack/Thumbs.db and b/textures/base/pack/Thumbs.db differ diff --git a/textures/base/pack/camera_btn.png b/textures/base/pack/camera_btn.png deleted file mode 100644 index ecc433d60..000000000 Binary files a/textures/base/pack/camera_btn.png and /dev/null differ diff --git a/textures/base/pack/chat_btn.png b/textures/base/pack/chat_btn.png index e3260467b..89ebe6237 100644 Binary files a/textures/base/pack/chat_btn.png and b/textures/base/pack/chat_btn.png differ diff --git a/textures/base/pack/down.png b/textures/base/pack/down.png index f2f58e33f..81971be71 100644 Binary files a/textures/base/pack/down.png and b/textures/base/pack/down.png differ diff --git a/textures/base/pack/down_arrow.png b/textures/base/pack/down_arrow.png index 4dfcf2ae8..20f2759b6 100644 Binary files a/textures/base/pack/down_arrow.png and b/textures/base/pack/down_arrow.png differ diff --git a/textures/base/pack/drop_btn.png b/textures/base/pack/drop_btn.png index c20885ebb..400af6217 100644 Binary files a/textures/base/pack/drop_btn.png and b/textures/base/pack/drop_btn.png differ diff --git a/textures/base/pack/fast_btn.png b/textures/base/pack/fast_btn.png deleted file mode 100644 index 7d1db241d..000000000 Binary files a/textures/base/pack/fast_btn.png and /dev/null differ diff --git a/textures/base/pack/fly_btn.png b/textures/base/pack/fly_btn.png deleted file mode 100644 index 35a69c31c..000000000 Binary files a/textures/base/pack/fly_btn.png and /dev/null differ diff --git a/textures/base/pack/jump_btn.png b/textures/base/pack/jump_btn.png index 29afbb9cf..19728621b 100644 Binary files a/textures/base/pack/jump_btn.png and b/textures/base/pack/jump_btn.png differ diff --git a/textures/base/pack/left_arrow.png b/textures/base/pack/left_arrow.png index 1bd14c583..c2a78c194 100644 Binary files a/textures/base/pack/left_arrow.png and b/textures/base/pack/left_arrow.png differ diff --git a/textures/base/pack/menu_button.png b/textures/base/pack/menu_button.png index 5be380f68..e590d78d6 100644 Binary files a/textures/base/pack/menu_button.png and b/textures/base/pack/menu_button.png differ diff --git a/textures/base/pack/menu_button_b.png b/textures/base/pack/menu_button_b.png index da2a938f9..1d335b219 100644 Binary files a/textures/base/pack/menu_button_b.png and b/textures/base/pack/menu_button_b.png differ diff --git a/textures/base/pack/rangeview_btn.png b/textures/base/pack/rangeview_btn.png index 1da9ed1a3..c5be6d4c2 100644 Binary files a/textures/base/pack/rangeview_btn.png and b/textures/base/pack/rangeview_btn.png differ diff --git a/textures/base/pack/right_arrow.png b/textures/base/pack/right_arrow.png index 051435422..2d0c6d871 100644 Binary files a/textures/base/pack/right_arrow.png and b/textures/base/pack/right_arrow.png differ diff --git a/textures/base/pack/up_arrow.png b/textures/base/pack/up_arrow.png index 679dfcef5..3a99730b5 100644 Binary files a/textures/base/pack/up_arrow.png and b/textures/base/pack/up_arrow.png differ