From: BlockMen Date: Thu, 17 Apr 2014 12:21:21 +0000 (+0200) Subject: More new Textures, Clean up a bit X-Git-Tag: 0.4.10~13 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=13dfc2c0e90b9e5f5e7380a6b9a80ce3ebdcd8f3;p=oweals%2Fminetest_game.git More new Textures, Clean up a bit --- diff --git a/README.txt b/README.txt index faba17a0..aadb6ad3 100644 --- a/README.txt +++ b/README.txt @@ -37,6 +37,3 @@ http://creativecommons.org/licenses/by-sa/3.0/ License of menu/header.png Copyright (C) 2013 BlockMen CC BY-3.0 - -License of mods/default/textures/default_desert_cobble.png -Copyright (C) 2014 brunob.santos CC-BY-SA 4.0 diff --git a/mods/default/README.txt b/mods/default/README.txt index 37abfa6a..703f3dc9 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -27,7 +27,6 @@ Cisoun's WTFPL texture pack: default_chest_lock.png default_chest_side.png default_chest_top.png - default_stone_brick.png default_dirt.png default_grass.png default_grass_side.png @@ -38,23 +37,14 @@ Cisoun's WTFPL texture pack: default_sapling.png default_sign_wall.png default_stone.png - default_tool_mesepick.png - default_tool_steelpick.png - default_tool_steelshovel.png - default_tool_stonepick.png - default_tool_stoneshovel.png - default_tool_woodpick.png - default_tool_woodshovel.png default_tree.png default_tree_top.png default_water.png Originating from G4JC's Almost MC Texture Pack: - default_wood.png default_torch.png default_torch_on_ceiling.png default_torch_on_floor.png - default_cobble.png VanessaE's animated torches (WTFPL): default_torch_animated.png @@ -80,11 +70,7 @@ VanessaE (WTFPL): Calinou (CC BY-SA): default_brick.png - default_clay_brick.png default_papyrus.png - default_tool_steelsword.png - default_bronze_ingot.png - default_copper_ingot.png default_copper_lump.png default_mineral_copper.png @@ -101,21 +87,8 @@ PilzAdam (WTFPL): default_obsidian_glass.png default_obsidian_shard.png default_mossycobble.png - default_gold_ingot.png default_gold_lump.png default_mineral_gold.png - default_diamond.png - default_tool_diamondpick.png - default_tool_diamondsword.png - default_tool_diamondshovel.png - default_tool_diamondaxe.png - default_tool_meseaxe.png - default_tool_meseshovel.png - default_tool_mesesword.png - default_tool_bronzeaxe.png - default_tool_bronzepick.png - default_tool_bronzeshovel.png - default_tool_bronzesword.png default_snowball.png jojoa1997 (WTFPL): @@ -135,14 +108,34 @@ Zeg9 (CC BY-SA 3.0): default_copper_block.png default_bronze_block.png default_gold_block.png - default_diamond_block.png - -kaeza (WTFPL): - bubble.png paramat (CC BY-SA 3.0): wieldhand.png, based on character.png by Jordach (CC BY-SA 3.0) +brunob.santos (CC BY-SA 4.0): + default_desert_cobble.png + +BlockMen (CC BY-SA 3.0): + default_stone_brick.png + default_wood.png + default_cobble.png + default_clay_brick.png + default_tool_steelsword.png + default_bronze_ingot.png + default_copper_ingot.png + default_gold_ingot.png + default_diamond.png + default_diamond_block.png + default_tool_*.png + default_lava_source_animated.png + default_lava_flowing_animated.png + default_book.png + default_paper.png + default_stick.png + bubble.png + heart.png + gui_*.png + Glass breaking sounds (CC BY 3.0): 1: http://www.freesound.org/people/cmusounddesign/sounds/71947/ 2: http://www.freesound.org/people/Tomlija/sounds/97669/ diff --git a/mods/default/aliases.lua b/mods/default/aliases.lua index eadb2a3a..d80082e2 100644 --- a/mods/default/aliases.lua +++ b/mods/default/aliases.lua @@ -65,4 +65,3 @@ minetest.register_alias("lump_of_iron", "default:iron_lump") minetest.register_alias("lump_of_clay", "default:clay_lump") minetest.register_alias("steel_ingot", "default:steel_ingot") minetest.register_alias("clay_brick", "default:clay_brick") -minetest.register_alias("scorched_stuff", "default:scorched_stuff") diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 3b966eb7..113e1d50 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -470,7 +470,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:sandstonebrick', + output = 'default:sandstonebrick 4', recipe = { {'default:sandstone', 'default:sandstone'}, {'default:sandstone', 'default:sandstone'}, @@ -574,7 +574,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:stonebrick', + output = 'default:stonebrick 4', recipe = { {'default:stone', 'default:stone'}, {'default:stone', 'default:stone'}, @@ -582,7 +582,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:desert_stonebrick', + output = 'default:desert_stonebrick 4', recipe = { {'default:desert_stone', 'default:desert_stone'}, {'default:desert_stone', 'default:desert_stone'}, diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index 2d3652e2..026a31c0 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -81,11 +81,6 @@ minetest.register_craftitem("default:clay_brick", { inventory_image = "default_clay_brick.png", }) -minetest.register_craftitem("default:scorched_stuff", { - description = "Scorched Stuff", - inventory_image = "default_scorched_stuff.png", -}) - minetest.register_craftitem("default:obsidian_shard", { description = "Obsidian Shard", inventory_image = "default_obsidian_shard.png", diff --git a/mods/default/init.lua b/mods/default/init.lua index 82e558de..fc7e9008 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -12,7 +12,7 @@ LIGHT_MAX = 14 default = {} -- GUI related stuff -gui_bg = "bgcolor[#0009;true]" +gui_bg = "bgcolor[#080808BB;true]" gui_bg_img = "background[5,5;1,1;gui_formbg.png;true]" gui_slots = "listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]" diff --git a/mods/default/textures/default_apple.png b/mods/default/textures/default_apple.png index 97792e1e..4971bd83 100644 Binary files a/mods/default/textures/default_apple.png and b/mods/default/textures/default_apple.png differ diff --git a/mods/default/textures/default_bookshelf.png b/mods/default/textures/default_bookshelf.png index 85b4d491..cf94a84e 100644 Binary files a/mods/default/textures/default_bookshelf.png and b/mods/default/textures/default_bookshelf.png differ diff --git a/mods/default/textures/default_brick.png b/mods/default/textures/default_brick.png index bb0c3e45..6f21b489 100644 Binary files a/mods/default/textures/default_brick.png and b/mods/default/textures/default_brick.png differ diff --git a/mods/default/textures/default_cobble.png b/mods/default/textures/default_cobble.png index cf8896dc..07617cb7 100644 Binary files a/mods/default/textures/default_cobble.png and b/mods/default/textures/default_cobble.png differ diff --git a/mods/default/textures/default_gold_block.png b/mods/default/textures/default_gold_block.png index cc497042..36c1c7c0 100644 Binary files a/mods/default/textures/default_gold_block.png and b/mods/default/textures/default_gold_block.png differ diff --git a/mods/default/textures/default_gold_ingot.png b/mods/default/textures/default_gold_ingot.png index 55dc5511..24848184 100644 Binary files a/mods/default/textures/default_gold_ingot.png and b/mods/default/textures/default_gold_ingot.png differ diff --git a/mods/default/textures/default_gravel.png b/mods/default/textures/default_gravel.png index c07aeb94..db716c5d 100644 Binary files a/mods/default/textures/default_gravel.png and b/mods/default/textures/default_gravel.png differ diff --git a/mods/default/textures/default_jungletree.png b/mods/default/textures/default_jungletree.png index b7addc80..3d35b1e6 100644 Binary files a/mods/default/textures/default_jungletree.png and b/mods/default/textures/default_jungletree.png differ diff --git a/mods/default/textures/default_jungletree_top.png b/mods/default/textures/default_jungletree_top.png index 1c3f9612..e3a3ccc5 100644 Binary files a/mods/default/textures/default_jungletree_top.png and b/mods/default/textures/default_jungletree_top.png differ diff --git a/mods/default/textures/default_junglewood.png b/mods/default/textures/default_junglewood.png index 2507706d..5cc31c6a 100644 Binary files a/mods/default/textures/default_junglewood.png and b/mods/default/textures/default_junglewood.png differ diff --git a/mods/default/textures/default_mossycobble.png b/mods/default/textures/default_mossycobble.png index 91284aa3..7fbe5c4b 100644 Binary files a/mods/default/textures/default_mossycobble.png and b/mods/default/textures/default_mossycobble.png differ diff --git a/mods/default/textures/default_papyrus.png b/mods/default/textures/default_papyrus.png index 8a5361d0..ebe8c6c2 100644 Binary files a/mods/default/textures/default_papyrus.png and b/mods/default/textures/default_papyrus.png differ diff --git a/mods/default/textures/default_sand.png b/mods/default/textures/default_sand.png index 7477a87b..ea94f88e 100644 Binary files a/mods/default/textures/default_sand.png and b/mods/default/textures/default_sand.png differ diff --git a/mods/default/textures/default_sandstone.png b/mods/default/textures/default_sandstone.png index bd9cb869..98865de9 100644 Binary files a/mods/default/textures/default_sandstone.png and b/mods/default/textures/default_sandstone.png differ diff --git a/mods/default/textures/default_sandstone_brick.png b/mods/default/textures/default_sandstone_brick.png index eaf07874..ea424361 100644 Binary files a/mods/default/textures/default_sandstone_brick.png and b/mods/default/textures/default_sandstone_brick.png differ diff --git a/mods/default/textures/default_scorched_stuff.png b/mods/default/textures/default_scorched_stuff.png deleted file mode 100644 index f64d177e..00000000 Binary files a/mods/default/textures/default_scorched_stuff.png and /dev/null differ diff --git a/mods/default/textures/default_steel_block.png b/mods/default/textures/default_steel_block.png index fe737301..b92dc248 100644 Binary files a/mods/default/textures/default_steel_block.png and b/mods/default/textures/default_steel_block.png differ diff --git a/mods/default/textures/treeprop.png b/mods/default/textures/treeprop.png deleted file mode 100644 index 5e9f3330..00000000 Binary files a/mods/default/textures/treeprop.png and /dev/null differ