diff --git a/bag.lua b/bag.lua new file mode 100644 index 0000000..e25a77b --- /dev/null +++ b/bag.lua @@ -0,0 +1,51 @@ + +local S = cannabis.S +local path = cannabis.path +-- register bag tools +if minetest.get_modpath("unified_inventory") ~= nil then +minetest.register_tool("cannabis:bag_bob_small", { + description = S("Small Bob Bag"), + inventory_image = "bags_bob_small.png", + groups = {bagslots=8}, +}) + +minetest.register_tool("cannabis:bag_bob_medium", { + description = S("Medium Bob Bag"), + inventory_image = "bags_bob_medium.png", + groups = {bagslots=16}, +}) + +minetest.register_tool("cannabis:bag_bob_large", { + description = S("Large Bob Bag"), + inventory_image = "bags_bob_large.png", + groups = {bagslots=24}, +}) +end +-- register bag crafts +--if minetest.get_modpath("farming") ~= nil then + minetest.register_craft({ + output = "cannabis:bag_bob_small", + recipe = { + {"", "cannabis:canapa_fiber", ""}, + {"cannabis:canapa_cloth", "cannabis:canapa_cloth", "cannabis:canapa_cloth"}, + {"cannabis:canapa_cloth", "cannabis:canapa_cloth", "cannabis:canapa_cloth"}, + }, + }) + + minetest.register_craft({ + output = "cannabis:bag_bob_medium", + recipe = { + {"", "", ""}, + {"cannabis:canapa_fiber", "cannabis:bag_small", "cannabis:canapa_fiber"}, + {"cannabis:canapa_fiber", "cannabis:bag_small", "cannabis:canapa_fiber"}, + }, + }) + + minetest.register_craft({ + output = "cannabis:bag_bob_large", + recipe = { + {"", "", ""}, + {"cannabis:cannabis_tessuto_block", "cannabis:bag_medium", "cannabis:cannabis_tessuto_block"}, + {"cannabis:cannabis_tessuto_block", "cannabis:bag_medium", "cannabis:cannabis_tessuto_block"}, + }, + }) diff --git a/canapa.lua b/canapa.lua index f2ef1cd..78930e8 100644 --- a/canapa.lua +++ b/canapa.lua @@ -226,11 +226,13 @@ minetest.register_node('cannabis:flowering', { drawtype = 'plantlike', waving = 1, tiles = { 'cannabis_canapa_flower.png' }, - inventory_image = 'cannabis_canapa_flower.png', - wield_image = 'cannabis_canapa_flower.png', sunlight_propagates = true, paramtype = 'light', walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} + }, groups = { snappy = 3, poisonivy=1, flora_block=1 }, sounds = "cannabis_canapa_s3", buildable_to = true, diff --git a/canapa_ice.lua b/canapa_ice.lua new file mode 100644 index 0000000..42e1d48 --- /dev/null +++ b/canapa_ice.lua @@ -0,0 +1,198 @@ +-- get Boilerplate for Translations +local S = cannabis.S +local path = cannabis.path + +minetest.register_node("cannabis:canapa_ice", { + description = S("Hemp ice"), + drawtype = "plantlike", + tiles = {"cannabis_canapa_ice.png"}, + inventory_image = "cannabis_canapa_ice.png", + wield_image = "cannabis_canapa_ice.png", + paramtype = "light", + sunlight_propagates = true, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} + }, + groups = {snappy = 3, flammable = 2}, + sounds = "cannabis_canapa_s", + drop = { + max_items = 3, + items = { + {items = {"cannabis:canapa_ice"}, rarity = 1 }, + {items = {"cannabis:canapa_ice_leaves"}, rarity = 1 }, + --{items = {"cannabis:canapa_ice_seed"}, rarity = 1 }, + } +}, + after_dig_node = function(pos, node, metadata, digger) + default.dig_up(pos, node, digger) + end, +}) +--____________________________________ + +--___________________________________ +--function + + +function minetest.grow_canapa_ice(pos, node) + pos.y = pos.y - 1 + local name = minetest.get_node(pos).name + if name ~= "default:sand" + and name ~= "default:silver_sand" + and name ~= "default:dirt_with_snow" + and name ~= "default:permafrost_with_moss" + and name ~= "default:dirt" + and name ~= "default:dirt_with_coniferous_litter" then + return + end + if not minetest.find_node_near(pos, 5, {"default:snow"}) then + return + end + pos.y = pos.y + 1 + local height = 0 + while node.name == "cannabis:canapa_ice" and height < 6 do + height = height + 1 + pos.y = pos.y + 1 + node = minetest.get_node(pos) + end + if height==6 then + minetest.set_node(pos, {name = "cannabis:flowering_ice"}) + else + if height == 6 or node.name ~= "air" then + return + end + minetest.set_node(pos, {name = "cannabis:canapa_ice"}) + return true +end +end +--mapgen +minetest.register_abm({ + label = "Grow canapa ice", + nodenames = {"cannabis:canapa_ice"}, + neighbors ={ "default:silver_sand", + "default:dirt", + "default:sand", + "default:dirt_with_snow", + "default:dirt_with_coniferous_litter", + "default:permafrost_with_moss",}, + interval = 2, + chance = 10, + action = function(...) + minetest.grow_canapa_ice(...) + end +}) +--___________________________________________________________ +if minetest.get_modpath("default") then + + + minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:silver_sand", + "default:dirt", + "default:sand", + "default:dirt_with_snow", + "default:dirt_with_coniferous_litter", + "default:permafrost_with_moss", + }, + sidelen = 16, + noise_params = { + offset = -0.3, + scale = 0.7, + spread = {x = 100, y =100, z =100}, + seed = 354, + octaves = 1, + persist = 1 + }, + biomes = { + "taiga", + "coniferous_forest", + "tundra", + "snowy_grassland", + "cold_desert", + "tundra_beach", + "delicious_forest_shore", + "floatland_coniferous_forest"}, + y_min = 6, + y_max = 31000, + decoration = "cannabis:canapa_ice", + height = 2, + height_max = 7, + spawn_by ="default:snow", + num_spawn_by = 1, + }) + + + + +end +minetest.register_node('cannabis:seedling_i', { + description = S("Hemp ice(seedling)"), + drawtype = 'plantlike', + waving = 1, + tiles = { '1hemp_seedling_ice.png' }, + inventory_image = '1hemp_seedling_ice.png', + wield_image = '1hemp_seedling_ice.png', + sunlight_propagates = true, + paramtype = 'light', + walkable = false, + groups = { snappy = 3, poisonivy=1, flora_block=1 }, + sounds = "cannabis_canapa_s3", + buildable_to = true, +}) + +minetest.register_node('cannabis:sproutling_i', { + description = S("Hemp ice (sproutling)"), + drawtype = 'plantlike', + waving = 1, + tiles = { 'hemp_sproutling_ice.png' }, + inventory_image = 'hemp_sproutling_ice.png', + wield_image = 'hemp_sproutling_ice.png', + sunlight_propagates = true, + paramtype = 'light', + walkable = false, + groups = { snappy = 3, poisonivy=1, flora_block=1 }, + sounds = "cannabis_canapa_s3", + buildable_to = true, +}) + +minetest.register_node('cannabis:climbing_i', { + description = S("Hemp ice (climbing plant)"), + drawtype = 'signlike', + tiles = { 'hemp_climbing_ice.png' }, + inventory_image = 'hemp_climbing_ice.png', + wield_image = 'hemp_climbing_ice.png', + sunlight_propagates = true, + paramtype = 'light', + paramtype2 = 'wallmounted', + walkable = false, + groups = { snappy = 3, poisonivy=1, flora_block=1 }, + sounds = "cannabis_canapa_s3", + selection_box = { + type = "wallmounted", + --wall_side = = + }, + buildable_to = true, +}) +minetest.register_node('cannabis:flowering_ice', { + description = S("Hemp (Ice flowering)"), + drawtype = 'plantlike', + waving = 1, + tiles = { 'cannabis_canapa_ice_flower.png' }, + sunlight_propagates = true, + paramtype = 'light', + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} + }, + groups = { snappy = 3, poisonivy=1, flora_block=1 }, + sounds = "cannabis_canapa_s3", + buildable_to = true, + drop = { + max_items = 3, + items = { + {items = {"cannabis:canapa_ice_flower"}, rarity = 1 }, + {items = {"cannabis:canapa_ice_seed"}, rarity = 1 }, + }} +}) diff --git a/canapa_rossa.lua b/canapa_red.lua similarity index 97% rename from canapa_rossa.lua rename to canapa_red.lua index e2b4ac4..f3198cf 100644 --- a/canapa_rossa.lua +++ b/canapa_red.lua @@ -243,18 +243,20 @@ minetest.register_node('cannabis:flowering_red', { drawtype = 'plantlike', waving = 1, tiles = { 'cannabis_canapa_red_flower.png' }, - inventory_image = 'cannabis_canapa_red_flower.png', - wield_image = 'cannabis_canapa_red_flower.png', sunlight_propagates = true, paramtype = 'light', walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} + }, groups = { snappy = 3, poisonivy=1, flora_block=1 }, sounds = "cannabis_canapa_s3", buildable_to = true, drop = { max_items = 3, items = { - {items = {"cannabis:canapa_flower"}, rarity = 1 }, + {items = {"cannabis:canapa_red_flower"}, rarity = 1 }, {items = {"cannabis:canapa_red_seed"}, rarity = 1 }, }} }) diff --git a/cannabis/init.lua b/cannabis/init.lua index a589dd5..73ebfba 100644 --- a/cannabis/init.lua +++ b/cannabis/init.lua @@ -25,6 +25,10 @@ dofile(path.."/node_ingot.lua") dofile(path.."/craftitem.lua") dofile(path.."/armor.lua") dofile(path.."/joint.lua") -dofile(path.."/canapa_rossa.lua") +dofile(path.."/canapa_red.lua") dofile(path.."/craftred.lua") dofile(path.."/rope.lua") +dofile(path.."/wool.lua") +dofile(path.."/bag.lua") +dofile(path.."/canapa_ice.lua") +dofile(path.."/craftice.lua") diff --git a/cannabis/mod.conf b/cannabis/mod.conf index 5fd0a19..2c860d0 100644 --- a/cannabis/mod.conf +++ b/cannabis/mod.conf @@ -1,3 +1,3 @@ name = cannabis -depends = default, fire -optional_default = 3d_armor, maptools +depends = default +optional_default = 3d_armor, maptools,unified_inventory,ropes,wool, fire diff --git a/cannabis/release.txt b/cannabis/release.txt new file mode 100644 index 0000000..2da5229 --- /dev/null +++ b/cannabis/release.txt @@ -0,0 +1 @@ +9.5.2020 \ No newline at end of file diff --git a/craftice.lua b/craftice.lua new file mode 100644 index 0000000..88c9dcd --- /dev/null +++ b/craftice.lua @@ -0,0 +1,154 @@ +-- get Boilerplate for Translations +local S = cannabis.S + +minetest.register_craftitem("cannabis:canapa_ice_seed", { + description = S("Hemp Seed"), + inventory_image = "cannabis_canapa_ice_seed.png", + on_use = minetest.item_eat(10), +}) + +minetest.register_craftitem("cannabis:canapa_ice_leaves", { + description = S("Hemp Leaves"), + inventory_image = "cannabis_canapa_ice_leaves.png", + on_use = minetest.item_eat(5), +}) + +minetest.register_craftitem("cannabis:canapa_ice_flower", { + description = S("Hemp ice Flower"), + inventory_image = "cannabis_canapa_ice_flower.png", + on_use = minetest.item_eat(5), +}) +------------------------------------------------------------------- + +minetest.register_craft({ + output = "cannabis:canapa_oil 4 ", + recipe = { + {"","",""}, + {"","",""}, + {"cannabis:canapa_ice_flower","cannabis:canapa_ice_raisin","cannabis:canapa_ice_flower"}, + } +}) + +minetest.register_craft({ + output = "cannabis:canapa_fuel 4 ", + recipe ={ + {"cannabis:canapa_ice","cannabis:canapa_ice",""}, + {"cannabis:canapa_ice","cannabis:canapa_ice",""}, + {"cannabis:canapa_ice","cannabis:canapa_ice",""}, + } +}) + +minetest.register_craft({ + output = "cannabis:canapa_plastic 8 ", + recipe ={ + {"cannabis:canapa_ice","cannabis:canapa_ice","cannabis:canapa_ice"}, + {"cannabis:canapa_ice","cannabis:canapa_ice","cannabis:canapa_ice"}, + } +}) + + + minetest.register_craft({ + output = "cannabis:canapa_glue 10 ", + recipe = { + {"cannabis:canapa_ice_plastic","cannabis:canapa_ice_raisin","cannabis:canapa_ice_plastic"}, + {"cannabis:canapa_ice_raisin","cannabis:canapa_ice_oil","cannabis:canapa_ice_raisin"}, + {"cannabis:canapa_ice_plastic","cannabis:canapa_ice_raisin","cannabis:canapa_ice_plastic"}, + } +}) + + minetest.register_craft({ + output = "cannabis:hp_block_canapa 4 ", + recipe = { + {"cannabis:canapa_ice_fiber","cannabis:canapa_ice_glue","cannabis:canapa_ice_fiber"}, + {"cannabis:canapa_ice_glue","cannabis:canapa_ice_fiber","cannabis:canapa_ice_glue"}, + {"cannabis:canapa_ice_fiber","cannabis:canapa_ice_glue","cannabis:canapa_ice_fiber"}, + } +}) + + + minetest.register_craft({ + output = "cannabis:canapa_raisin 3 ", + recipe = { + {"","",""}, + {"","",""}, + {"cannabis:canapa_ice_flower","cannabis:canapa_ice_flower",""}, + } +}) + minetest.register_craft({ + output = "cannabis:climbing_i ", + recipe = { + {"cannabis:canapa_ice_leaves","cannabis:canapa_ice_leaves","cannabis:canapa_ice_leaves"}, + {"cannabis:canapa_ice_leaves","cannabis:canapa_ice_leaves","cannabis:canapa_ice_leaves"}, + {"cannabis:canapa_ice_leaves","cannabis:canapa_ice_leaves","cannabis:canapa_ice_leaves"}, + } +}) + + +minetest.register_craft({ + output = "cannabis:canapa_ice_seed 10 ", + recipe = { + {"cannabis:canapa_ice","",""}, + {"","cannabis:canapa_ice",""}, + {"","","cannabis:canapa_ice"}, + } +}) + + +minetest.register_craft({ + output = "cannabis:canapa_fiber 10 ", + recipe = { + {"","","cannabis:canapa_ice"}, + {"","cannabis:canapa_ice",""}, + {"cannabis:canapa_ice","",""}, + } +}) + +minetest.register_craft({ + output = "cannabis:canapa_paper 6 ", + recipe = { + {"cannabis:canapa_ice", "cannabis:canapa_ice", "cannabis:canapa_ice" + }, + } +}) + +minetest.register_craft({ + type = "fuel", + recipe = "cannabis:canapa_ice", + burntime = 15, +}) + + + + +minetest.register_craft({ + type = "shapeless", + output = "cannabis:canapa_ice_flour 4", + recipe = {"cannabis:canapa_ice_seed", "cannabis:canapa_ice_seed", "cannabis:canapa_ice_seed", "cannabis:canapa_ice_seed"} +}) + +minetest.register_craft({ + type = "cooking", + cooktime = 10, + output = "cannabis:canapa_bread", + recipe = "cannabis:canapa_flour" +}) + + minetest.register_craft({ + output = "cannabis:cannabis_foglie_ice_block ", + recipe = { + {"cannabis:climbing_i","cannabis:climbing_i","cannabis:climbing_i"}, + {"cannabis:climbing_i","cannabis:climbing_i","cannabis:climbing_i"}, + {"cannabis:climbing_i","cannabis:climbing_i","cannabis:climbing_i"}, + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "cannabis:mixed_hr_ingot 3", + recipe = {"cannabis:fibra_ingot", "cannabis:foglie_ingot", "cannabis:tessuto_ingot"} +}) +minetest.register_craft({ + type = "shapeless", + output = "cannabis:climbing_i 9", + recipe = {"cannabis:cannabis_foglie_ice_block", "", ""} +}) diff --git a/craftitem.lua b/craftitem.lua index 302d4d5..a92db4d 100644 --- a/craftitem.lua +++ b/craftitem.lua @@ -16,7 +16,10 @@ minetest.register_craftitem("cannabis:canapa_plastic", { description = S("Plastic"), inventory_image = "cannabis_plastic.png", }) - +minetest.register_craftitem("cannabis:canapa_cloth", { + description = S("Cloth"), + inventory_image = "cannabis_cloth.png", +}) minetest.register_craftitem("cannabis:canapa_paper", { description = S("Paper"), inventory_image = "cannabis_paper.png", @@ -134,18 +137,17 @@ minetest.register_craft({ - - minetest.register_craft({ - output = "cannabis:canapa_seed 10 ", + output = "cannabis:canapa_cloth 3 ", recipe = { - {"cannabis:canapa","",""}, - {"","cannabis:canapa",""}, - {"","","cannabis:canapa"}, + {"cannabis:canapa_fiber", "cannabis:canapa_fiber", "cannabis:canapa_fiber"}, + {"cannabis:canapa_fiber", "cannabis:canapa_fiber", "cannabis:canapa_fiber"}, } }) + + minetest.register_craft({ output = "cannabis:canapa_fiber 10 ", recipe = { @@ -172,7 +174,7 @@ minetest.register_craft({ minetest.register_craft({ type = "fuel", recipe = "cannabis:canapa_fuel", - burntime = 50, + burntime = 70, }) diff --git a/craftred.lua b/craftred.lua index 1e7e59e..de1dc45 100644 --- a/craftred.lua +++ b/craftred.lua @@ -84,14 +84,6 @@ minetest.register_craft({ }) -minetest.register_craft({ - output = "cannabis:canapa_red_seed 10 ", - recipe = { - {"cannabis:canapa_red","",""}, - {"","cannabis:canapa_red",""}, - {"","","cannabis:canapa_red"}, - } -}) minetest.register_craft({ diff --git a/init.lua b/init.lua index 14421b1..73ebfba 100644 --- a/init.lua +++ b/init.lua @@ -24,7 +24,11 @@ dofile(path.."/canapa.lua") dofile(path.."/node_ingot.lua") dofile(path.."/craftitem.lua") dofile(path.."/armor.lua") ---dofile(path.."/joint.lua") --for activate joint ,this need deactivate for load in minetest content DB (FOR NOW) -dofile(path.."/canapa_rossa.lua") +dofile(path.."/joint.lua") +dofile(path.."/canapa_red.lua") dofile(path.."/craftred.lua") dofile(path.."/rope.lua") +dofile(path.."/wool.lua") +dofile(path.."/bag.lua") +dofile(path.."/canapa_ice.lua") +dofile(path.."/craftice.lua") diff --git a/joint.lua b/joint.lua index 1770674..a3b36ee 100644 --- a/joint.lua +++ b/joint.lua @@ -69,11 +69,7 @@ local S = cannabis.S inventory_image = "joint_filter.png", }) - minetest.register_craftitem("cannabis:joint_accendino", { - description = S("Lighter"), - inventory_image = "joint_accendino.png", - - }) + --______________________________________________________________________________ --craft --______________________________________________________________________________ @@ -169,6 +165,14 @@ minetest.register_craft({ {"","",""}, {"cannabis:joint_erba_spento","cannabis:joint_accendino",""}, } +}) + minetest.register_craft({ + output = "cannabis:joint_accendino 5 ", + recipe = { + {"default:steel_ingot","default:torch","cannabis:canapa_plastic"}, + {"cannabis:canapa_plastic","cannabis:canapa_fuel","cannabis:canapa_plastic"}, + {"cannabis:canapa_plastic","cannabis:canapa_plastic","cannabis:canapa_plastic"}, + } }) ----------------------------------------- --local smokeCOLOR = { @@ -182,3 +186,13 @@ minetest.register_craft({ --for color, smokecolor in pairs(smokeCOLOR) do -- water --end +if minetest.get_modpath("fire") then + minetest.register_craft({ + output = "cannabis:joint_accendino 5 ", + recipe = { + {"default:steel_ingot","fire:flint_and_steel","cannabis:canapa_plastic"}, + {"cannabis:canapa_plastic","cannabis:canapa_fuel","cannabis:canapa_plastic"}, + {"cannabis:canapa_plastic","cannabis:canapa_plastic","cannabis:canapa_plastic"}, + } +}) +end diff --git a/locale/cannabis.de.tr b/locale/cannabis.de.tr index a98aa7a..ab321d7 100644 --- a/locale/cannabis.de.tr +++ b/locale/cannabis.de.tr @@ -9,6 +9,12 @@ Hemp Shield= Hanfschild Leggings= Hose +### bag.lua ### + +Large Bob Bag= BOB Tasche Breit +Medium Bob Bag= BOB Tasche Mittel +Small Bob Bag= BOB Tasche Klein + ### canapa.lua ### Hemp=Hanf @@ -17,7 +23,15 @@ Hemp (flowering)=Hanf (blühend) Hemp (seedling)=Hanf (Sämling) Hemp (sproutling)=Hanf (sprießend) -### canapa_rossa.lua ### +### canapa_ice.lua ### + +Hemp (Ice flowering)=Gletscherhanf +Hemp ice= Gletscherhanf (blühend) +Hemp ice (climbing plant)=Gletscherhanf (kletternde Pflanze) +Hemp ice (sproutling)=Gletscherhanf (sprießend) +Hemp ice(seedling)=Gletscherhanf (Sämling) + +### canapa_red.lua ### Hemp (Red flowering)=Hanf (Rot blühend) Hemp red=Roter Hanf @@ -25,10 +39,22 @@ Hemp red (climbing plant)=Roter Hanf (kletternde Pflanze) Hemp red (sproutling)=Roter Hanf (Sämling) Hemp red(seedling)=Roter Hanf (Sprießend) +### craftice.lua ### + +Hemp ice Flower= Gletscherhanfblume + +### craftice.lua ### +### craftitem.lua ### +### craftred.lua ### + +Hemp Leaves=Hanfblätter +Hemp Seed=Hanfsamen + ### craftitem.lua ### BioFuel=BioKraftstoff Bread=Brot +Cloth= Fiber=Faser Flour=Mehl Hemp Flower=Hanfblume @@ -38,12 +64,6 @@ Hemp Resin=Hanfharz Paper=Papier Plastic=Plastik -### craftitem.lua ### -### craftred.lua ### - -Hemp Leaves=Hanfblätter -Hemp Seed=Hanfsamen - ### craftred.lua ### Hemp red Flower=Roter Hanf Blüte @@ -81,7 +101,6 @@ Red Leaves Block=Roter Blätterblock ### tools.lua ### -Hemp Admin High Performance Sword=Hanf Admin hochwertiges Schwert Hemp Adminh Pickaxe=Hanf Admin hochwertige Spitzhacke Hemp Bronze Axe= Hanf Bronze Axt Hemp Bronze Pickaxe=Hanf Bronze Spitzhacke @@ -103,3 +122,8 @@ Hemp Steel Axe=Hanf Eisen Axt Hemp Steel Pickaxe=Hanf Eisen Spitzhacke Hemp Steel Shovel=Hanf Eisen Schaufel Hemp Steel Sword=Hanf Eisen Schwert + + +##### not used anymore ##### + +Hemp Admin High Performance Sword=Hanf Admin hochwertiges Schwert diff --git a/locale/cannabis.de.tr.old b/locale/cannabis.de.tr.old new file mode 100644 index 0000000..a98aa7a --- /dev/null +++ b/locale/cannabis.de.tr.old @@ -0,0 +1,105 @@ +# textdomain: cannabis + + +### armor.lua ### + + Boots= Stiefel + Chestplate= Brustpanzer + Helmet= Helm + Hemp Shield= Hanfschild + Leggings= Hose + +### canapa.lua ### + +Hemp=Hanf +Hemp (climbing plant)=Hanf (kletternde Pflanze) +Hemp (flowering)=Hanf (blühend) +Hemp (seedling)=Hanf (Sämling) +Hemp (sproutling)=Hanf (sprießend) + +### canapa_rossa.lua ### + +Hemp (Red flowering)=Hanf (Rot blühend) +Hemp red=Roter Hanf +Hemp red (climbing plant)=Roter Hanf (kletternde Pflanze) +Hemp red (sproutling)=Roter Hanf (Sämling) +Hemp red(seedling)=Roter Hanf (Sprießend) + +### craftitem.lua ### + +BioFuel=BioKraftstoff +Bread=Brot +Fiber=Faser +Flour=Mehl +Hemp Flower=Hanfblume +Hemp Glue=Hanfkleber +Hemp Oil=Hanföl +Hemp Resin=Hanfharz +Paper=Papier +Plastic=Plastik + +### craftitem.lua ### +### craftred.lua ### + +Hemp Leaves=Hanfblätter +Hemp Seed=Hanfsamen + +### craftred.lua ### + +Hemp red Flower=Roter Hanf Blüte + +### joint.lua ### + +Filter=Filter +Filters pack=Filterpaket +Flowering chopped=blühend gehäckselt +Hash melted=Haschisch geschmolzen +Joint of hash lit=Haschisch Joint angezündet +Joint of hash unlit=Haschisch Joint nicht angezündet +Joint of weed lit=Joint aus Gras angezündet +Joint of weed unlit=Joint aus Gras nicht angezündet +Lighter=Feuerzeug +Rolling paper=Zigarettenpapier +Rolling paper with hemp leaves and flowering chopped =Zigarettenpapier mit Hanfblättern und gehäckselten Blüten +Rolling paper with hemp leaves melted hash=Zigarettenpapier mit Hanfblättern und geschmolzenem Haschisch + +### node_ingot.lua ### + +Adminh Block=Adminh Block +Adminh Ingot=Adminh Barren +Fabric Block=Stoffblock +Fabric Ingot=Stoffbarren +Fiber Block=Faserblock +Fiber Ingot=Faserbarren +High Performance Block=Hochwertiger Block +High Performance Block Hemp=Hochwertiger Hanfblock +High Performance Ingot=Hochwertiger Barren +Leaves Block=Blätterblock +Leaves Ingot=Blätterbarren +Mixed HR Ingot=Gemischter HR Barren +Red Leaves Block=Roter Blätterblock + +### tools.lua ### + +Hemp Admin High Performance Sword=Hanf Admin hochwertiges Schwert +Hemp Adminh Pickaxe=Hanf Admin hochwertige Spitzhacke +Hemp Bronze Axe= Hanf Bronze Axt +Hemp Bronze Pickaxe=Hanf Bronze Spitzhacke +Hemp Bronze Shovel=Hanf Bronze Schaufel +Hemp Bronze Sword=Hanf Bronze Schaufel +Hemp Diamond Axe=Hanf Diamant Axt +Hemp Diamond Pickaxe=Hanf Diamant Spitzhacke +Hemp Diamond Shovel=Hanf Diamant Schaufel +Hemp Diamond Sword=Hanf Diamant Schwert +Hemp High Performance Axe=Hanf Hochwertige Axt +Hemp High Performance Sword=Hanf Hochwertiges Schwert +Hemp High Pickaxe=Hanf hochwertige Spitzhacke +Hemp High Shovel=Hanf hochwertige Schaufel +Hemp Mese Axe=Hanf Mese Axt +Hemp Mese Pickaxe=Hanf Mese Spitzhacke +Hemp Mese Shovel=Hanf Mese Schaufel +Hemp Mese Sword=Hanf Mese Schwert +Hemp Steel Axe=Hanf Eisen Axt +Hemp Steel Pickaxe=Hanf Eisen Spitzhacke +Hemp Steel Shovel=Hanf Eisen Schaufel +Hemp Steel Sword=Hanf Eisen Schwert diff --git a/locale/cannabis.it.tr b/locale/cannabis.it.tr index a79e6c0..2a8dedf 100644 --- a/locale/cannabis.it.tr +++ b/locale/cannabis.it.tr @@ -9,6 +9,12 @@ Hemp Shield= Scudo di canapa Leggings=Gambali +### bag.lua ### + +Large Bob Bag= Borsa BOB larga +Medium Bob Bag= Borsa BOB media +Small Bob Bag= Borsa BOB piccola + ### canapa.lua ### Hemp=Canapa @@ -17,7 +23,15 @@ Hemp (flowering)=Canapa (infiorescena) Hemp (seedling)=Canapa (piantina) Hemp (sproutling)=Canapa (germoglio) -### canapa_rossa.lua ### +### canapa_ice.lua ### + +Hemp (Ice flowering)= Inffiorescenza di canapa Glaciale +Hemp ice= Canapa Glaciale +Hemp ice (climbing plant)=Canapa Glaciale(rampicante) +Hemp ice (sproutling)=Canapa Glaciale (piantina) +Hemp ice(seedling)=Canapa Glaciale (germoglio) + +### canapa_red.lua ### Hemp (Red flowering)=Canapa rossa (infiorescena) Hemp red=Canapa rossa @@ -25,10 +39,22 @@ Hemp red (climbing plant)=Canapa rossa (rampicante) Hemp red (sproutling)=Canapa rossa (piantina) Hemp red(seedling)=Canapa rossa (germoglio) +### craftice.lua ### + +Hemp ice Flower= Fiore di canapa glaciale + +### craftice.lua ### +### craftitem.lua ### +### craftred.lua ### + +Hemp Leaves= Foglie di canapa +Hemp Seed= Semi di canapa + ### craftitem.lua ### BioFuel=BioCarburante Bread=Pane +Cloth= Stoffa Fiber=Fibra Flour=Farina Hemp Flower=Fiore di Canapa @@ -38,12 +64,6 @@ Hemp Resin=Resina di Canapa Paper=Carta Plastic=Plastica -### craftitem.lua ### -### craftred.lua ### - -Hemp Leaves= Foglie di canapa -Hemp Seed= Semi di canapa - ### craftred.lua ### Hemp red Flower=Fiore di canapa rossa @@ -81,7 +101,6 @@ Red Leaves Block=Blocco di foglie rosse ### tools.lua ### -Hemp Admin High Performance Sword= Hemp Adminh Pickaxe=Piccone Adminh di canapa Hemp Bronze Axe=Ascia di canapa e bronzo Hemp Bronze Pickaxe=Piccone di canapa e bronzo diff --git a/locale/cannabis.it.tr.old b/locale/cannabis.it.tr.old new file mode 100644 index 0000000..a79e6c0 --- /dev/null +++ b/locale/cannabis.it.tr.old @@ -0,0 +1,105 @@ +# textdomain: cannabis + + +### armor.lua ### + + Boots=Stivali + Chestplate=Corazza + Helmet=Elmo + Hemp Shield= Scudo di canapa + Leggings=Gambali + +### canapa.lua ### + +Hemp=Canapa +Hemp (climbing plant)=Canapa (rampicante) +Hemp (flowering)=Canapa (infiorescena) +Hemp (seedling)=Canapa (piantina) +Hemp (sproutling)=Canapa (germoglio) + +### canapa_rossa.lua ### + +Hemp (Red flowering)=Canapa rossa (infiorescena) +Hemp red=Canapa rossa +Hemp red (climbing plant)=Canapa rossa (rampicante) +Hemp red (sproutling)=Canapa rossa (piantina) +Hemp red(seedling)=Canapa rossa (germoglio) + +### craftitem.lua ### + +BioFuel=BioCarburante +Bread=Pane +Fiber=Fibra +Flour=Farina +Hemp Flower=Fiore di Canapa +Hemp Glue=Colla di Canapa +Hemp Oil=Olio di Canapa +Hemp Resin=Resina di Canapa +Paper=Carta +Plastic=Plastica + +### craftitem.lua ### +### craftred.lua ### + +Hemp Leaves= Foglie di canapa +Hemp Seed= Semi di canapa + +### craftred.lua ### + +Hemp red Flower=Fiore di canapa rossa + +### joint.lua ### + +Filter=Filtro +Filters pack=Pacchetto di filtri +Flowering chopped=Infiorescenza triturata +Hash melted=Fumo sciolto +Joint of hash lit=Sigaretta con fumo accesa +Joint of hash unlit=Sigaretta con fumo spenta +Joint of weed lit=Sigaretta di erba acceso +Joint of weed unlit=Sigaretta di erba spenta +Lighter=Accendino +Rolling paper=Cartine +Rolling paper with hemp leaves and flowering chopped =Cartina con foglie e cime di canapa +Rolling paper with hemp leaves melted hash=Cartina con foglie e resina sciolta di canapa + +### node_ingot.lua ### + +Adminh Block=Blocco Adminh (indistruttibile) +Adminh Ingot=Lingotto Adminh +Fabric Block=Blocco di Tessuto +Fabric Ingot=Lingotto tessuto +Fiber Block=Blocco di fibra +Fiber Ingot=Lingotto di fibra +High Performance Block=Blocco ad alte prestazioni +High Performance Block Hemp=Blocco alla fibra di canapa ad alte prestazioni +High Performance Ingot=Lingotto alte prestazioni +Leaves Block=Blocco di foglie +Leaves Ingot=Lingotto di foglie +Mixed HR Ingot=Lingotto mescola HR +Red Leaves Block=Blocco di foglie rosse + +### tools.lua ### + +Hemp Admin High Performance Sword= +Hemp Adminh Pickaxe=Piccone Adminh di canapa +Hemp Bronze Axe=Ascia di canapa e bronzo +Hemp Bronze Pickaxe=Piccone di canapa e bronzo +Hemp Bronze Shovel=Pala di canapa e bronzo +Hemp Bronze Sword=Spada di canapa e bronzo +Hemp Diamond Axe=Ascia di canapa e diamante +Hemp Diamond Pickaxe=Picconedi canapa e diamante +Hemp Diamond Shovel=Pala di canapa e diamante +Hemp Diamond Sword=Spada di canapa e diamante +Hemp High Performance Axe=Ascia di canapa ad alte prestazioni +Hemp High Performance Sword=Spada di canapa ad alte prestazioni +Hemp High Pickaxe=Piccone di canapa ad alte prestazioni +Hemp High Shovel=Pala di canapa ad alte prestazioni +Hemp Mese Axe=Ascia di canapa e mese +Hemp Mese Pickaxe=Piccone di canapa e mese +Hemp Mese Shovel=Pala di canapa e mese +Hemp Mese Sword=Spada di canapa e mese +Hemp Steel Axe=Ascia di canapa ed acciaio +Hemp Steel Pickaxe=Piccone di canapa ed acciaio +Hemp Steel Shovel=Pala di canapa ed acciaio +Hemp Steel Sword=Spada di canapa ed acciaio diff --git a/locale/template.txt b/locale/template.txt index 3f732fa..0e48b9f 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -9,6 +9,12 @@ Hemp Shield= Leggings= +### bag.lua ### + +Large Bob Bag= +Medium Bob Bag= +Small Bob Bag= + ### canapa.lua ### Hemp= @@ -17,7 +23,15 @@ Hemp (flowering)= Hemp (seedling)= Hemp (sproutling)= -### canapa_rossa.lua ### +### canapa_ice.lua ### + +Hemp (Ice flowering)= +Hemp ice= +Hemp ice (climbing plant)= +Hemp ice (sproutling)= +Hemp ice(seedling)= + +### canapa_red.lua ### Hemp (Red flowering)= Hemp red= @@ -25,10 +39,22 @@ Hemp red (climbing plant)= Hemp red (sproutling)= Hemp red(seedling)= +### craftice.lua ### + +Hemp ice Flower= + +### craftice.lua ### +### craftitem.lua ### +### craftred.lua ### + +Hemp Leaves= +Hemp Seed= + ### craftitem.lua ### BioFuel= Bread= +Cloth= Fiber= Flour= Hemp Flower= @@ -38,12 +64,6 @@ Hemp Resin= Paper= Plastic= -### craftitem.lua ### -### craftred.lua ### - -Hemp Leaves= -Hemp Seed= - ### craftred.lua ### Hemp red Flower= @@ -81,7 +101,6 @@ Red Leaves Block= ### tools.lua ### -Hemp Admin High Performance Sword= Hemp Adminh Pickaxe= Hemp Bronze Axe= Hemp Bronze Pickaxe= diff --git a/node_ingot.lua b/node_ingot.lua index df483f9..ea2889a 100644 --- a/node_ingot.lua +++ b/node_ingot.lua @@ -142,12 +142,15 @@ minetest.register_craft({ output = "cannabis:foglie_ingot", }) -minetest.register_craft({ - type = 'cooking', - recipe = "cannabis:canapa_paper", - output = "cannabis:tessuto_ingot", -}) + minetest.register_craft({ + output = "cannabis:tessuto_ingot", + recipe = { + {"","",""}, + {"cannabis:canapa_glue","cannabis:canapa_glue",""}, + {"cannabis:canapa_cloth","cannabis:canapa_cloth",""}, + } +}) minetest.register_craft({ type = 'cooking', recipe = "cannabis:canapa_plastic", diff --git a/textures/1hemp_seedling_ice.png b/textures/1hemp_seedling_ice.png new file mode 100644 index 0000000..606b709 Binary files /dev/null and b/textures/1hemp_seedling_ice.png differ diff --git a/textures/bags_bob_large.png b/textures/bags_bob_large.png new file mode 100644 index 0000000..63ebbd8 Binary files /dev/null and b/textures/bags_bob_large.png differ diff --git a/textures/bags_bob_medium.png b/textures/bags_bob_medium.png new file mode 100644 index 0000000..6df4d5f Binary files /dev/null and b/textures/bags_bob_medium.png differ diff --git a/textures/bags_bob_small.png b/textures/bags_bob_small.png new file mode 100644 index 0000000..79119f4 Binary files /dev/null and b/textures/bags_bob_small.png differ diff --git a/textures/cannabis_canapa_ice.png b/textures/cannabis_canapa_ice.png new file mode 100644 index 0000000..7acf257 Binary files /dev/null and b/textures/cannabis_canapa_ice.png differ diff --git a/textures/cannabis_canapa_ice_flower.png b/textures/cannabis_canapa_ice_flower.png new file mode 100644 index 0000000..a4da2ad Binary files /dev/null and b/textures/cannabis_canapa_ice_flower.png differ diff --git a/textures/cannabis_canapa_ice_leaves.png b/textures/cannabis_canapa_ice_leaves.png new file mode 100644 index 0000000..507fab4 Binary files /dev/null and b/textures/cannabis_canapa_ice_leaves.png differ diff --git a/textures/cannabis_canapa_ice_seed.png b/textures/cannabis_canapa_ice_seed.png new file mode 100644 index 0000000..ec52ffe Binary files /dev/null and b/textures/cannabis_canapa_ice_seed.png differ diff --git a/textures/cannabis_canapa_red_fiber.png b/textures/cannabis_canapa_red_fiber.png deleted file mode 100644 index 18b86e5..0000000 Binary files a/textures/cannabis_canapa_red_fiber.png and /dev/null differ diff --git a/textures/cannabis_canapa_red_glue.png b/textures/cannabis_canapa_red_glue.png deleted file mode 100644 index f91782b..0000000 Binary files a/textures/cannabis_canapa_red_glue.png and /dev/null differ diff --git a/textures/cannabis_canapa_red_oil.png b/textures/cannabis_canapa_red_oil.png deleted file mode 100644 index 6803980..0000000 Binary files a/textures/cannabis_canapa_red_oil.png and /dev/null differ diff --git a/textures/cannabis_canapa_red_raisin.png b/textures/cannabis_canapa_red_raisin.png deleted file mode 100644 index d44b6be..0000000 Binary files a/textures/cannabis_canapa_red_raisin.png and /dev/null differ diff --git a/textures/cannabis_cloth.png b/textures/cannabis_cloth.png new file mode 100644 index 0000000..4670c16 Binary files /dev/null and b/textures/cannabis_cloth.png differ diff --git a/textures/cannabis_foglie_ice_block.png b/textures/cannabis_foglie_ice_block.png new file mode 100644 index 0000000..c05c960 Binary files /dev/null and b/textures/cannabis_foglie_ice_block.png differ diff --git a/textures/cannabis_tessuto_block.png b/textures/cannabis_tessuto_block.png index 8604e7c..9a92762 100644 Binary files a/textures/cannabis_tessuto_block.png and b/textures/cannabis_tessuto_block.png differ diff --git a/textures/cannabis_tessuto_block0.png b/textures/cannabis_tessuto_block0.png new file mode 100644 index 0000000..8604e7c Binary files /dev/null and b/textures/cannabis_tessuto_block0.png differ diff --git a/textures/hemp_climbing_ice.png b/textures/hemp_climbing_ice.png new file mode 100644 index 0000000..c05c960 Binary files /dev/null and b/textures/hemp_climbing_ice.png differ diff --git a/textures/hemp_sproutling.png b/textures/hemp_sproutling.png index 200a7b4..f6bea9b 100644 Binary files a/textures/hemp_sproutling.png and b/textures/hemp_sproutling.png differ diff --git a/textures/hemp_sproutling_ice.png b/textures/hemp_sproutling_ice.png new file mode 100644 index 0000000..13b6de4 Binary files /dev/null and b/textures/hemp_sproutling_ice.png differ diff --git a/textures/hemp_sproutling_red.png b/textures/hemp_sproutling_red.png index 27c76b7..26b6f57 100644 Binary files a/textures/hemp_sproutling_red.png and b/textures/hemp_sproutling_red.png differ diff --git a/textures/hp_block_canapa_red.png b/textures/hp_block_canapa_red.png deleted file mode 100644 index c68c15d..0000000 Binary files a/textures/hp_block_canapa_red.png and /dev/null differ diff --git a/wool.lua b/wool.lua new file mode 100644 index 0000000..424a65b --- /dev/null +++ b/wool.lua @@ -0,0 +1,10 @@ +if minetest.get_modpath("wool") ~= nil then + minetest.register_craft({ + output = "wool:white", + recipe = { + {"cannabis:canapa_fiber","cannabis:canapa_fiber", "cannabis:canapa_fiber"}, + {"cannabis:canapa_fiber","cannabis:canapa_fiber", "cannabis:canapa_fiber"}, + {"cannabis:canapa_fiber","cannabis:canapa_fiber", "cannabis:canapa_fiber"}, + }, + }) +end