update bakedclay, basic_materials, bonemeal, currency, farming_redo,

maptools, mesecons, moreblocks, moreores, new_campfire, cool_trees, pipeworks, staines_glass, technic, unified_inventory, and unifieddyes.
mt-mods · Jul 12, 2020 · 2c901a7 · 2c901a7
1 parent 656cb25
commit 2c901a7
Show file tree

Hide file tree

Showing 231 changed files with 2,303 additions and 1,551 deletions.
diff --git a/bakedclay/README.md b/bakedclay/README.md
@@ -18,3 +18,6 @@ Changelog:
 - 0.1 - Initial Release
 
 Lucky Blocks: 9
+
+
+Note: Under settings you will find 'colored_clay_compatibility' switch that when enabled will register aliases for the older colored clay mod and it's stairplus stairs.
diff --git a/bakedclay/init.lua b/bakedclay/init.lua
@@ -300,4 +300,43 @@ lucky_block:add_blocks({
 })
 end
 
+
+-- colored clay compatibility
+if minetest.settings:get_bool("colored_clay_compatibility") == true then
+
+local cc = {
+	{"black", "black"},
+	{"blue", "blue"},
+	{"bright", "natural"},
+	{"brown", "brown"},
+	{"cyan", "cyan"},
+	{"dark_green", "dark_green"},
+	{"dark_grey", "dark_grey"},
+	{"green", "green"},
+	{"grey", "grey"},
+	{"hardened", "natural"},
+	{"magenta", "magenta"},
+	{"orange", "orange"},
+	{"pink", "pink"},
+	{"red", "red"},
+	{"violet", "violet"},
+	{"white", "white"},
+	{"yellow", "yellow"}
+}
+
+for n = 1, #cc do
+
+	local nod1 = "colored_clay:" .. cc[n][1]
+	local nod2 = "bakedclay:" .. cc[n][2]
+
+	minetest.register_alias(nod1, nod2)
+
+	if stairsplus_mod then
+		stairsplus:register_alias_all("colored_clay", cc[n][1], "bakedclay", cc[n][2])
+	end
+end
+
+end
+
+
 print ("[MOD] Baked Clay loaded")
diff --git a/bakedclay/settingtypes.txt b/bakedclay/settingtypes.txt
@@ -0,0 +1,2 @@
+#    Registers compatibility aliases with the older colored_clay mod
+colored_clay_compatibility (Colored Clay Compatibility) bool false
diff --git a/basic_materials/.luacheckrc b/basic_materials/.luacheckrc
@@ -0,0 +1,30 @@
+std = "lua51+minetest"
+unused_args = false
+allow_defined_top = true
+max_line_length = 999
+
+stds.minetest = {
+	read_globals = {
+		"DIR_DELIM",
+		"minetest",
+		"core",
+		"dump",
+		"vector",
+		"nodeupdate",
+		"VoxelManip",
+		"VoxelArea",
+		"PseudoRandom",
+		"ItemStack",
+		"default",
+		table = {
+			fields = {
+				"copy",
+			},
+		},
+	}
+}
+
+read_globals = {
+	"default",
+	"moreores",
+}
diff --git a/basic_materials/init.lua b/basic_materials/init.lua
@@ -7,6 +7,7 @@
 local modpath = minetest.get_modpath("basic_materials")
 
 basic_materials = {}
+basic_materials.mod = { author = "Vanessa Dannenberg" }
 
 dofile(modpath.."/metals.lua")
 dofile(modpath.."/plastics.lua")

diff --git a/basic_materials/metals.lua b/basic_materials/metals.lua
@@ -5,31 +5,37 @@ local S = minetest.get_translator("basic_materials")
 
 minetest.register_craftitem("basic_materials:steel_wire", {
 	description = S("Spool of steel wire"),
+	groups = { wire = 1 },
 	inventory_image = "basic_materials_steel_wire.png"
 })
 
 minetest.register_craftitem("basic_materials:copper_wire", {
 	description = S("Spool of copper wire"),
+	groups = { wire = 1 },
 	inventory_image = "basic_materials_copper_wire.png"
 })
 
 minetest.register_craftitem("basic_materials:silver_wire", {
 	description = S("Spool of silver wire"),
+	groups = { wire = 1 },
 	inventory_image = "basic_materials_silver_wire.png"
 })
 
 minetest.register_craftitem("basic_materials:gold_wire", {
 	description = S("Spool of gold wire"),
+	groups = { wire = 1 },
 	inventory_image = "basic_materials_gold_wire.png"
 })
 
 minetest.register_craftitem("basic_materials:steel_strip", {
 	description = S("Steel Strip"),
+	groups = { strip = 1 },
 	inventory_image = "basic_materials_steel_strip.png"
 })
 
 minetest.register_craftitem("basic_materials:copper_strip", {
 	description = S("Copper Strip"),
+	groups = { strip = 1 },
 	inventory_image = "basic_materials_copper_strip.png"
 })
 
