From c4e5c2994296308068a7706c7f47ddd39c3ccca0 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 16 Jan 2021 20:08:32 +0100 Subject: [PATCH] update --- mods-list | 1 + .../locale/basic_materials.it.tr | 34 ++++++++++++++++++ mods/cloud_items/LICENSE.md | 5 ++- mods/cloud_items/README.md | 1 + mods/cloud_items/init.lua | 19 ++++++++++ mods/cloud_items/locale/cloud_items.es.tr | 1 + mods/cloud_items/locale/cloud_items.fr.tr | 1 + mods/cloud_items/locale/template.txt | 1 + mods/cloud_items/mod.conf | 2 +- mods/mobs_animal/bunny.lua | 2 +- mods/mobs_animal/chicken.lua | 2 +- mods/mobs_redo/api.lua | 16 ++++----- mods/mobs_redo/crafts.lua | 6 ++-- mods/skinsdb/meta/character_1940.txt | 3 ++ mods/skinsdb/textures/character_1940.png | Bin 0 -> 8325 bytes 15 files changed, 79 insertions(+), 15 deletions(-) create mode 100644 mods/basic_materials/locale/basic_materials.it.tr create mode 100644 mods/skinsdb/meta/character_1940.txt create mode 100644 mods/skinsdb/textures/character_1940.png diff --git a/mods-list b/mods-list index 720e5451..d9a3b2aa 100644 --- a/mods-list +++ b/mods-list @@ -267,3 +267,4 @@ load_mod_advtrains_itrainmap = true load_mod_assets = true load_mod_advtrains_signals_ks = true load_mod_claycrafter = true +load_mod_serialize_lib = true diff --git a/mods/basic_materials/locale/basic_materials.it.tr b/mods/basic_materials/locale/basic_materials.it.tr new file mode 100644 index 00000000..aae0b3be --- /dev/null +++ b/mods/basic_materials/locale/basic_materials.it.tr @@ -0,0 +1,34 @@ +# textdomain: basic_materials +# Author: Salvo 'LtWorf' Tomaselli +Silicon lump=Grumo di silicio +Simple Integrated Circuit=Circuito integrato semplice +Simple Motor=Motore semplice +Heating element=Elemento riscaldante +Simple energy crystal=Cristallo di energia semplice + +Spool of steel wire=Bobina di filo d'acciaio +Spool of copper wire=Bobina di filo di rame +Spool of silver wire=Bobina di filo d'argento +Spool of gold wire=Bobina di filo d'oro +Steel Strip=Striscia d'acciaio +Copper Strip=Striscia di rame +Steel Bar=Barra d'acciaio +Chainlinks (brass)=Catena (ottone) +Chainlinks (steel)=Catena (acciaio) +Brass Ingot=Lingotto di ottone +Steel gear=Ingranaggio d'acciaio +Padlock=Catenaccio +Chain (steel, hanging)=Catena (acciaio, pendente) +Chain (brass, hanging)=Catena (ottone, pendente) +Brass Block=Blocco di ottone + +Oil extract=Estratto d'olio +Unprocessed paraffin=Paraffina grezza +Uncooked Terracotta Base=Argilla cruda +Wet Cement=Cemento umido +Cement=Cemento +Concrete Block=Blocco di calcestruzzo + +Plastic sheet=Foglio di plastica +Plastic strips=Striscia di plastica +Empty wire spool=Rocchetto vuoto diff --git a/mods/cloud_items/LICENSE.md b/mods/cloud_items/LICENSE.md index f217a491..6639a3af 100644 --- a/mods/cloud_items/LICENSE.md +++ b/mods/cloud_items/LICENSE.md @@ -36,9 +36,12 @@ Copyright (C) [Melkor](https://forum.minetest.net/memberlist.php?mode=viewprofil - `cloud_items_car_cloud.png` - [`car_white.png`](https://github.com/minetest-mods/vehicle_mash/blob/master/textures/car_white.png) - `cloud_items_car_cloud_inventory.png` - [`inv_car_white.png`](https://github.com/minetest-mods/vehicle_mash/blob/master/textures/inv_car_white.png) -Copyright (C) [davidthecreator](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=11158) 2017-2018 ([CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)): +Copyright (C) [davidthecreator](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=11158) 2017-2019 ([CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)): - All [`3d_armor`](https://github.com/stujones11/minetest-3d_armor) [textures](https://github.com/stujones11/minetest-3d_armor/tree/master/3d_armor/textures). +- `cloud_items_gloves_cloud.png` - [`3d_armor_gloves_gloves_steel.png`](https://github.com/sirrobzeroone/3d_armor_gloves/blob/main/textures/3d_armor_gloves_gloves_steel.png) +- `cloud_items_gloves_cloud_preview.png` - [`3d_armor_gloves_gloves_steel_preview.png`](https://github.com/sirrobzeroone/3d_armor_gloves/blob/main/textures/3d_armor_gloves_gloves_steel_preview.png) +- `cloud_items_gloves_inv_gloves_cloud.png` - [`3d_armor_gloves_inv_gloves_steel.png`](https://github.com/sirrobzeroone/3d_armor_gloves/blob/main/textures/3d_armor_gloves_inv_gloves_steel.png) ## License for source code diff --git a/mods/cloud_items/README.md b/mods/cloud_items/README.md index 69ceff94..e215ebff 100644 --- a/mods/cloud_items/README.md +++ b/mods/cloud_items/README.md @@ -108,6 +108,7 @@ There are 4 types of cloud: - [`toolranks`](https://github.com/lisacvuk/minetest-toolranks) - [`moreblocks`](https://github.com/minetest-mods/moreblocks) - [`multitools`](https://github.com/ChimneySwift/multitools) +- [`3d_armor_gloves`](https://github.com/sirrobzeroone/3d_armor_gloves) - `stairs` (included in [Minetest Game](https://github.com/minetest/minetest_game)) ## Requirements diff --git a/mods/cloud_items/init.lua b/mods/cloud_items/init.lua index 6177a586..43620188 100644 --- a/mods/cloud_items/init.lua +++ b/mods/cloud_items/init.lua @@ -723,6 +723,25 @@ if minetest.get_modpath("3d_armor") then }) end + -- Support for 3D Armor Gloves/Gauntlets + if minetest.get_modpath("3d_armor_gloves") then + armor:register_armor("cloud_items:gloves_cloud", { + description = S("Cloud Gauntlets"), + inventory_image = "cloud_items_inv_gloves_cloud.png", + groups = {armor_hands=1, armor_heal=12, armor_use=70}, + armor_groups = {fleshy=10}, + damage_groups = {cracky=2, snappy=1, level=6}, + }) + + minetest.register_craft({ + output = "cloud_items:gloves_cloud", + recipe = { + {"cloud_items:cloud_ingot", "", "cloud_items:cloud_ingot"}, + {"farming:string", "", "farming:string"}, + }, + }) + end + --------------- -- Crafting -- --------------- diff --git a/mods/cloud_items/locale/cloud_items.es.tr b/mods/cloud_items/locale/cloud_items.es.tr index 97fe2755..ad074ee4 100644 --- a/mods/cloud_items/locale/cloud_items.es.tr +++ b/mods/cloud_items/locale/cloud_items.es.tr @@ -37,3 +37,4 @@ Decorative cloud Panel=Barre en nuage decorativa Decorative cloud Stairs=Escalera de nube decorativa Cloud multitool=Multiherramienta de nube Cloud car=Carro de nube +Cloud Gauntlets=Guanteletes de nube diff --git a/mods/cloud_items/locale/cloud_items.fr.tr b/mods/cloud_items/locale/cloud_items.fr.tr index 059e2235..c0974104 100644 --- a/mods/cloud_items/locale/cloud_items.fr.tr +++ b/mods/cloud_items/locale/cloud_items.fr.tr @@ -37,3 +37,4 @@ Decorative cloud Panel=Barre en nuage décoratif Decorative cloud Stairs=Escaliers en nuage décoratif Cloud multitool=Outil-multi nuage Cloud car=Voiture de nuage +Cloud Gauntlets=Gantelets de nuage. diff --git a/mods/cloud_items/locale/template.txt b/mods/cloud_items/locale/template.txt index 6780d90f..c5cf5a20 100644 --- a/mods/cloud_items/locale/template.txt +++ b/mods/cloud_items/locale/template.txt @@ -37,3 +37,4 @@ Decorative cloud Panel= Decorative cloud Stairs= Cloud multitool= Cloud car= +Cloud Gauntlets= diff --git a/mods/cloud_items/mod.conf b/mods/cloud_items/mod.conf index daed9d59..39a1a028 100644 --- a/mods/cloud_items/mod.conf +++ b/mods/cloud_items/mod.conf @@ -1,6 +1,6 @@ name = cloud_items depends = default, worldedit, vehicle_mash -optional_depends = 3d_armor, toolranks, stairs, moreblocks, multitools +optional_depends = 3d_armor, toolranks, stairs, moreblocks, multitools, 3d_armor_gloves description = Adds powerful cloud tools for Minetest. min_minetest_version = 5.0.0 license = LGPLv2.1 diff --git a/mods/mobs_animal/bunny.lua b/mods/mobs_animal/bunny.lua index 39480035..dd63ad74 100644 --- a/mods/mobs_animal/bunny.lua +++ b/mods/mobs_animal/bunny.lua @@ -161,7 +161,7 @@ minetest.register_craft({ minetest.register_craftitem(":mobs:rabbit_hide", { description = S("Rabbit Hide"), inventory_image = "mobs_rabbit_hide.png", - groups = {flammable = 2}, + groups = {flammable = 2, leather = 1}, }) minetest.register_craft({ diff --git a/mods/mobs_animal/chicken.lua b/mods/mobs_animal/chicken.lua index dd2eb8c4..ad552408 100644 --- a/mods/mobs_animal/chicken.lua +++ b/mods/mobs_animal/chicken.lua @@ -302,7 +302,7 @@ minetest.register_craft({ minetest.register_craftitem(":mobs:chicken_feather", { description = S("Feather"), inventory_image = "mobs_chicken_feather.png", - groups = {flammable = 2}, + groups = {flammable = 2, feather = 1}, }) minetest.register_craft({ diff --git a/mods/mobs_redo/api.lua b/mods/mobs_redo/api.lua index d1327936..2659681f 100644 --- a/mods/mobs_redo/api.lua +++ b/mods/mobs_redo/api.lua @@ -8,7 +8,7 @@ local use_cmi = minetest.global_exists("cmi") mobs = { mod = "redo", - version = "20210108", + version = "20210114", intllib = S, invis = minetest.global_exists("invisibility") and invisibility or {} } @@ -3705,9 +3705,6 @@ local can_spawn = function(pos, name) end end - -- spawn mob 1/2 node above ground - pos.y = pos.y + 0.5 - -- tweak X/Z spawn pos if width_x % 2 == 0 then pos.x = pos.x + 0.5 @@ -3972,15 +3969,15 @@ function mobs:spawn_specific(name, nodes, neighbors, min_light, max_light, inter end end + local ent = minetest.registered_entities[name] + -- should we check mob area for obstructions ? if mob_area_spawn ~= true then -- do we have enough height clearance to spawn mob? - local ent = minetest.registered_entities[name] - local height = max(1, math.ceil( - (ent.collisionbox[5] or 0.25) - (ent.collisionbox[2] or -0.25) - 1)) + local height = max(0, ent.collisionbox[5] - ent.collisionbox[2]) - for n = 0, height do + for n = 0, floor(height) do local pos2 = {x = pos.x, y = pos.y + n, z = pos.z} @@ -3996,6 +3993,9 @@ function mobs:spawn_specific(name, nodes, neighbors, min_light, max_light, inter if pos then + -- adjust for mob collision box + pos.y = pos.y + (ent.collisionbox[2] * -1) - 0.4 + local mob = minetest.add_entity(pos, name) -- print("[mobs] Spawned " .. name .. " at " diff --git a/mods/mobs_redo/crafts.lua b/mods/mobs_redo/crafts.lua index ae8251e9..c1371918 100644 --- a/mods/mobs_redo/crafts.lua +++ b/mods/mobs_redo/crafts.lua @@ -5,7 +5,7 @@ local S = mobs.intllib minetest.register_craftitem("mobs:nametag", { description = S("Name Tag"), inventory_image = "mobs_nametag.png", - groups = {flammable = 2} + groups = {flammable = 2, nametag = 1} }) if minetest.get_modpath("dye") and minetest.get_modpath("farming") then @@ -20,7 +20,7 @@ end minetest.register_craftitem("mobs:leather", { description = S("Leather"), inventory_image = "mobs_leather.png", - groups = {flammable = 2} + groups = {flammable = 2, leather = 1} }) -- raw meat @@ -119,7 +119,7 @@ minetest.register_craft({ minetest.register_craftitem("mobs:saddle", { description = S("Saddle"), inventory_image = "mobs_saddle.png", - groups = {flammable = 2} + groups = {flammable = 2, saddle = 1} }) minetest.register_craft({ diff --git a/mods/skinsdb/meta/character_1940.txt b/mods/skinsdb/meta/character_1940.txt new file mode 100644 index 00000000..e6dc2839 --- /dev/null +++ b/mods/skinsdb/meta/character_1940.txt @@ -0,0 +1,3 @@ +... +... +CC BY-SA 3.0 diff --git a/mods/skinsdb/textures/character_1940.png b/mods/skinsdb/textures/character_1940.png new file mode 100644 index 0000000000000000000000000000000000000000..aab9c53da63afba8ac7f3f271319e4f84a73a964 GIT binary patch literal 8325 zcmeHNZ%kZ85T9!(EloH%DVPeuYuXZ^5;z(JQYFv;?MZ2gsZEU1pqNmNlPVMYx*yyMlBJ%fFF!VrBx`}R!da^Q5rq*3KC)!E4aV8+sAvyyLX(&@h7^; zdpo-`J3GJGnb~)NSIal8k6v=;5+aJWZzy^|^abLvE{+uMKk+hKF_$ncMJ~ z4y`sP2m!Je6>izS&}6mt_L_u{VXIhc9XAq4T)N1JP5T?J1>D0>L715f!mNMJtB;s2 z3w@8-Fl?r4(`nH2pO1k59WV`1G_O^JB?9J4{^R5V7D01NY=9FUVg7sqtp;QYbk7HJ z!0?b;tuJW$#JN7-3nXYAp)3eX3WQ?NOs@@?0x;;QvNgJPz5YR`?!26APWheIcjHra z?zVst0Pw4xc$0RYTA`o-jX8ggk%Ds_JnYnUz>fRU3C~npu<}#YI}>ucMNkbs*1Alw zBj@>dn7*+8L1oU}_me^&{`9g!PnDSMBB-eWYT*6=+{j!--}zz6_5a2ZepH5i+SIIl%|%k?jxXwk6uR+R8Kd3)WgUW1c1kKXyN#vz*r-lwLfCN{RTw3JSs zJUMBN23beP`0=AJYNq61+hhBP>g(lDzdv%sP`~YH>bU*v80BqEqUzCp+S!q$(X;Jv zv*CJ;uo!4kz?X?Jzyr9XnV7{Fz}LqO5}hHsj((BW0l}K4dkd(Q06d(ac7&Qg(=@<4 z3NzRVj}KTv-hSRiK*HKsYCrP>C6vcfUSuK-eioV!A`0vWH97D5ZI_X|m-@Y*`x&`e z)R}UZMt)`b9=d+cO)w1M>AX}y&;IGAhPWJ!WxwA22gTRkugJ+9t`Q)R%g;Fb>7YH4 zYVIu_A8I(yH1wiDH{_~5{z}owyuw84?(gGhfDClRSH+J@Td+sjBOe*ogn$vC?C6Jp zAqYvF3O39Wa#iFe0A6}!F|Ps*zGJILPLspVvs5FbvIjG%xUo-Ac*si=*$-LS!R-TM zeCps~JwQUIvwQ&^aNeXCILPcKqy-|Qy1bw2RSv^Cy%w+r=q*yu0X$9+MxnN9N}fp449A2PY4G&<`38#~3tpVT{N@)IcBfVjsDV zl^VQ4jsTnjsxcd>iiV4ie#6^t6z?ob3ON)t5spH$>Qbnu|NgAp%e|IhRFVJ4GJ<{Gmt6CL94L zAO-H|zUf^X{x0McU@!udyqaWnZah^&S;x{y_8T8=;ff7;I1A1|8UVCBeZW