diff --git a/README.txt b/README.txt index faba17a0bca1d512fcdfab12ca64017e04b1c430..aadb6ad37520ecc1bb5f2a35260ef297133ccf2d 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 37abfa6aee37d7ed5ed18bfdf58efc69424a59f8..703f3dc98c76c83830c0a4f9f6f9273e8d238afb 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 eadb2a3a1a0410083553503a55f0ecd7ecf26041..d80082e28216d25ced8058f71a2526904afb2fb7 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 3b966eb75f8698e9c7f371f79882749e7c3af7bf..113e1d50d228d34e4ab6fadbce0de302696309d7 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 2d3652e29cb7a91b955134d36ac9058ab4283cf2..026a31c0bbe1b0639874ed6f9e45194693d68734 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 82e558dedaedb57af12a513c4d5fed3dc2f127db..fc7e9008b66c29bdcfcea32be46da706f6d8e3b0 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 97792e1e6bb02cfc8430f9f4df74964ee5b2e331..4971bd83497bf91b14e8c5a137079107f74ce2f0 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 85b4d49104490d3988372c42e35c98e10dc5594d..cf94a84e96c5fe57875bdfa38979ed344ad03acd 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 bb0c3e45543aed092fc366febaeef5926692d7c6..6f21b489d435aaaad2690b88fa0d368a236744fd 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 cf8896dc704649fe6ee1eceec3746a2fb180d9c0..07617cb7839c3cea6fdb0013b1cc5d167ea8b116 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 cc497042fa2c7d531a94c9f1df6f71493ad89d53..36c1c7c0b87c90e53e19ccaa930f0fde9072b878 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 55dc5511f71e87f62011b74eed3cae2f5d69b2ae..24848184c75078654a3a0e338a0818b555c9ad37 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 c07aeb94c00eacb955559e70416a496bbb44c54c..db716c5d82cfcf492df0a7c7e0c26416e7e8a76b 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 b7addc80fe93c5c1b634239d9752274a7b166496..3d35b1e6874176ef097df17a5ccbe016c0dab66f 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 1c3f961290518eaa55777c872f59fd20130d71a6..e3a3ccc5bf82bd10a34a674afea28984ecbb2c93 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 2507706d9e3b194963169c404f539e6161573de3..5cc31c6a550fcd02ada4d1b2961174e317b9ce03 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 91284aa365ebb4f964de81435ce721d40a2f64ed..7fbe5c4bee247d1b126da3daed0fdc2bc3f06796 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 8a5361d0066beee7e804b5bfceecaaa9252d134e..ebe8c6c239012cb44323b54821d71fba918770b7 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 7477a87beee6b31b5faddb20357fb9eeb6803594..ea94f88e8cc0d31fbff3e3e2289462f001f36742 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 bd9cb8692f449d37711a3a31e313230d147327ee..98865de9b90d770553385d77fe16547c8c81cea5 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 eaf0787499d3c48133facb5a1578f49c54bf90dd..ea424361973fa07d0feaa6ec0e43699003dad71a 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 f64d177e6cedc16dea8a7b0ca581e84433b817a0..0000000000000000000000000000000000000000 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 fe7373013b38d20e8d4d92a50dcb0ff56dff16a7..b92dc24862f340a6307b6f780f6c68ec5becb8fd 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 5e9f3330406ac50f7d4e1ac38e0464a053cd2755..0000000000000000000000000000000000000000 Binary files a/mods/default/textures/treeprop.png and /dev/null differ