@@ -40,11 +46,13 @@ minetest.register_craftitem("basic_materials:steel_bar", {
 
 minetest.register_craftitem("basic_materials:chainlink_brass", {
 	description = S("Chainlinks (brass)"),
+	groups = { chainlinks = 1 },
 	inventory_image = "basic_materials_chainlink_brass.png"
 })
 
 minetest.register_craftitem("basic_materials:chainlink_steel", {
 	description = S("Chainlinks (steel)"),
+	groups = { chainlinks = 1 },
 	inventory_image = "basic_materials_chainlink_steel.png"
 })
 
@@ -70,14 +78,6 @@ local chains_sbox = {
 	fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 }
 }
 
-local topchains_sbox = {
-	type = "fixed",
-	fixed = {
-		{ -0.25, 0.35, -0.25, 0.25, 0.5, 0.25 },
-		{ -0.1, -0.5, -0.1, 0.1, 0.4, 0.1 }
-	}
-}
-
 minetest.register_node("basic_materials:chain_steel", {
 	description = S("Chain (steel, hanging)"),
 	drawtype = "mesh",

diff --git a/basic_materials/plastics.lua b/basic_materials/plastics.lua
@@ -10,6 +10,7 @@ minetest.register_craftitem("basic_materials:plastic_sheet", {
 
 minetest.register_craftitem("basic_materials:plastic_strip", {
 	description = S("Plastic strips"),
+	groups = { strip = 1 },
 	inventory_image = "basic_materials_plastic_strip.png",
 })
 

diff --git a/bonemeal/init.lua b/bonemeal/init.lua
@@ -6,7 +6,8 @@ local min, max, random = math.min, math.max, math.random
 
 
 -- Load support for intllib.
-local S, NS = dofile(path .. "/intllib.lua")
+local S = minetest.get_translator and minetest.get_translator("bonemeal") or
+		dofile(path .. "/intllib.lua")
 
 
 -- creative check

diff --git a/bonemeal/locale/bonemeal.es.tr b/bonemeal/locale/bonemeal.es.tr
@@ -0,0 +1,6 @@
+# textdomain: bonemeal
+Mulch=Mantillo
+Bone Meal=Comida de hueso
+Fertiliser=Fertilizante
+Bone=Hueso
+[MOD] bonemeal loaded=[MOD] bonemeal cargado
diff --git a/bonemeal/locale/bonemeal.fr.tr b/bonemeal/locale/bonemeal.fr.tr
@@ -0,0 +1,6 @@
+# textdomain: beds
+Mulch=Paillis
+Bone Meal=Poudre d'os
+Fertiliser=Engrais
+Bone=Os
+[MOD] bonemeal loaded=[MOD] bonemeal chargé
diff --git a/bonemeal/locale/bonemeal.it.tr b/bonemeal/locale/bonemeal.it.tr
@@ -0,0 +1,6 @@
+# textdomain: bonemeal
+Mulch=Pacciame
+Bone Meal=Pasto osseo
+Fertiliser=Fertilizzante
+Bone=Ossa
+[MOD] bonemeal loaded=[MOD] bonemeal caricata
diff --git a/bonemeal/locale/bonemeal.ru.tr b/bonemeal/locale/bonemeal.ru.tr
@@ -0,0 +1,6 @@
+# textdomain: bonemeal
+Mulch=Мульча
+Bone Meal=Костная Мука
+Fertiliser=Удобрение
+Bone=Кость
+[MOD] bonemeal loaded=[MOD] костная мука загружена
diff --git a/bonemeal/locale/es.txt b/bonemeal/locale/es.txt
@@ -0,0 +1,7 @@
+# init.lua
+
+Mulch = Mantillo
+Bone Meal = Comida de hueso
+Fertiliser = Fertilizante
+Bone = Hueso
+[MOD] bonemeal loaded = [MOD] bonemeal cargado
diff --git a/bonemeal/locale/it.txt b/bonemeal/locale/it.txt
@@ -0,0 +1,7 @@
+# init.lua
+
+Mulch = Pacciame
+Bone Meal = Pasto osseo
+Fertiliser = Fertilizzante
+Bone = Ossa
+[MOD] bonemeal loaded = [MOD] bonemeal caricata
diff --git a/bonemeal/locale/template.tr b/bonemeal/locale/template.tr
@@ -0,0 +1,6 @@
+# textdomain: bonemeal
+Mulch =
+Bone Meal =
+Fertiliser =
+Bone =
+[MOD] bonemeal loaded =
diff --git a/bonemeal/locale/template.txt b/bonemeal/locale/template.txt
@@ -1,7 +1,7 @@
 # init.lua
 
-Mulch = 
-Bone Meal = 
-Fertiliser = 
-Bone = 
-[bonemeal] loaded = 
+Mulch =
+Bone Meal =
+Fertiliser =
+Bone =
+[MOD] bonemeal loaded =
diff --git a/bonemeal/mods.lua b/bonemeal/mods.lua
@@ -39,7 +39,8 @@ if farming and farming.mod and farming.mod == "redo" then
 		{"farming:rye_", 8},
 		{"farming:oat_", 8},
 		{"farming:rice_", 8},
-		{"farming:mint_", 4}
+		{"farming:mint_", 4},
+		{"farming:cabbage_", 6}
 	})
 end
 

diff --git a/currency/locale/currency.de.tr b/currency/locale/currency.de.tr
@@ -15,7 +15,7 @@ Exchange=Tausch
 ### craftitems.lua ###
 
 @1 Minegeld Note=@1 Minegeld Banknote
-@1 Minegeld cent coin=
+@1 Minegeld cent coin=@1 Cent MünzeM
 Bundle of random Minegeld notes=Bündel von verschiedenen Minegeld Banknoten
 
 ### safe.lua ###

diff --git a/currency/locale/currency.it.tr b/currency/locale/currency.it.tr
@@ -0,0 +1,45 @@
+# textdomain: currency
+# Hamlet, 2020
+
+
+### barter.lua ###
+
+Barter Table=Tavolo di baratto
+Cancel=Annulla
+Confirm=Conferma
+Start=Inizia
+
+### shop.lua ###
+
+Exchange=Scambia
+
+### craftitems.lua ###
+
+@1 Minegeld Note=@ biglietto Minegeld
+@1 Minegeld cent coin=@ moneta di centesimo Minegeld
+Bundle of random Minegeld notes=Pacchetto di biglietti Minegeld casuali
+
+### safe.lua ###
+
+Safe=Cassaforte
+Safe (owned by @1)=Cassaforte (di proprietà di @1)
+
+### shop.lua ###
+
+Customer gets:=Il cliente ottiene:
+Customer gives (pay here!)=Il cliente dà (paga qui!)
+Customers gave:=I clienti hanno dato:
+Exchange can not be done, check if you put all items!=Lo scambio non può essere fatto, controlla di avere messo tutti gli oggetti!
+Exchange can not be done, contact the shop owner.=Lo scambio non può essere fatto, contatta il proprietario del negozio.
+Exchange shop (owned by @1)=Negozio di scambio (di proprietà di @1)
+Exchanged!=Scambiato!
+In exchange, you give:=In cambio, tu dai:
+Owner gives:=Il proprietario dà:
+Owner wants:=Il proprietario vuole:
+
+Owner, Use (E)+Place (right mouse button) for customer interface=Proprietario, usa (E)+Posiziona (pulsante destro del mouse) per l'interfaccia cliente
+
+Shop=Negozio
+This is your own shop, you can't exchange to yourself!=Questo è il tuo negozio, non puoi fare scambi con te stesso!
+You want:=Tu vuoi:
+Your stock:=La tua scorta:
diff --git a/farming/README.md b/farming/README.md
@@ -13,7 +13,8 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
 
 ### Changelog:
 
-- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base options, onion soup added (thanks edcrypt)
+- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy
+options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton to savanna
 - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates
 - 1.43 - Scythe works on use instead of right-click, added seed=1 groups to actual seeds and seed=2 group for plantable food items.
 - 1.42 - Soil needs water to be present within 3 blocks horizontally and 1 below to make wet soil, Jack 'o Lanterns now check protection, add chocolate block.

diff --git a/farming/compatibility.lua b/farming/compatibility.lua
@@ -12,13 +12,13 @@ end
 
 minetest.override_item("default:apple", {
 	groups = {food_apple = 1, fleshy = 3, dig_immediate = 3, flammable = 2,
-		leafdecay = 3, leafdecay_drop = 1},
+		leafdecay = 3, leafdecay_drop = 1}
 })
 
 if minetest.registered_nodes["flowers:mushroom_brown"] then
 minetest.override_item("flowers:mushroom_brown", {
 	light_source = 1,
-	groups = {food_mushroom = 1, snappy = 3, attached_node = 1, flammable = 2},
+	groups = {food_mushroom = 1, snappy = 3, attached_node = 1, flammable = 2}
 })
 end
 
@@ -45,7 +45,7 @@ else
 		},
 		groups = {food_banana = 1, fleshy = 3, dig_immediate = 3, flammable = 2},
 		on_use = minetest.item_eat(2),
-		sounds = default.node_sound_leaves_defaults(),
+		sounds = default.node_sound_leaves_defaults()
 	})
 
 	minetest.register_node(":ethereal:bananaleaves", {
@@ -56,7 +56,7 @@ else
 		paramtype = "light",
 		waving = 1,
 		groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
-		sounds = default.node_sound_leaves_defaults(),
+		sounds = default.node_sound_leaves_defaults()
 	})
 
 	alias("farming_plus:banana_sapling", "default:sapling")
@@ -103,7 +103,7 @@ else
 		},
 		groups = {food_orange = 1, fleshy = 3, dig_immediate = 3, flammable = 2},
 		on_use = minetest.item_eat(4),
-		sounds = default.node_sound_leaves_defaults(),
+		sounds = default.node_sound_leaves_defaults()
 	})
 
 	alias("farming_plus:orange_item", "ethereal:orange")
@@ -151,7 +151,7 @@ else
 		inventory_image = "strawberry.png",
 		wield_image = "strawberry.png",
 		groups = {food_strawberry = 1, flammable = 2},
-		on_use = minetest.item_eat(1),
+		on_use = minetest.item_eat(1)
 	})
 
 	alias("farming_plus:strawberry_item", "ethereal:strawberry")