diff --git a/mods/CORE/mcl_explosions/init.lua b/mods/CORE/mcl_explosions/init.lua index b23489861..7607ecf0d 100644 --- a/mods/CORE/mcl_explosions/init.lua +++ b/mods/CORE/mcl_explosions/init.lua @@ -255,9 +255,9 @@ local function trace_explode(pos, strength, raydirs, radius, info, puncher) local z_len = math.abs(z2 - z1) -- Move object position to the center of its bounding box - opos.x = opos.x + x1 + x2 - opos.y = opos.y + y1 + y2 - opos.z = opos.z + z1 + z2 + opos.x = opos.x + 0.5 * (x1 + x2) + opos.y = opos.y + 0.5 * (y1 + y2) + opos.z = opos.z + 0.5 * (z1 + z2) -- Count number of rays from collision box which are unobstructed local count = N_EXPOSURE_RAYS @@ -441,10 +441,6 @@ function mcl_explosions.explode(pos, strength, info, puncher) info.max_blast_resistance = INDESTRUCT_BLASTRES end - -- For backwards compatibility - if info.no_particle then info.particles = false end - if info.no_sound then info.sound = false end - -- Dont do drops in creative mode if minetest.is_creative_enabled("") then info.drop_chance = 0 diff --git a/mods/ENTITIES/mobs_mc/creeper.lua b/mods/ENTITIES/mobs_mc/creeper.lua index ab0bca9d6..9ee9e9d24 100644 --- a/mods/ENTITIES/mobs_mc/creeper.lua +++ b/mods/ENTITIES/mobs_mc/creeper.lua @@ -158,7 +158,7 @@ mobs:register_mob("mobs_mc:creeper_charged", { runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" }, attack_type = "explode", - explosion_strength = 5, + explosion_strength = 6, explosion_radius = 8, explosion_damage_radius = 8, explosiontimer_reset_radius = 6, diff --git a/mods/HELP/mcl_doc_basics/locale/mcl_doc_basics.fr.tr b/mods/HELP/mcl_doc_basics/locale/mcl_doc_basics.fr.tr index d6edcfb64..98fcd81b3 100644 --- a/mods/HELP/mcl_doc_basics/locale/mcl_doc_basics.fr.tr +++ b/mods/HELP/mcl_doc_basics/locale/mcl_doc_basics.fr.tr @@ -241,7 +241,7 @@ In some games, the minimap may be disabled.=Dans certains jeux, la minicarte peu • Toggle minimap rotation mode: [Shift]+[F9]=• Basculer le mode de rotation de la mini-carte: [Shift]+[F9] Inventory=Inventaire Inventories are used to store item stacks. There are other uses, such as crafting. An inventory consists of a rectangular grid of item slots. Each item slot can either be empty or hold one item stack. Item stacks can be moved freely between most slots.=Les stocks sont utilisés pour stocker des piles d'articles. Il existe d'autres utilisations, telles que l'artisanat. Un inventaire se compose d'une grille rectangulaire d'emplacements d'objets. Chaque emplacement d'objet peut être vide ou contenir une pile d'objets. Les piles d'objets peuvent être déplacées librement entre la plupart des emplacements. -You have your own inventory which is called your “player inventory”, you can open it with the inventory key (default: [I]). The first inventory slots are also used as slots in your hotbar.=Vous avez votre propre inventaire qui s'appelle votre "inventaire de joueur", vous pouvez l'ouvrir avec la clé d'inventaire (par défaut: [I]). Les premiers emplacements d'inventaire sont également utilisés comme emplacements dans votre hotbar. +You have your own inventory which is called your “player inventory”, you can open it with the inventory key (default: [I]). The first inventory slots are also used as slots in your hotbar.=Vous avez votre propre inventaire qui s'appelle votre "inventaire de joueur", vous pouvez l'ouvrir avec la touche d'inventaire (par défaut: [I]). Les premiers emplacements d'inventaire sont également utilisés comme emplacements dans votre hotbar. Blocks can also have their own inventory, e.g. chests and furnaces.=Les blocs peuvent également avoir leur propre inventaire, par exemple coffres et fours. Inventory controls:=Contrôles d'inventaire: Taking: You can take items from an occupied slot if the cursor holds nothing.=Prendre: vous pouvez prendre des objets dans un emplacement occupé si le curseur ne contient rien. diff --git a/mods/ITEMS/mcl_chests/models/mcl_chests_chest_double.b3d b/mods/ITEMS/mcl_chests/models/mcl_chests_chest_double.b3d index 86c44bfeb..8d79b8ff7 100644 Binary files a/mods/ITEMS/mcl_chests/models/mcl_chests_chest_double.b3d and b/mods/ITEMS/mcl_chests/models/mcl_chests_chest_double.b3d differ diff --git a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr b/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr index 98f8cb2c5..eee31278b 100644 --- a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr +++ b/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr @@ -40,7 +40,7 @@ Removes all status effects=Supprime tous les effets de statut! Milk is very refreshing and can be obtained by using a bucket on a cow. Drinking it will remove all status effects, but restores no hunger points.=Le lait est très rafraîchissant et peut être obtenu en utilisant un seau sur une vache. Le boire supprimera tous les effets de statut, mais ne restaure aucun point de faim. -Use the placement key to drink the milk.=Utilisez la clé de placement pour boire le lait. +Use the placement key to drink the milk.=Utilisez la touche de placement pour boire le lait. Spider Eye=Oeil d'Araignée Poisonous=Toxique @@ -78,7 +78,7 @@ Saddle=Selle Can be placed on animals to ride them=Peut être placé sur les animaux pour les monter Saddles can be put on some animals in order to mount them.=Des selles peuvent être posées sur certains animaux afin de les monter. -Use the placement key with the saddle in your hand to try to put on the saddle. Saddles fit on horses, mules, donkeys and pigs. Horses, mules and donkeys need to be tamed first, otherwise they'll reject the saddle. Saddled animals can be mounted by using the placement key on them again.=Utilisez la clé de placement avec la selle à la main pour essayer de mettre la selle. Les selles conviennent aux chevaux, mulets, ânes et cochons. Les chevaux, les mulets et les ânes doivent d'abord être apprivoisés, sinon ils rejetteront la selle. Les animaux sellés peuvent être montés en utilisant à nouveau la clé de placement. +Use the placement key with the saddle in your hand to try to put on the saddle. Saddles fit on horses, mules, donkeys and pigs. Horses, mules and donkeys need to be tamed first, otherwise they'll reject the saddle. Saddled animals can be mounted by using the placement key on them again.=Utilisez la touche de placement avec la selle à la main pour essayer de mettre la selle. Les selles conviennent aux chevaux, mulets, ânes et cochons. Les chevaux, les mulets et les ânes doivent d'abord être apprivoisés, sinon ils rejetteront la selle. Les animaux sellés peuvent être montés en utilisant à nouveau la touche de placement. Rabbit Stew=Ragout de Lapin Rabbit stew is a very nutricious food item.=Le ragoût de lapin est un aliment très nutritif. diff --git a/mods/ITEMS/mcl_potions/locale/mcl_potions.fr.tr b/mods/ITEMS/mcl_potions/locale/mcl_potions.fr.tr index 5aeeccf27..f3850a7b6 100644 --- a/mods/ITEMS/mcl_potions/locale/mcl_potions.fr.tr +++ b/mods/ITEMS/mcl_potions/locale/mcl_potions.fr.tr @@ -1,5 +1,5 @@ # textdomain: mcl_potions - []= [] + []= [] Add a status effect to yourself. Arguments: : name of status effect, e.g. poison. : duration in seconds. : effect strength multiplier (1 @= 100%)=Ajoutez-vous un effet de statut. Arguments: : nom de l'effet de statut, par ex. poison. : durée en secondes. : multiplicateur de force d'effet (1 @ = 100%) @@ -46,17 +46,17 @@ Drinking a potion gives you a particular effect.=Boire une potion vous donne un 1 HP/@1s | @2=1 HP/@1s | @2 @1 HP=@1 HP @1 Potion=Potion @1 -Splash @1 Potion=Potion @1 jettable +Splash @1 Potion=Potion @1 jetable Lingering @1 Potion=Potion @1 persistante Arrow of @1=Flêche de @1 II= II IV= IV @1 Potion@2=@1 Potion@2 -Splash @1@2 Potion=Potion @1@2 jettable +Splash @1@2 Potion=Potion @1@2 jetable Lingering @1@2 Potion=Potion @1@2 persistante Arrow of @1@2=Flêche de @1@2 @1 + Potion=@1 + Potion -Splash @1 + Potion=Potion @1 + jettable +Splash @1 + Potion=Potion @1 + jetable Lingering @1 + Potion=Potion @1 + persistante Arrow of @1 +=Flêche de @1 + Awkward Potion=Potion étrange diff --git a/mods/MISC/mcl_temp_helper_recipes/init.lua b/mods/MISC/mcl_temp_helper_recipes/init.lua index f9a6ec0e9..d1262cb2c 100644 --- a/mods/MISC/mcl_temp_helper_recipes/init.lua +++ b/mods/MISC/mcl_temp_helper_recipes/init.lua @@ -30,15 +30,6 @@ minetest.register_craft({ recipe = { "mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard", "mcl_core:gold_ingot" }, }) -minetest.register_craft({ - output = "mcl_mobitems:shulker_shell", - recipe = { - { "mcl_end:purpur_block", "mcl_end:purpur_block", "mcl_end:purpur_block", }, - { "mcl_end:purpur_block", "mcl_core:goldblock", "mcl_end:purpur_block", }, - { "mcl_end:purpur_block", "", "mcl_end:purpur_block", }, - } -}) - minetest.register_craft({ output = "mcl_armor:helmet_chain", recipe = { @@ -112,11 +103,6 @@ minetest.register_craft({ }, }) -minetest.register_craft({ - output = "mcl_core:gold_ingot 9", - recipe = {{ "mcl_core:emerald" }}, -}) - minetest.register_craft({ output = "mcl_potions:dragon_breath 3", recipe = { diff --git a/mods/PLAYER/mcl_player/init.lua b/mods/PLAYER/mcl_player/init.lua index 262182e4a..5e36b6404 100644 --- a/mods/PLAYER/mcl_player/init.lua +++ b/mods/PLAYER/mcl_player/init.lua @@ -154,8 +154,10 @@ minetest.register_globalstep(function(dtime) animation_speed_mod = animation_speed_mod / 2 end + -- ask if player is in a place which he should crawl + node_in_feet = minetest.registered_nodes[mcl_playerinfo[name].node_feet] -- ask if player is swiming - standing_on_water = minetest.get_item_group(mcl_playerinfo[name].node_stand, "water") ~= 0 + standing_on_water = minetest.get_item_group(mcl_playerinfo[name].node_feet, "water") ~= 0 diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index 64ba2ff47..e588c7dad 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -26,7 +26,11 @@ minetest.register_globalstep(function(dtime) -- controls head bone local pitch = degrees(player:get_look_vertical()) * -1 - local node_in_feet = minetest.registered_nodes[mcl_playerinfo[name].node_feet] + if string.find(player:get_wielded_item():get_name(), "mcl_bows:crossbow") and controls.RMB then + playerphysics.add_physics_factor(player, "speed", "mcl_playerplus:crossbow_walking", tonumber(minetest.settings:get("movement_speed_crouch")) / tonumber(minetest.settings:get("movement_speed_walk"))) + else + playerphysics.remove_physics_factor(player, "speed", "mcl_playerplus:crossbow_walking") + end -- controls right and left arms pitch when shooting a bow or punching if string.find(player:get_wielded_item():get_name(), "mcl_bows:bow") and controls.RMB and not controls.up and not controls.down and not controls.left and not controls.right and not minetest.get_item_group(mcl_playerinfo[name].node_stand, "water") ~= 0 then @@ -46,19 +50,13 @@ minetest.register_globalstep(function(dtime) player:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(0,0,0)) end - if string.find(player:get_wielded_item():get_name(), "mcl_bows:crossbow") and controls.RMB then - playerphysics.add_physics_factor(player, "speed", "mcl_playerplus:crossbow_walking", tonumber(minetest.settings:get("movement_speed_crouch")) / tonumber(minetest.settings:get("movement_speed_walk"))) - else - playerphysics.remove_physics_factor(player, "speed", "mcl_playerplus:crossbow_walking") - end - if controls.sneak and player:get_attach() == nil then -- controls head pitch when sneaking player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+36,0,0)) -- sets eye height, and nametag color accordingly player:set_properties({collisionbox = {-0.35,0,-0.35,0.35,1.8,0.35}, eye_height = 1.35, nametag_color = { r = 225, b = 225, a = 0, g = 225 }}) - elseif minetest.get_item_group(mcl_playerinfo[name].node_stand, "water") ~= 0 and player:get_attach() == nil then + elseif minetest.get_item_group(mcl_playerinfo[name].node_feet, "water") ~= 0 and player:get_attach() == nil then -- controls head pitch when swiming player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+90,0,0)) -- sets eye height, and nametag color accordingly diff --git a/mods/PLAYER/wieldview/init.lua b/mods/PLAYER/wieldview/init.lua index 7835cc38f..dab577fa8 100644 --- a/mods/PLAYER/wieldview/init.lua +++ b/mods/PLAYER/wieldview/init.lua @@ -74,13 +74,9 @@ minetest.register_on_joinplayer(function(player) end, player) end) -minetest.register_globalstep(function(dtime) - time = time + dtime - if time > update_time then - for _,player in ipairs(minetest.get_connected_players()) do - wieldview:update_wielded_item(player) - end - time = 0 +minetest.register_globalstep(function() + for _,player in ipairs(minetest.get_connected_players()) do + wieldview:update_wielded_item(player) end end)