develop #24

Merged
milan merged 4 commits from develop into master 2020-12-30 10:35:09 +01:00
6 changed files with 26 additions and 67 deletions
Showing only changes of commit 8fe8aeda1f - Show all commits

View file

@ -12,39 +12,39 @@
Admin Boots=Botas de admin Admin Boots=Botas de admin
Admin Chestplate=Peto de admin Admin Chestplate=Peto de admin
Admin Helmet=Casco de admin Admin Helmet=Casco de admin
Admin Leggings=Polainas de admin Admin Leggings=Grebas de admin
Bronze Boots=Botas de bronce Bronze Boots=Botas de bronce
Bronze Chestplate=Peto de bronce Bronze Chestplate=Peto de bronce
Bronze Helmet=Casco de bronce Bronze Helmet=Casco de bronce
Bronze Leggings=Polainas de bronce Bronze Leggings=Grebas de bronce
Cactus Boots=Botas de cactus Cactus Boots=Botas de cactus
Cactus Chestplate=Peto de cactus Cactus Chestplate=Peto de cactus
Cactus Helmet=Casco de cactus Cactus Helmet=Casco de cactus
Cactus Leggings=Polainas de cactus Cactus Leggings=Grebas de cactus
Crystal Boots=Botas de cristal Crystal Boots=Botas de cristal
Crystal Chestplate=Peto de cristal Crystal Chestplate=Peto de cristal
Crystal Helmet=Casco de cristal Crystal Helmet=Casco de cristal
Crystal Leggings=Polainas de cristal Crystal Leggings=Grebas de cristal
Diamond Boots=Botas de diamante Diamond Boots=Botas de diamante
Diamond Chestplate=Peto de diamante Diamond Chestplate=Peto de diamante
Diamond Helmet=Casco de diamante Diamond Helmet=Casco de diamante
Diamond Leggings=Polainas de diamante Diamond Leggings=Grebas de diamante
Gold Boots=Botas de oro Gold Boots=Botas de oro
Gold Chestplate=Peto de oro Gold Chestplate=Peto de oro
Gold Helmet=Casco de oro Gold Helmet=Casco de oro
Gold Leggings=Polainas de oro Gold Leggings=Grebas de oro
Mithril Boots=Botas de mitrilo Mithril Boots=Botas de mitrilo
Mithril Chestplate=Peto de mitrilo Mithril Chestplate=Peto de mitrilo
Mithril Helmet=Casco de mitrilo Mithril Helmet=Casco de mitrilo
Mithril Leggings=Polainas de mitrilo Mithril Leggings=Grebas de mitrilo
Steel Boots=Botas de acero Steel Boots=Botas de acero
Steel Chestplate=Peto de acero Steel Chestplate=Peto de acero
Steel Helmet=Casco de acero Steel Helmet=Casco de acero
Steel Leggings=Polainas de acero Steel Leggings=Grebas de acero
Wood Boots=Botas de madera Wood Boots=Botas de madera
Wood Chestplate=Peto de madera Wood Chestplate=Peto de madera
Wood Helmet=Casco de madera Wood Helmet=Casco de madera
Wood Leggings=Polainas de madera Wood Leggings=Grebas de madera
### init.lua ### ### init.lua ###
@ -54,54 +54,5 @@ Heal=Salud
Level=Nivel Level=Nivel
Radiation=Radiación Radiation=Radiación
Your @1 got destroyed!=¡Tu @1 fue destruído! Your @1 got destroyed!=¡Tu @1 fue destruído!
Your @1 is almost broken!= Your @1 is almost broken!=¡Tu @1 esta a punto de romperse!
[3d_armor] Fire Nodes disabled=[3d_armor] Nodos de fuego desabilitados [3d_armor] Fire Nodes disabled=[3d_armor] Nodos de fuego desabilitados
##### not used anymore #####
3d_armor: Player inventory is nil @1=3d_armor: El inventario del jugador es nulo @1
3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mod cargado, pero sin ser usado.
Back=Volver
Armor=Armadura
3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mod cargado, pero sin ser usado.
Armor stand top=Parte arriba maniquí armadura
Armor stand=Maniquí para armadura
Armor Stand=Maniquí para armadura
Locked Armor stand=Maniquí para armadura (bloqueado)
Armor Stand (owned by @1)=Maniquí para armadura (propiedad de @1)
3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mod cargado, pero sin ser usado.
3d Armor=Armadura 3d
Armor not initialized!=¡Armadura no inicializada!
hazmat_suit: Mod loaded but unused.=hazmat_suit: Mod cargado, pero sin ser usado.
Hazmat Helmet=Casco de hazmat
Hazmat Chestplate=Peto de hazmat
Hazmat Sleeve=Manga de hazmat
Hazmat Leggins=Polainas de hazmat
Hazmat Boots=Botas de hazmat
Hazmat Suit=Traje de hazmat
Admin Shield=Escudo de admin
Wooden Shield=Escudo de madera
Enhanced Wood Shield=Escudo de madera mejorado
Cactus Shield=Escudo de cactus
Enhanced Cactus Shield=Escudo de cactus mejorado
Steel Shield=Escudo de acero
Bronze Shield=Escudo de bronce
Diamond Shield=Escudo de diamante
Gold Shield=Escudo de oro
Mithril Shield=Escudo de mitrilo
Crystal Shield=Escudo de cristal
technic_armor: Mod loaded but unused.=technic_armor: Mod cargado, pero no usado.
Lead=Plomo
Brass=Latón
Cast Iron=Hierro fundido
Carbon Steel=Acero carbono
Stainless Steel=Acero inoxidable
Tin=Estaño
Silver=Plata
Helmet=Casco
Chestplate=Peto
Leggins=Polainas
Boots=Botas
Shield=Escudo
@1 @2=@2 de @1

