From befe3ecc86f046310ec0a5c24f82acea2ad13d9d Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Wed, 27 May 2020 18:32:57 +0200
Subject: [PATCH] Fix incorrect numeric types for 5.3.0-dev
---
technic_cnc/cnc_materials.lua | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/technic_cnc/cnc_materials.lua b/technic_cnc/cnc_materials.lua
index b029659..e63c792 100644
--- a/technic_cnc/cnc_materials.lua
+++ b/technic_cnc/cnc_materials.lua
@@ -7,8 +7,14 @@
-------
technic_cnc.register_all("default:dirt",
{snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
- {"default_grass.png", "default_dirt.png", "default_grass.png"},
+ {"default_dirt.png"},
S("Dirt"))
+-- (DIRT WITH) GRASS
+--------------------
+technic_cnc.register_all("default:dirt_with_grass",
+ {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
+ {"default_grass.png"},
+ S("Grassy dirt"))
-- WOOD
-------
technic_cnc.register_all("default:wood",
@@ -89,6 +95,14 @@
{cracky=1, not_in_creative_inventory=1},
{"technic_granite.png"},
S("Granite"))
+
+ -- Blast-resistant concrete
+ ---------------------------
+
+ technic_cnc.register_all("technic:blast_resistant_concrete",
+ {cracky=2, level=2, not_in_creative_inventory=1},
+ {"technic_blast_resistant_concrete_block.png"},
+ S("Blast-resistant concrete"))
end
-- STEEL
@@ -97,3 +111,21 @@
{cracky=1, level=2, not_in_creative_inventory=1},
{steeltex},
S(steelname))
+
+-- CONCRETE AND CEMENT
+----------------------
+
+technic_cnc.register_all("basic_materials:concrete_block",
+ {cracky=2, level=2, not_in_creative_inventory=1},
+ {"basic_materials_concrete_block.png"},
+ S("Concrete"))
+
+technic_cnc.register_all("basic_materials:cement_block",
+ {cracky=2, level=2, not_in_creative_inventory=1},
+ {"basic_materials_cement_block.png"},
+ S("Cement"))
+
+technic_cnc.register_all("basic_materials:brass_block",
+ {cracky=1, level=2, not_in_creative_inventory=1},
+ {"basic_materials_brass_block.png"},
+ S("Brass block"))
--
Gitblit v1.8.0