diff --git a/mods/bakedclay/README.md b/mods/bakedclay/README.md index bf55dede..1cf146ac 100644 --- a/mods/bakedclay/README.md +++ b/mods/bakedclay/README.md @@ -8,7 +8,7 @@ https://forum.minetest.net/viewtopic.php?id=8890 Changelog: -- 1.0 - Re-Added glazed terracotta blocks when you cook baked clay in furnace (thanks Amara2_MK), added support for sofar's flowerpot mod +- 1.0 - Re-Added glazed terracotta blocks when you cook baked clay in furnace (thanks Amara2_MK), added support for sofar's flowerpot mod, missing glazed textures re-coloured by firefox. - 0.9 - Baked clay now works in the technic cnc machine - 0.8 - Cooking clay block in furnace gives natural baked clay which you can dye - 0.7 - Added support for stairsplus so that stairs are registered properly diff --git a/mods/bakedclay/license.txt b/mods/bakedclay/license.txt index 6efb8350..532dbe28 100644 --- a/mods/bakedclay/license.txt +++ b/mods/bakedclay/license.txt @@ -24,3 +24,5 @@ THE SOFTWARE. Textures by Amara2_MK (Creative Commons) https://www.curseforge.com/minecraft/texture-packs/glazed-terracotta-revamp baked_clay_terracotta*.png + +Missing gray, light gray, black and green textures re-coloured by Firefox. diff --git a/mods/bakedclay/screenshot.png b/mods/bakedclay/screenshot.png index 68a950a1..6ac7fdd4 100644 Binary files a/mods/bakedclay/screenshot.png and b/mods/bakedclay/screenshot.png differ diff --git a/mods/bakedclay/textures/baked_clay_terracotta_black.png b/mods/bakedclay/textures/baked_clay_terracotta_black.png index 77181d01..5e009360 100644 Binary files a/mods/bakedclay/textures/baked_clay_terracotta_black.png and b/mods/bakedclay/textures/baked_clay_terracotta_black.png differ diff --git a/mods/bakedclay/textures/baked_clay_terracotta_dark_grey.png b/mods/bakedclay/textures/baked_clay_terracotta_dark_grey.png index 02843282..0f2504f5 100644 Binary files a/mods/bakedclay/textures/baked_clay_terracotta_dark_grey.png and b/mods/bakedclay/textures/baked_clay_terracotta_dark_grey.png differ diff --git a/mods/bakedclay/textures/baked_clay_terracotta_green.png b/mods/bakedclay/textures/baked_clay_terracotta_green.png index 4900f04e..959393d6 100644 Binary files a/mods/bakedclay/textures/baked_clay_terracotta_green.png and b/mods/bakedclay/textures/baked_clay_terracotta_green.png differ diff --git a/mods/bakedclay/textures/baked_clay_terracotta_grey.png b/mods/bakedclay/textures/baked_clay_terracotta_grey.png index 02843282..6f396c34 100644 Binary files a/mods/bakedclay/textures/baked_clay_terracotta_grey.png and b/mods/bakedclay/textures/baked_clay_terracotta_grey.png differ diff --git a/mods/bakedclay/textures/baked_clay_terracotta_yellow.png b/mods/bakedclay/textures/baked_clay_terracotta_yellow.png index e43289d2..bd79f390 100644 Binary files a/mods/bakedclay/textures/baked_clay_terracotta_yellow.png and b/mods/bakedclay/textures/baked_clay_terracotta_yellow.png differ diff --git a/mods/christmas/functions.lua b/mods/christmas/functions.lua index 8d24d5da..404fb1fc 100644 --- a/mods/christmas/functions.lua +++ b/mods/christmas/functions.lua @@ -138,9 +138,15 @@ minetest.register_globalstep (function(dtime) player:set_physics_override({ speed = 1, }) - player:hud_remove(p.hud.ui) - player:hud_remove(p.hud.icon) - player:hud_remove(p.hud.time) + if p.hud.ui then + player:hud_remove(p.hud.ui) + end + if p.hud.icon then + player:hud_remove(p.hud.icon) + end + if p.hud.time then + player:hud_remove(p.hud.time) + end end end end) diff --git a/mods/moreores/init.lua b/mods/moreores/init.lua index 7a6303e0..e1cf2a49 100644 --- a/mods/moreores/init.lua +++ b/mods/moreores/init.lua @@ -178,32 +178,26 @@ local function add_ore(modname, description, mineral_name, oredef) inventory_image = toolimg_base .. tool_name .. ".png", tool_capabilities = { max_drop_level = 3, - groupcaps = tooldef, + groupcaps = tooldef.groupcaps, + damage_groups = tooldef.damage_groups, + full_punch_interval = oredef.full_punch_interval, }, sound = {breaks = "default_tool_breaks"}, } if tool_name == "sword" then - tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval - tdef.tool_capabilities.damage_groups = oredef.tools.sword.damage_groups tdef.description = S("@1 Sword", S(description)) end if tool_name == "pick" then - tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval - tdef.tool_capabilities.damage_groups = oredef.tools.pick.damage_groups tdef.description = S("@1 Pickaxe", S(description)) end if tool_name == "axe" then - tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval - tdef.tool_capabilities.damage_groups = oredef.tools.axe.damage_groups tdef.description = S("@1 Axe", S(description)) end if tool_name == "shovel" then - tdef.full_punch_interval = oredef.full_punch_interval - tdef.tool_capabilities.damage_groups = oredef.tools.shovel.damage_groups tdef.description = S("@1 Shovel", S(description)) tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90" end @@ -211,7 +205,7 @@ local function add_ore(modname, description, mineral_name, oredef) local fulltool_name = tool_base .. tool_name .. tool_post if tool_name == "hoe" and minetest.get_modpath("farming") then - tdef.max_uses = tooldef.uses + tdef.max_uses = tooldef.max_uses tdef.description = S("@1 Hoe", S(description)) farming.register_hoe(fulltool_name, tdef) end @@ -259,25 +253,33 @@ local oredefs = { }, tools = { pick = { - cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1}, + groupcaps = { + cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1}, + }, damage_groups = {fleshy = 4}, }, hoe = { - uses = 300, + max_uses = 300, }, shovel = { - crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1}, + groupcaps = { + crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1}, + }, damage_groups = {fleshy = 3}, }, axe = { - choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1}, - fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1}, + groupcaps = { + choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1}, + fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1}, + }, damage_groups = {fleshy = 5}, }, sword = { - fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, - snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, - choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0}, + groupcaps = { + fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, + snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, + choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0}, + }, damage_groups = {fleshy = 6}, }, }, @@ -295,25 +297,33 @@ local oredefs = { }, tools = { pick = { - cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3}, + groupcaps = { + cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3}, + }, damage_groups = {fleshy = 6}, }, hoe = { - uses = 1000, + max_uses = 1000, }, shovel = { - crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3}, + groupcaps = { + crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3}, + }, damage_groups = {fleshy = 5}, }, axe = { - choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3}, - fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2}, + groupcaps = { + choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3}, + fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2}, + }, damage_groups = {fleshy = 8}, }, sword = { - fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2}, - snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3}, - choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0}, + groupcaps = { + fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2}, + snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3}, + choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0}, + }, damage_groups = {fleshy = 10}, }, }, diff --git a/mods/skinsdb/meta/character_2125.txt b/mods/skinsdb/meta/character_2125.txt new file mode 100644 index 00000000..cc63c093 --- /dev/null +++ b/mods/skinsdb/meta/character_2125.txt @@ -0,0 +1,3 @@ +Steve +Mojang +CC BY-SA 4.0 diff --git a/mods/skinsdb/meta/character_2126.txt b/mods/skinsdb/meta/character_2126.txt new file mode 100644 index 00000000..d38a6672 --- /dev/null +++ b/mods/skinsdb/meta/character_2126.txt @@ -0,0 +1,3 @@ +Astro +ElMehdiBen +CC BY-SA 3.0 diff --git a/mods/skinsdb/meta/character_2127.txt b/mods/skinsdb/meta/character_2127.txt new file mode 100644 index 00000000..bb0acf61 --- /dev/null +++ b/mods/skinsdb/meta/character_2127.txt @@ -0,0 +1,3 @@ +Sword boy +ElMehdiBen +CC BY-SA 3.0 diff --git a/mods/skinsdb/meta/character_2128.txt b/mods/skinsdb/meta/character_2128.txt new file mode 100644 index 00000000..839bbdf9 --- /dev/null +++ b/mods/skinsdb/meta/character_2128.txt @@ -0,0 +1,3 @@ +milah +RainbowSparksSC +CC BY-NC-SA 3.0 diff --git a/mods/skinsdb/textures/character_2125.png b/mods/skinsdb/textures/character_2125.png new file mode 100644 index 00000000..7cfa08a8 Binary files /dev/null and b/mods/skinsdb/textures/character_2125.png differ diff --git a/mods/skinsdb/textures/character_2126.png b/mods/skinsdb/textures/character_2126.png new file mode 100644 index 00000000..e4f63f94 Binary files /dev/null and b/mods/skinsdb/textures/character_2126.png differ diff --git a/mods/skinsdb/textures/character_2127.png b/mods/skinsdb/textures/character_2127.png new file mode 100644 index 00000000..6815ec62 Binary files /dev/null and b/mods/skinsdb/textures/character_2127.png differ diff --git a/mods/skinsdb/textures/character_2128.png b/mods/skinsdb/textures/character_2128.png new file mode 100644 index 00000000..a4082500 Binary files /dev/null and b/mods/skinsdb/textures/character_2128.png differ