Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

CHANGELOG.md

@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Legacy Stairs+ conversion code.
   - It was only required to import worlds last edited before Q3 2013.
 
+### Added
+
+- Compressed desert cobblestone.
+
 ## [2.0.0] - 2019-11-25
 
 ### Added

crafting.lua

@@ -512,6 +512,22 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "moreblocks:desert_cobble_compressed",
+	recipe = {
+		{"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"},
+		{"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"},
+		{"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:desert_cobble 9",
+	recipe = {
+		{"moreblocks:desert_cobble_compressed"},
+	}
+})
+
 minetest.register_craft({
 	type = "cooking", output = "moreblocks:tar", recipe = "default:pine_tree",
 })

locale/de.po

@@ -132,6 +132,10 @@ msgstr "Kohlesteinziegel"
 msgid "Compressed Cobblestone"
 msgstr "Gepresster Kopfsteinpflaster"
 
+#: nodes.lua
+msgid "Compressed Desert Cobblestone"
+msgstr ""
+
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr "Gepresste Erde"

locale/es.po

@@ -128,6 +128,10 @@ msgstr ""
 msgid "Compressed Cobblestone"
 msgstr ""
 
+#: nodes.lua
+msgid "Compressed Desert Cobblestone"
+msgstr ""
+
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr ""

locale/fr.po

@@ -133,6 +133,10 @@ msgstr "Briques en pierre de charbon"
 msgid "Compressed Cobblestone"
 msgstr "Pierre taillée compressée"
 
+#: nodes.lua
+msgid "Compressed Desert Cobblestone"
+msgstr ""
+
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr "Terre compressée"

locale/it.po

@@ -132,6 +132,10 @@ msgstr "Mattoni di pietra in carbone"
 msgid "Compressed Cobblestone"
 msgstr ""
 
+#: nodes.lua
+msgid "Compressed Desert Cobblestone"
+msgstr ""
+
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr ""

locale/pl.po

@@ -132,6 +132,10 @@ msgstr "Węglowe kamienne cegły"
 msgid "Compressed Cobblestone"
 msgstr "Skompresowany bruk"
 
+#: nodes.lua
+msgid "Compressed Desert Cobblestone"
+msgstr ""
+
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr "Skompresowana ziemia"

locale/ru.po

@@ -133,6 +133,10 @@ msgstr "угольно-каменный кирпич"
 msgid "Compressed Cobblestone"
 msgstr "прессованный булыжник"
 
+#: nodes.lua
+msgid "Compressed Desert Cobblestone"
+msgstr ""
+
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr "прессованная земля"

locale/template.pot

@@ -127,6 +127,10 @@ msgstr ""
 msgid "Compressed Cobblestone"
 msgstr ""
 
+#: nodes.lua
+msgid "Compressed Desert Cobblestone"
+msgstr ""
+
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr ""

mod.conf

@@ -2,3 +2,4 @@ name = moreblocks
 description = Adds various miscellaneous blocks to the game.
 depends = default
 optional_depends = intllib,stairs,farming,wool,basic_materials
+min_minetest_version = 5.0.0

nodes.lua

@@ -175,6 +175,12 @@ local nodes = {
 		is_ground_content = false,
 		sounds = sound_stone,
 	},
+	["desert_cobble_compressed"] = {
+		description = S("Compressed Desert Cobblestone"),
+		groups = {cracky = 1},
+		is_ground_content = false,
+		sounds = sound_stone,
+	},
 	["plankstone"] = {
 		description = S("Plankstone"),
 		paramtype2 = "facedir",

settingtypes.txt

@@ -1,2 +1,3 @@
 # If enabled, Stairs+ nodes will be displayed in the inventory when playing in creative mode.
+# Disabling this can speed up loading times for clients as fewer nodes need to be registered in the creative inventory.
 moreblocks.stairsplus_in_creative_inventory (Display Stairs+ nodes in creative inventory) bool true