diff --git a/.gitignore b/.gitignore index 227a256d..42b9069a 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,10 @@ pip-log.txt #gedit backup files *~ +################# +## IntelliJ Idea +################# + +#Project files +.idea + diff --git a/technic/crafts.lua b/technic/crafts.lua index d7a1a25d..2148ea89 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -182,7 +182,7 @@ core.register_craft({ type = "shapeless", replacements = {{mat.bucket_water,mat.bucket_empty}}, recipe = { - "technic:stone_dust", + "technic:silt", "group:leaves", mat.bucket_water, "group:sand", diff --git a/technic/locale/template.txt b/technic/locale/template.txt index 505b3e7c..cc0a730e 100644 --- a/technic/locale/template.txt +++ b/technic/locale/template.txt @@ -206,3 +206,4 @@ Wind Mill Frame= Wrought Iron= You are not allowed to edit this!= Zinc= +Silt= diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 7d7e5825..82ba5bc8 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -25,10 +25,10 @@ local recipes = { {"technic:zinc_lump", "technic:zinc_dust 2"}, {"technic:lead_lump", "technic:lead_dust 2"}, {"technic:sulfur_lump", "technic:sulfur_dust 2"}, - {mat.stone, "technic:stone_dust"}, - {mat.sand, "technic:stone_dust"}, - {mat.desert_sand, "technic:stone_dust"}, - {mat.silver_sand, "technic:stone_dust"}, + {mat.stone, "technic:silt"}, + {mat.sand, "technic:silt"}, + {mat.desert_sand, "technic:silt"}, + {mat.silver_sand, "technic:silt"}, -- Other {mat.cobble, mat.gravel}, @@ -119,7 +119,6 @@ register_dust("Gold", mat.gold_ingot) register_dust("Mithril", mat.mithril_ingot) register_dust("Silver", mat.silver_ingot) register_dust("Stainless Steel", "technic:stainless_steel_ingot") -register_dust("Stone", mat.stone) register_dust("Sulfur", nil) register_dust("Tin", mat.tin_ingot) register_dust("Wrought Iron", "technic:wrought_iron_ingot") diff --git a/technic/textures/technic_silt.png b/technic/textures/technic_silt.png new file mode 100644 index 00000000..44bad668 Binary files /dev/null and b/technic/textures/technic_silt.png differ diff --git a/technic_worldgen/nodes.lua b/technic_worldgen/nodes.lua index 8b422feb..7e148f4b 100644 --- a/technic_worldgen/nodes.lua +++ b/technic_worldgen/nodes.lua @@ -104,6 +104,24 @@ else }) end +core.register_node(":technic:silt", { + description = S("Silt"), + groups = { + falling_node = 1, -- common + crumbly = 3, -- minetest game + handy = 1, shovely = 1, enderman_takable = 1, building_block = 1 -- mineclon* + }, + is_ground_content = true, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, + drawtype = "allfaces", + tiles = {"technic_silt.png"}, + sounds = technic.sounds.node_sound_sand_defaults(), + _tnt_loss = 2, +}) + +core.register_alias("technic:stone_dust", "technic:silt") + core.register_node(":technic:uranium_block", { description = S("Uranium Block"), tiles = {"technic_uranium_block.png"},