From 731fd3a389b39b0193f2dc67a5c567b6b72bb202 Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Wed, 7 Nov 2018 17:27:30 -0500
Subject: [PATCH] change recipe for wet cement:  flour + dirt + water (also
 resolves an unrealized recipe conflict)

add concrete block
---
 misc.lua                                    |  34 +++++++++++++++-----
 textures/basic_materials_cement_block.png   | Bin 344 -> 243 bytes
 textures/basic_materials_concrete_block.png | Bin 0 -> 252 bytes
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 textures/basic_materials_concrete_block.png

diff --git a/misc.lua b/misc.lua
index 4663a39..8df6b19 100644
--- a/misc.lua
+++ b/misc.lua
@@ -30,6 +30,13 @@ minetest.register_node("basic_materials:cement_block", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("basic_materials:concrete_block", {
+	description = "Concrete Block",
+	tiles = {"basic_materials_concrete_block.png",},
+	groups = {cracky=1, level=2, concrete=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
 -- crafts
 
 minetest.register_craft({
@@ -65,12 +72,12 @@ minetest.register_craft({
 
 minetest.register_craft( {
 	type = "shapeless",
-        output = "basic_materials:terracotta_base 8",
-        recipe = {
-		"default:dirt",
+	output = "basic_materials:terracotta_base 8",
+	recipe = {
+		"bucket:bucket_water",
 		"default:clay_lump",
-		"bucket:bucket_water"
-        },
+		"default:gravel",
+	},
 	replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, },
 })
 
@@ -78,9 +85,9 @@ minetest.register_craft({
 	type = "shapeless",
 	output = "basic_materials:wet_cement 2",
 	recipe = {
-		"bucket:bucket_water",
-		"default:clay_lump",
-		"default:gravel",
+		"default:dirt",
+		"farming:flour",
+		"bucket:bucket_water"
 	},
 	replacements = {{'bucket:bucket_water', 'bucket:bucket_empty'},},
 })
@@ -92,6 +99,15 @@ minetest.register_craft({
 	cooktime = 8
 })
 
+minetest.register_craft({
+	output = 'basic_materials:concrete_block 6',
+	recipe = {
+		{'group:sand',                'basic_materials:wet_cement', 'default:gravel'},
+		{'basic_materials:steel_bar', 'basic_materials:wet_cement', 'basic_materials:steel_bar'},
+		{'default:gravel',            'basic_materials:wet_cement', 'group:sand'},
+	}
+})
+
 -- aliases
 
 minetest.register_alias("homedecor:oil_extract",      "basic_materials:oil_extract")
@@ -101,3 +117,5 @@ minetest.register_alias("homedecor:terracotta_base",  "basic_materials:terracott
 
 minetest.register_alias("gloopblocks:wet_cement",     "basic_materials:wet_cement")
 minetest.register_alias("gloopblocks:cement",         "basic_materials:cement_block")
+
+minetest.register_alias("technic:concrete",           "basic_materials:concrete_block")
diff --git a/textures/basic_materials_cement_block.png b/textures/basic_materials_cement_block.png
index c4c6a1191f17f8e59f893403607cee411e311ab0..6d30f477f359e93a71112578baace525ce0f0fdc 100644
GIT binary patch
delta 227
zcmcb?^qFyjL_G^L0|Ud`yN`l^ltF+`h-+R(QbAU7QFdxcZhC26MtMP2MPYVjQBGBH
zZgojsO=*5@SwUTSVSPnWLuGMOb%|U1-DyC*b)GJcAsp9}Cs+j<y1%=3Q;DrvRy+96
zyFdF*Es*$YlY92$<7i2X>Fzowe_BRPbu_4-`RAReV`2=Co1m=HO!X<El4r8Fv7TS&
zW0)u~-*k8By_K)m@qBJbYdDj{Fq6@!n=ys$gbv#TNrlZ44p;;ktS{KBC%J450Xl`j
M)78&qol`;+043L1!T<mO

delta 329
zcmV-P0k;100oVeN7=H)@0000eEe}%w0037|OjJc{XJLDHacya1cyw-eb8T#BVtI9M
za&BmFY-W0PaCUKPfqZsvYh`X~WOHw6b#ZHZc5rrbY;kR8dUbDia%_Kkba`}cbZ}~b
zdv$zwaejGocyn!icyfP_Rh9q%0K7>=K~xyi1;K{_gdh+Auz!0MP<rRu{&Ri;T-Ddl
zUCF%mr#NA)y_z}kl=8961;V2}G3W2Adn!*5zrHuMcQVe|TZX#|{+tO!^~tGp$Q#Kv
z=yU72QZi78g3gjHNj)c8IHWr0E_P|<`)nACm-6$bPq*x$umv>`A7_4dRT)6YV@*2m
zRW#^8@B^v3w?bTYOhF7Vq>iVT7EN1Q1p$$Rw4QQI$Ez>|_WtRoyW`rHt+2MA)N_wL
b$0m#a9)S^`=wn3B00000NkvXXu0mjf5I~fn

diff --git a/textures/basic_materials_concrete_block.png b/textures/basic_materials_concrete_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dd0d660a238c6ca7f0274f260f9afb320b77277
GIT binary patch
literal 252
zcmV<Y00aMtP)<h;3K|Lk000e1NJLTq000mG000mK0{{R3?cL&10000mP)t-spqi7V
zo|mVgnyaLpt)`!@r=YN@qOq!@va6)Dt){lGsJF1Gxw5Oev#h+euEf2y&Z9c00001o
zNkl<Z2-jnfj<iXYoYK+65MH|Tblc|Xvlyn&nY-rh_A56T!ZOyp-upVIiXqZGrT^^N
zMSB^7L#?Av&8#eAFta=yvOA-#iorB;M(aA8z1<9!uANQMK(iP?W`N9M0GR<YiveT?
z$Seks86dM5PR)!g1DVADGQ-UBhzmm;&<xXvjurqM(?aq@b(H}C0000<MNUMnLSTaM
Cx^e3O

literal 0
HcmV?d00001