View file

@ -19,6 +19,7 @@ for _, color in pairs(bridger_colors) do
end end
local bridger_error1 = { local bridger_error1 = {
"block_",
"step_", "step_",
"suspension_top_", "suspension_top_",
"suspension_cable_", "suspension_cable_",

View file

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed ### Fixed
- [Fixed strange placement behavior for non-default Stairs+ nodes.](https://github.com/minetest-mods/moreblocks/pull/168)
- [Fixed stairs placement over oddly-shaped nodes.](https://github.com/minetest-mods/moreblocks/pull/166) - [Fixed stairs placement over oddly-shaped nodes.](https://github.com/minetest-mods/moreblocks/pull/166)
## [2.1.0] - 2020-12-14 ## [2.1.0] - 2020-12-14

View file

@ -30,16 +30,25 @@ local wall_right_dirmap = {9, 18, 7, 12}
local wall_left_dirmap = {11, 16, 5, 14} local wall_left_dirmap = {11, 16, 5, 14}
local ceil_dirmap = {20, 23, 22, 21} local ceil_dirmap = {20, 23, 22, 21}
-- extract the stairsplus category from a node name
-- assumes the name is in the form mod_name:category_original_ndoe_name
local function name_to_category(name)
local colon = name:find(":") or 0
colon = colon + 1
local under = name:find("_", colon)
return name:sub(colon, under)
end
stairsplus.rotate_node_aux = function(itemstack, placer, pointed_thing) stairsplus.rotate_node_aux = function(itemstack, placer, pointed_thing)
local sneak = placer and placer:get_player_control().sneak local sneak = placer and placer:get_player_control().sneak
local aux = placer and placer:get_player_control().aux1 local aux = placer and placer:get_player_control().aux1
-- namestring for what we are placing, up to the first _ (exclusive) -- category for what we are placing
local item_prefix = itemstack:get_name():gsub("_.*$", "") local item_prefix = name_to_category(itemstack:get_name())
-- namestring for what we are placing against -- category for what we are placing against
local under = pointed_thing.under local under = pointed_thing.under
local under_node = minetest.get_node(under) local under_node = minetest.get_node(under)
local under_prefix = under_node and under_node.name:gsub("_.*$", "") local under_prefix = under_node and name_to_category(under_node.name)
local same_cat = item_prefix == under_prefix local same_cat = item_prefix == under_prefix

View file

@ -25,7 +25,7 @@ function stairsplus:prepare_groups(groups)
local result = {} local result = {}
if groups then if groups then
for k, v in pairs(groups) do for k, v in pairs(groups) do
if k ~= "wood" and k ~= "stone" then if k ~= "wood" and k ~= "stone" and k ~= "wool" and k ~= "tree" then
result[k] = v result[k] = v
end end
end end

View file

@ -106,9 +106,6 @@ if minetest.get_modpath("wool") then
local ndef = table.copy(minetest.registered_nodes[nodename]) local ndef = table.copy(minetest.registered_nodes[nodename])
ndef.sunlight_propagates = true ndef.sunlight_propagates = true
-- Prevent dye+cut wool recipy from creating a full wool block.
ndef.groups.wool = nil
stairsplus:register_all(mod, name, nodename, ndef) stairsplus:register_all(mod, name, nodename, ndef)
end end
end end