added clothing

added some clothing

armor.lua

@@ -1,7 +1,7 @@
 -- get Boilerplate for Translations
-local S = cannabis.S
 
-      --armor
+local S = cannabis.S
+local path = cannabis.path
         
 if minetest.get_modpath("cannabis") then
 	local stats = {

clothing.lua

@@ -0,0 +1,112 @@
+
+local S = cannabis.S
+local path = cannabis.path
+
+
+local Color_list = {
+	{ "hemp", "c"},
+	{ "u_style", "u"},
+    { "red_hemp", "cr"},
+	{ "ice_hemp", "ci"},
+	{ "fabric_hemp", "t"},
+	{ "jamaican", "jam"}
+	
+}
+local craftitem ={
+
+	--{"cape"},
+	{"skullcap"},
+	{"glove_right"},
+	{"glove_left"},
+	{"gloves"},
+	{"shirt"},
+	{"shorts"},
+	{"shortshirt"},
+	{"undershirt"},
+	{"hood_mask"},
+	{"pants"}
+	}
+	local colors_l ={
+	--{"col"},
+	{"yellow"},
+	{"red"},
+	{"cyan"},
+	{"pink"},
+	{"orange"},
+	{"green"},
+	{"white"},
+	{"green"},
+	{"violet"},
+	{"blue"}
+}
+for i in ipairs(Color_list) do
+	local colordesc = Color_list[i][1]
+	local color = Color_list[i][2]
+
+for i in ipairs(craftitem) do
+	local item = craftitem[i][1] 
+--    local col= craftitem[i][2]
+    
+for i in ipairs(colors_l) do
+--	local item = craftitem[i][1] 
+    local colit= colors_l[i][1]
+
+minetest.register_craftitem("cannabis:canapa_"..item.."_fabric_hemp_"..colit, {
+		description = S(item.." fabric_hemp "..colit),
+		inventory_image = "clothing_inv_"..item.."_t.png^"..colit..".png",
+		uv_image = "clothing_uv_"..item.."_t.png^"..colit..".png",
+		groups = {clothing=1},
+	})
+	
+	minetest.register_craftitem("cannabis:canapa_"..item.."_"..colordesc, {
+		description = S(item.." "..colordesc),
+		inventory_image = "clothing_inv_"..item.."_"..color..".png",
+		uv_image = "clothing_uv_"..item.."_"..color..".png",
+		groups = {clothing=1},
+	})
+	
+minetest.register_craftitem("cannabis:canapa_cape_"..colordesc, {
+		description = S(item.." "..colordesc),
+		inventory_image = "clothing_inv_cape_"..color..".png",
+		uv_image = "clothing_uv_cape_"..color..".png",
+		groups = {cape=1},
+	})
+	
+	minetest.register_craftitem("cannabis:canapa_cape_fabric_hemp_"..colit, {
+		description = S(item.." fabric_hemp "..colit),
+		inventory_image = "clothing_inv_cape_t.png^"..colit..".png",
+		uv_image = "clothing_uv_cape_t.png^"..colit..".png",
+		groups = {cape=1},
+	})
+
+end
+end
+end
+--________________________________________________________
+
+
+
+
+
+--______________________________TODO
+
+--[[
+clothing.spinning_machine:recipe_register_input(
+      "cannabis:canapa_fiber",
+      {
+        inputs = 1,
+        outputs = {"cannabis:canapa_spool"},
+        production_time = 30,
+        consumption_step_size = 1,
+      });
+  clothing.loom:recipe_register_input(
+      "",
+      {
+        inputs = {"cannabis:canapa_spool", "cannabis:canapa_spool",
+                  "cannabis:canapa_spool", "cannabis:canapa_spool",
+                 },
+        outputs = {{"cannabis:canapa_cloth","clothing:yarn_spool_empty 4"},},
+        production_time = 30,
+        consumption_step_size = 1,
+      });
+]]

clothing_recipes.lua

@@ -0,0 +1,212 @@
+local S = cannabis.S
+local path = cannabis.path
+
+local craft_cloth = {
+    {"cape",""},
+	{"skullcap",""},
+	{"glove_right",""},
+	{"glove_left",""},
+	{"gloves",""},
+	{"shirt",""},
+	{"shorts",""},
+	{"shortshirt",""},
+	{"undershirt",""},
+	{"hood_mask",""},
+	{"pants",""}
+
+}
+	local colors_l ={
+	--{"col"},
+	{"yellow"},
+	{"red"},
+	{"cyan"},
+	{"pink"},
+	{"orange"},
+	{"green"},
+	{"white"},
+	{"green"},
+	{"violet"},
+	{"blue"}
+}
+for i in ipairs(colors_l) do
+	local colors = colors_l[i][1]
+
+for i in ipairs(craft_cloth) do
+	      
+local clot = craft_cloth[i][1]
+
+minetest.register_craft({
+	output = "cannabis:canapa_"..clot.."_hemp", 
+	recipe = {			
+			{"","","" },
+			{"","","" },
+			{"cannabis:canapa_"..clot.."_fabric_hemp","cannabis:flowering","" }		
+			
+		}
+	})
+minetest.register_craft({
+	output = "cannabis:canapa_"..clot.."_red_hemp", 
+	recipe = {			
+			{"","","" },
+			{"","","" },
+			{"cannabis:canapa_"..clot.."_fabric_hemp","cannabis:flowering_red","" }		
+			
+		}
+	})
+	minetest.register_craft({
+	output = "cannabis:canapa_"..clot.."_ice_hemp", 
+	recipe = {			
+			{"","","" },
+			{"","","" },
+				{"cannabis:canapa_"..clot.."_fabric_hemp","cannabis:flowering_ice","" }		
+			
+		}
+	})
+	minetest.register_craft({
+	output = "cannabis:canapa_"..clot.."_jamaican", 
+	recipe = {			
+			{"","","" },
+			{"","","" },
+				{"cannabis:canapa_"..clot.."_fabric_hemp","cannabis:canapa_glue","" }		
+			
+		}
+	})
+	minetest.register_craft({
+	output = "cannabis:canapa_"..clot.."_u_style", 
+	recipe = {			
+			{"","","" },
+			{"","","" },
+				{"cannabis:canapa_"..clot.."_fabric_hemp","cannabis:canapa_raisin","" }		
+			
+		}
+	})
+	
+--_____________________________________________________________cape
+	 minetest.register_craft({
+		output = "cannabis:canapa_cape_fabric_hemp",
+		recipe = {			
+			{"cannabis:canapa_cloth","","" },
+			{"cannabis:canapa_cloth","","" },
+			{"cannabis:canapa_cloth","","" }		
+			
+		}
+	})
+	--_________________________________________________________skullcap
+		 minetest.register_craft({
+		output = "cannabis:canapa_skullcap_fabric_hemp",
+		recipe = {			
+			{"cannabis:canapa_cloth","","" },
+			{"cannabis:canapa_cloth","","" },
+			{"","","" }		
+			
+		}
+	})
+	--______________________________________________________________glove_left
+		 minetest.register_craft({
+		output = "cannabis:canapa_glove_left_fabric_hemp",
+		recipe = {			
+			{"","","" },
+			{"","","" },
+			{"cannabis:canapa_cloth","","" }		
+			
+		}
+	})
+	--_______________________________________________________________glove_right
+			 minetest.register_craft({
+		output = "cannabis:canapa_glove_right_fabric_hemp",
+		recipe = {			
+			{"","","" },
+			{"","","" },
+			{"","","cannabis:canapa_cloth" }		
+			
+		}
+	})
+	--______________________________________________________________gloves
+			 minetest.register_craft({
+		output = "cannabis:canapa_gloves_fabric_hemp",
+		recipe = {			
+			{"","","" },
+			{"","","" },
+			{"cannabis:canapa_glove_left_fabric_hemp","cannabis:canapa_glove_right_fabric_hemp","" }		
+			
+		}
+	})
+	--_________________________________________________________________shirt
+			 minetest.register_craft({
+		output = "cannabis:canapa_shirt_fabric_hemp",
+		recipe = {			
+			{"cannabis:canapa_fiber","cannabis:canapa_cloth","cannabis:canapa_fiber" },
+			{"","cannabis:canapa_cloth","" },
+			{"","cannabis:canapa_cloth","" }		
+			
+		}
+	})
+	--___________________________________________________________________________________shortshirt
+			 minetest.register_craft({
+		output = "cannabis:canapa_shortshirt_fabric_hemp",
+		recipe = {			
+			
+			{"cannabis:canapa_fiber","cannabis:canapa_cloth","cannabis:canapa_fiber" },
+			{"","cannabis:canapa_cloth","" },
+			{"","cannabis:canapa_cloth","" }		
+			
+		}
+	})
+	--________________________________________________________________________________undershirt
+				 minetest.register_craft({
+		output = "cannabis:canapa_undershirt_fabric_hemp",
+		recipe = {			
+			{"cannabis:canapa_fiber","","cannabis:canapa_fiber" },
+			{"","cannabis:canapa_cloth","" },
+			{"","cannabis:canapa_cloth","" }		
+			
+		}
+	})
+--________________________________________________________________________________________pants
+		minetest.register_craft({
+		output = "cannabis:canapa_pants_fabric_hemp",
+		recipe = {			
+			{"cannabis:canapa_fiber","cannabis:canapa_fiber","cannabis:canapa_fiber" },
+			{"","cannabis:canapa_cloth","" },
+			{"","cannabis:canapa_cloth","" }		
+			
+		}
+	})
+	--_________________________________________________________________________________hood_mask
+				 minetest.register_craft({
+		output = "cannabis:canapa_hood_mask_fabric_hemp",
+		recipe = {			
+			{"cannabis:canapa_fiber","","cannabis:canapa_fiber" },
+			{"","cannabis:canapa_fiber","" },
+			{"","cannabis:canapa_cloth","" }		
+			
+		}
+	})
+	--________________________________________________________________________short
+	
+	minetest.register_craft({
+		output = "cannabis:canapa_shorts_fabric_hemp",
+		recipe = {			
+		
+			{"cannabis:canapa_fiber","cannabis:canapa_fiber","cannabis:canapa_fiber" },
+			{"cannabis:canapa_cloth","","cannabis:canapa_cloth" },
+			{"","","" }			
+		}
+	})
+	--_____________________________________________________________________________________________colored____________
+	
+
+	 minetest.register_craft({
+	output = "cannabis:canapa_"..clot.."_fabric_hemp_"..colors, 
+	recipe = {			
+			{"","","" },
+			{"","","" },
+			{"cannabis:canapa_"..clot.."_fabric_hemp","dye:"..colors,"" }		
+			
+		}
+	})
+
+	
+	
+end
+end

craftitem.lua

@@ -1,5 +1,5 @@
--- get Boilerplate for Translations
 local S = cannabis.S
+local path = cannabis.path
 
 --craft item :fiber, fuel, plastic, paper,flower,oil,flour,bred,resin,seed,leaves
 

depends.txt

@@ -2,7 +2,7 @@ default
 tnt
 fire
 farming
- 
+dye 
 3d_armor?
 maptools?
 

i18n.py

@@ -13,6 +13,7 @@
 from __future__ import print_function
 import os, fnmatch, re, shutil, errno
 from sys import argv as _argv
+from sys import stderr as _stderr
 
 # Running params
 params = {"recursive": False,
@@ -20,20 +21,28 @@ params = {"recursive": False,
     "mods": False,
     "verbose": False,
     "folders": [],
-    "no-old-file": False
+    "no-old-file": False,
+    "break-long-lines": False,
+    "sort": False,
+    "print-source": False,
+    "truncate-unused": False,
 }
 # Available CLI options
 options = {"recursive": ['--recursive', '-r'],
     "help": ['--help', '-h'],
-    "mods": ['--installed-mods'],
+    "mods": ['--installed-mods', '-m'],
     "verbose": ['--verbose', '-v'],
-    "no-old-file": ['--no-old-file']
+    "no-old-file": ['--no-old-file', '-O'],
+    "break-long-lines": ['--break-long-lines', '-b'],
+    "sort": ['--sort', '-s'],
+    "print-source": ['--print-source', '-p'],
+    "truncate-unused": ['--truncate-unused', '-t'],
 }
 
 # Strings longer than this will have extra space added between
 # them in the translation files to make it easier to distinguish their
 # beginnings and endings at a glance
-doublespace_threshold = 60
+doublespace_threshold = 80
 
 def set_params_folders(tab: list):
     '''Initialize params["folders"] from CLI arguments.'''
@@ -68,8 +77,16 @@ DESCRIPTION
         run on locally installed modules
     {', '.join(options["no-old-file"])}
         do not create *.old files
+    {', '.join(options["sort"])}
+        sort output strings alphabetically
+    {', '.join(options["break-long-lines"])}
+        add extra line breaks before and after long strings
+    {', '.join(options["print-source"])}
+	add comments denoting the source file
     {', '.join(options["verbose"])}
         add output information
+    {', '.join(options["truncate-unused"])}
+        delete unused strings from files
 ''')
 
 
@@ -88,8 +105,8 @@ def main():
             print("recursively ", end='')
         # Running
         if params["mods"]:
-            print(f"on all locally installed modules in {os.path.abspath('~/.minetest/mods/')}")
+            print(f"on all locally installed modules in {os.path.expanduser('~/.minetest/mods/')}")
-            run_all_subfolders("~/.minetest/mods")
+            run_all_subfolders(os.path.expanduser("~/.minetest/mods"))
         elif len(params["folders"]) >= 2:
             print("on folder list:", params["folders"])
             for f in params["folders"]:
@@ -112,18 +129,20 @@ def main():
 
 #group 2 will be the string, groups 1 and 3 will be the delimiters (" or ')
 #See https://stackoverflow.com/questions/46967465/regex-match-text-in-either-single-or-double-quote
-pattern_lua = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_s = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
-pattern_lua_bracketed = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
+pattern_lua_fs = re.compile(r'[\.=^\t,{\(\s]N?FS\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_bracketed_s = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
+pattern_lua_bracketed_fs = re.compile(r'[\.=^\t,{\(\s]N?FS\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
 
 # Handles "concatenation" .. " of strings"
 pattern_concat = re.compile(r'["\'][\s]*\.\.[\s]*["\']', re.DOTALL)
 
-pattern_tr = re.compile(r'(.+?[^@])=(.*)')
+pattern_tr = re.compile(r'(.*?[^@])=(.*)')
 pattern_name = re.compile(r'^name[ ]*=[ ]*([^ \n]*)')
 pattern_tr_filename = re.compile(r'\.tr$')
 pattern_po_language_code = re.compile(r'(.*)\.po$')
 
-#attempt to read the mod's name from the mod.conf file. Returns None on failure
+#attempt to read the mod's name from the mod.conf file or folder name. Returns None on failure
 def get_modname(folder):
     try:
         with open(os.path.join(folder, "mod.conf"), "r", encoding='utf-8') as mod_conf:
@@ -132,7 +151,15 @@ def get_modname(folder):
                 if match:
                     return match.group(1)
     except FileNotFoundError:
-        pass
+        if not os.path.isfile(os.path.join(folder, "modpack.txt")):
+            folder_name = os.path.basename(folder)
+            # Special case when run in Minetest's builtin directory
+            if folder_name == "builtin":
+                return "__builtin"
+            else:
+                return folder_name
+        else:
+            return None
     return None
 
 #If there are already .tr files in /locale, returns a list of their names
@@ -180,7 +207,7 @@ def process_po_files(folder, modname):
             if code_match == None:
                 continue
             language_code = code_match.group(1)
-            tr_name = modname + "." + language_code + ".tr"
+            tr_name = f'{modname}.{language_code}.tr'
             tr_file = os.path.join(root, tr_name)
             if os.path.exists(tr_file):
                 if params["verbose"]:
@@ -209,14 +236,17 @@ def mkdir_p(path):
 # dKeyStrings is a dictionary of localized string to source file sets
 # dOld is a dictionary of existing translations and comments from
 # the previous version of this text
-def strings_to_text(dkeyStrings, dOld, mod_name):
+def strings_to_text(dkeyStrings, dOld, mod_name, header_comments):
-    lOut = [f"# textdomain: {mod_name}\n"]
+    lOut = [f"# textdomain: {mod_name}"]
+    if header_comments is not None:
+        lOut.append(header_comments)
     
     dGroupedBySource = {}
 
     for key in dkeyStrings:
         sourceList = list(dkeyStrings[key])
-        sourceList.sort()
+        if params["sort"]:
+            sourceList.sort()
         sourceString = "\n".join(sourceList)
         listForSource = dGroupedBySource.get(sourceString, [])
         listForSource.append(key)
@@ -226,42 +256,45 @@ def strings_to_text(dkeyStrings, dOld, mod_name):
     lSourceKeys.sort()
     for source in lSourceKeys:
         localizedStrings = dGroupedBySource[source]
-        localizedStrings.sort()
+        if params["sort"]:
-        lOut.append("")
+            localizedStrings.sort()
-        lOut.append(source)
+        if params["print-source"]:
-        lOut.append("")
+            if lOut[-1] != "":
+                lOut.append("")
+            lOut.append(source)
         for localizedString in localizedStrings:
             val = dOld.get(localizedString, {})
             translation = val.get("translation", "")
             comment = val.get("comment")
-            if len(localizedString) > doublespace_threshold and not lOut[-1] == "":
+            if params["break-long-lines"] and len(localizedString) > doublespace_threshold and not lOut[-1] == "":
                 lOut.append("")
-            if comment != None:
+            if comment != None and comment != "" and not comment.startswith("# textdomain:"):
                 lOut.append(comment)
             lOut.append(f"{localizedString}={translation}")
-            if len(localizedString) > doublespace_threshold:
+            if params["break-long-lines"] and len(localizedString) > doublespace_threshold:
                 lOut.append("")
 
 
     unusedExist = False
-    for key in dOld:
+    if not params["truncate-unused"]:
-        if key not in dkeyStrings:
+        for key in dOld:
-            val = dOld[key]
+            if key not in dkeyStrings:
-            translation = val.get("translation")
+                val = dOld[key]
-            comment = val.get("comment")
+                translation = val.get("translation")
-            # only keep an unused translation if there was translated
+                comment = val.get("comment")
-            # text or a comment associated with it
+                # only keep an unused translation if there was translated
-            if translation != None and (translation != "" or comment):
+                # text or a comment associated with it
-                if not unusedExist:
+                if translation != None and (translation != "" or comment):
-                    unusedExist = True
+                    if not unusedExist:
-                    lOut.append("\n\n##### not used anymore #####\n")
+                        unusedExist = True
-                if len(key) > doublespace_threshold and not lOut[-1] == "":
+                        lOut.append("\n\n##### not used anymore #####\n")
-                    lOut.append("")
+                    if params["break-long-lines"] and len(key) > doublespace_threshold and not lOut[-1] == "":
-                if comment != None:
+                        lOut.append("")
-                    lOut.append(comment)
+                    if comment != None:
-                lOut.append(f"{key}={translation}")
+                        lOut.append(comment)
-                if len(key) > doublespace_threshold:
+                    lOut.append(f"{key}={translation}")
-                    lOut.append("")
+                    if params["break-long-lines"] and len(key) > doublespace_threshold:
+                        lOut.append("")
     return "\n".join(lOut) + '\n'
 
 # Writes a template.txt file
@@ -270,7 +303,7 @@ def write_template(templ_file, dkeyStrings, mod_name):
     # read existing template file to preserve comments
     existing_template = import_tr_file(templ_file)
     
-    text = strings_to_text(dkeyStrings, existing_template[0], mod_name)
+    text = strings_to_text(dkeyStrings, existing_template[0], mod_name, existing_template[2])
     mkdir_p(os.path.dirname(templ_file))
     with open(templ_file, "wt", encoding='utf-8') as template_file:
         template_file.write(text)
@@ -286,9 +319,13 @@ def read_lua_file_strings(lua_file):
         text = re.sub(pattern_concat, "", text)
 
         strings = []
-        for s in pattern_lua.findall(text):
+        for s in pattern_lua_s.findall(text):
             strings.append(s[1])
-        for s in pattern_lua_bracketed.findall(text):
+        for s in pattern_lua_bracketed_s.findall(text):
+            strings.append(s)
+        for s in pattern_lua_fs.findall(text):
+            strings.append(s[1])
+        for s in pattern_lua_bracketed_fs.findall(text):
             strings.append(s)
                 
         for s in strings:
@@ -306,9 +343,11 @@ def read_lua_file_strings(lua_file):
 # returns both a dictionary of translations
 # and the full original source text so that the new text
 # can be compared to it for changes.
+# Returns also header comments in the third return value.
 def import_tr_file(tr_file):
     dOut = {}
     text = None
+    header_comment = None
     if os.path.exists(tr_file):
         with open(tr_file, "r", encoding='utf-8') as existing_file :
             # save the full text to allow for comparison
@@ -321,11 +360,21 @@ def import_tr_file(tr_file):
             latest_comment_block = None
             for line in existing_file.readlines():
                 line = line.rstrip('\n')
-                if line[:3] == "###":
+                if line.startswith("###"):
+                    if header_comment is None and not latest_comment_block is None:
+                        # Save header comments
+                        header_comment = latest_comment_block
+                        # Strip textdomain line
+                        tmp_h_c = ""
+                        for l in header_comment.split('\n'):
+                            if not l.startswith("# textdomain:"):
+                                tmp_h_c += l + '\n'
+                        header_comment = tmp_h_c
+
                     # Reset comment block if we hit a header
                     latest_comment_block = None
                     continue
-                if line[:1] == "#":
+                elif line.startswith("#"):
                     # Save the comment we're inside
                     if not latest_comment_block:
                         latest_comment_block = line
@@ -342,7 +391,7 @@ def import_tr_file(tr_file):
                         outval["comment"] = latest_comment_block
                     latest_comment_block = None
                     dOut[match.group(1)] = outval
-    return (dOut, text)
+    return (dOut, text, header_comment)
 
 # Walks all lua files in the mod folder, collects translatable strings,
 # and writes it to a template.txt file
@@ -381,7 +430,7 @@ def update_tr_file(dNew, mod_name, tr_file):
     dOld = tr_import[0]
     textOld = tr_import[1]
 
-    textNew = strings_to_text(dNew, dOld, mod_name)
+    textNew = strings_to_text(dNew, dOld, mod_name, tr_import[2])
 
     if textOld and textOld != textNew:
         print(f"{tr_file} has changed.")
@@ -404,23 +453,24 @@ def update_mod(folder):
             for tr_file in get_existing_tr_files(folder):
                 update_tr_file(data, modname, os.path.join(folder, "locale/", tr_file))
     else:
-        print("Unable to find modname in folder " + folder)
+        print(f"\033[31mUnable to find modname in folder {folder}.\033[0m", file=_stderr)
+        exit(1)
 
 # Determines if the folder being pointed to is a mod or a mod pack
 # and then runs update_mod accordingly
 def update_folder(folder):
     is_modpack = os.path.exists(os.path.join(folder, "modpack.txt")) or os.path.exists(os.path.join(folder, "modpack.conf"))
     if is_modpack:
-        subfolders = [f.path for f in os.scandir(folder) if f.is_dir()]
+        subfolders = [f.path for f in os.scandir(folder) if f.is_dir() and not f.name.startswith('.')]
         for subfolder in subfolders:
-            update_mod(subfolder + "/")
+            update_mod(subfolder)
     else:
         update_mod(folder)
     print("Done.")
 
 def run_all_subfolders(folder):
-    for modfolder in [f.path for f in os.scandir(folder) if f.is_dir()]:
+    for modfolder in [f.path for f in os.scandir(folder) if f.is_dir() and not f.name.startswith('.')]:
-        update_folder(modfolder + "/")
+        update_folder(modfolder)
 
 
 main()

init.lua

@@ -23,7 +23,7 @@ dofile(path.."/tools.lua")
 dofile(path.."/canapa.lua")
 dofile(path.."/node_ingot.lua")
 dofile(path.."/craftitem.lua")
---dofile(path.."/armor.lua")
+--dofile(path.."/clothing.lua")
 dofile(path.."/joint.lua")
 dofile(path.."/canapa_red.lua")
 dofile(path.."/craftred.lua")
@@ -32,12 +32,18 @@ dofile(path.."/wool.lua")
 dofile(path.."/eye_effect.lua")
 dofile(path.."/canapa_ice.lua")
 dofile(path.."/craftice.lua")
---dofile(path.."/ethereal.lua")
-
-
-if minetest.get_modpath("3d_armor") then
 dofile(path.."/armor.lua")
+
+if minetest.get_modpath("3D_armor") then
+dofile(path.."/armor.lua")
+end
+if minetest.get_modpath("clothing") then
+dofile(path.."/clothing.lua")
+dofile(path.."/clothing_recipes.lua")
 end
 if minetest.get_modpath("unified_inventory") then
 dofile(path.."/bag.lua")
 end
+if minetest.get_modpath("ropes") then
+dofile(path.."/rope.lua")
+end

joint.lua

@@ -1,5 +1,6 @@
 -- get Boilerplate for Translations
 local S = cannabis.S
+local path = cannabis.path
 
 	--[[minetest.register_craftitem("cannabis:joint_fumo_acceso", {
 	description = S("Joint of hash lit"),
@@ -85,7 +86,7 @@ local p = player:get_pos()
 
         
    	minetest.register_craftitem("cannabis:joint_fumo_acceso", {
-    description = "Joint of hash lit",
+    description = S("Joint of hash lit"),
     inventory_image = "joint_joint_fac.png",
     stack_max = 1,
     on_use = function(itemstack,player,pointed_thing)
@@ -119,7 +120,7 @@ local p = player:get_pos()
 --_______________________________________________________________________FUMO ACCESO CONSUMATO_______________________________________________________
                  
  minetest.register_craftitem("cannabis:joint_fumo_acceso_m", {
-    description = "Joint of hash lit",
+    description = S("Half Joint of hash lit"),
     inventory_image = "joint_joint_fac_m.png",
     stack_max = 1,
     on_use = function(itemstack,player,pointed_thing)
@@ -188,7 +189,7 @@ local p = player:get_pos()
 --_______________________________________________________________________E. VERDE CONSUMATA_______________________________________
             
 	   minetest.register_craftitem("cannabis:joint_erba_acceso_m", {
-    description = "Joint of weed lit",
+    description = S("Half Joint of weed lit"),
     inventory_image = "joint_joint_cac_m.png",
     stack_max = 1,
     on_use = function(itemstack,player,pointed_thing)
@@ -221,7 +222,7 @@ local p = player:get_pos()
 --_______________________________________________________________________E. ROSSA______________________________________
 
 	   minetest.register_craftitem("cannabis:joint_erba_rossa_acceso", {
-	description = S("Joint of weed lit"),
+	description = S("Joint of red weed lit"),
 	inventory_image = "joint_joint_cacr.png",
     stack_max = 1 ,
     on_use =function(itemstack,player,pointed_thing)
@@ -255,7 +256,7 @@ local p = player:get_pos()
 --_______________________________________________________________________E.ROSSA ACCESA CONSUMATA_______________________
             
 	minetest.register_craftitem("cannabis:joint_erba_rossa_acceso_m", {
-    description = "Joint of weed lit",
+    description = S("Half Joint of red weed lit"),
     inventory_image = "joint_joint_cacr_m.png",
     stack_max = 1,
     on_use = function(itemstack,player,pointed_thing)
@@ -322,7 +323,7 @@ local p = player:get_pos()
 --_______________________________________________________________________E. ICE ACCESA CONSUMATA_______________________________
             
 	  minetest.register_craftitem("cannabis:joint_erba_ice_acceso_m", {
-    description = "Joint of ice_weed lit",
+    description = S("Half Joint of ice_weed lit"),
     inventory_image = "joint_joint_caci_m.png",
     stack_max = 1,
     on_use = function(itemstack,player,pointed_thing)

locale/cannabis.de.tr

@@ -1,135 +1,101 @@
 # textdomain: cannabis
-
-
-### armor.lua ###
-
- Boots= Stiefel
- Chestplate= Brustpanzer
  Helmet= Helm
- Hemp Shield= Hanfschild
+ Chestplate= Brustpanzer
  Leggings= Hose
-
+ Boots= Stiefel
-### bag.lua ###
+ Hemp Shield= Hanfschild
-
-Large Bob Bag= BOB Tasche Breit
-Medium Bob Bag= BOB Tasche Mittel
 Small Bob Bag= BOB Tasche Klein
-
+Medium Bob Bag= BOB Tasche Mittel
-### canapa.lua ###
+Large Bob Bag= BOB Tasche Breit
-
 Hemp=Hanf
-Hemp (climbing plant)=Hanf (kletternde Pflanze)
-Hemp (flowering)=Hanf (blühend)
 Hemp (seedling)=Hanf (Sämling)
 Hemp (sproutling)=Hanf (sprießend)
-
+Hemp (flowering)=Hanf (blühend)
-### canapa_ice.lua ###
+Hemp (climbing plant)=Hanf (kletternde Pflanze)
-
-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)
-
+Hemp ice (sproutling)=Gletscherhanf (sprießend)
-### canapa_red.lua ###
+Hemp ice (climbing plant)=Gletscherhanf (kletternde Pflanze)
-
+Hemp (Ice flowering)=Gletscherhanf
-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)
-
+Hemp red (sproutling)=Roter Hanf (Sämling)
-### craftice.lua ###
+Hemp red (climbing plant)=Roter Hanf (kletternde Pflanze)
-
+Hemp (Red flowering)=Hanf (Rot blühend)
 Hemp ice Flower= Gletscherhanfblume
-
-### craftice.lua ###
-### craftitem.lua ###
-### craftred.lua ###
-
-Hemp Leaves=Hanfblätter
 Hemp Seed=Hanfsamen
-
+Hemp Leaves=Hanfblätter
-### craftitem.lua ###
-
-BioFuel=BioKraftstoff
-Bread=Brot
-Cloth=
 Fiber=Faser
-Flour=Mehl
+BioFuel=BioKraftstoff
-Hemp Flower=Hanfblume
-Hemp Glue=Hanfkleber
-Hemp Oil=Hanföl
-Hemp Resin=Hanfharz
-Paper=Papier
 Plastic=Plastik
-
+Cloth=
-### craftred.lua ###
+Paper=Papier
-
+Flour=Mehl
+Bread=Brot
+Hemp Flower=Hanfblume
+Hemp Resin=Hanfharz
+Hemp Oil=Hanföl
+Hemp Glue=Hanfkleber
 Hemp red Flower=Roter Hanf Blüte
-
-### joint.lua ###
-
-Filter=Filter
-Filters pack=Filterpaket
-Flowering chopped=blühend gehäckselt
-Hash melted=Haschisch geschmolzen
-Ice flowering chopped=
 Joint of hash lit=Haschisch Joint angezündet
 Joint of hash unlit=Haschisch Joint nicht angezündet
-Joint of ice_weed lit=
-Joint of ice_weed unlit=
-Joint of red_weed unlit=
-Joint of weed lit=Joint aus Gras angezündet
 Joint of weed unlit=Joint aus Gras nicht angezündet
-Lighter=Feuerzeug
+Joint of red_weed unlit=
+Joint of ice_weed unlit=
+Half Joint of hash lit=
+Joint of weed lit=Joint aus Gras angezündet
+Half Joint of weed lit=
+Joint of red weed lit=
+Half Joint of red weed lit=
+Joint of ice_weed lit=
+Half Joint of ice_weed lit=
+Flowering chopped=blühend gehäckselt
 Red flowering chopped=
+Ice flowering chopped=
+Hash melted=Haschisch geschmolzen
 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 and red flowering chopped =
 Rolling paper with hemp leaves and ice flowering chopped =
 Rolling paper with hemp leaves and melted hash=
-Rolling paper with hemp leaves and red flowering chopped =
+Filters pack=Filterpaket
-
+Filter=Filter
-### node_ingot.lua ###
+Lighter=Feuerzeug
-
-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
-Ice Leaves Block=
-Leaves Block=Blätterblock
-Leaves Ingot=Blätterbarren
 Mixed HR Ingot=Gemischter HR Barren
+Fiber Ingot=Faserbarren
+Leaves Ingot=Blätterbarren
+High Performance Ingot=Hochwertiger Barren
+Fabric Ingot=Stoffbarren
+Adminh Ingot=Adminh Barren
+High Performance Block Hemp=Hochwertiger Hanfblock
+Leaves Block=Blätterblock
 Red Leaves Block=Roter Blätterblock
-
+Ice Leaves Block=
-### tools.lua ###
+Fabric Block=Stoffblock
-
+High Performance Block=Hochwertiger Block
-Hemp Adminh Pickaxe=Hanf Admin hochwertige Spitzhacke
+Fiber Block=Faserblock
-Hemp Bronze Axe= Hanf Bronze Axt
+Adminh Block=Adminh Block
-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 Bronze Pickaxe=Hanf Bronze Spitzhacke
+Hemp Mese Pickaxe=Hanf Mese Spitzhacke
+Hemp Diamond Pickaxe=Hanf Diamant Spitzhacke
+Hemp High Pickaxe=Hanf hochwertige Spitzhacke
+Hemp Adminh Pickaxe=Hanf Admin hochwertige Spitzhacke
+Hemp High Shovel=Hanf hochwertige Schaufel
 Hemp Steel Shovel=Hanf Eisen Schaufel
+Hemp Bronze Shovel=Hanf Bronze Schaufel
+Hemp Mese Shovel=Hanf Mese Schaufel
+Hemp Diamond Shovel=Hanf Diamant Schaufel
+Hemp Steel Axe=Hanf Eisen Axt
+Hemp Bronze Axe= Hanf Bronze Axt
+Hemp Mese Axe=Hanf Mese Axt
+Hemp Diamond Axe=Hanf Diamant Axt
+Hemp High Performance Axe=Hanf Hochwertige Axt
 Hemp Steel Sword=Hanf Eisen Schwert
+Hemp Bronze Sword=Hanf Bronze Schaufel
+Hemp Mese Sword=Hanf Mese Schwert
+Hemp Diamond Sword=Hanf Diamant Schwert
+Hemp High Performance Sword=Hanf Hochwertiges Schwert
 
 
 ##### not used anymore #####

locale/cannabis.de.tr.old

@@ -1,146 +1,100 @@
 # textdomain: cannabis
 
-
-### armor.lua ###
-
- Boots= Stiefel
- Chestplate= Brustpanzer
  Helmet= Helm
- Hemp Shield= Hanfschild
+ Chestplate= Brustpanzer
  Leggings= Hose
-
+ Boots= Stiefel
-### bag.lua ###
+ Hemp Shield= Hanfschild
-
-Large Bob Bag= BOB Tasche Breit
-Medium Bob Bag= BOB Tasche Mittel
 Small Bob Bag= BOB Tasche Klein
-
+Medium Bob Bag= BOB Tasche Mittel
-### canapa.lua ###
+Large Bob Bag= BOB Tasche Breit
-
 Hemp=Hanf
-Hemp (climbing plant)=Hanf (kletternde Pflanze)
-Hemp (flowering)=Hanf (blühend)
 Hemp (seedling)=Hanf (Sämling)
 Hemp (sproutling)=Hanf (sprießend)
-
+Hemp (flowering)=Hanf (blühend)
-### canapa_ice.lua ###
+Hemp (climbing plant)=Hanf (kletternde Pflanze)
-
-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)
-
+Hemp ice (sproutling)=Gletscherhanf (sprießend)
-### canapa_red.lua ###
+Hemp ice (climbing plant)=Gletscherhanf (kletternde Pflanze)
-
+Hemp (Ice flowering)=Gletscherhanf
-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)
-
+Hemp red (sproutling)=Roter Hanf (Sämling)
-### craftice.lua ###
+Hemp red (climbing plant)=Roter Hanf (kletternde Pflanze)
-
+Hemp (Red flowering)=Hanf (Rot blühend)
 Hemp ice Flower= Gletscherhanfblume
-
-### craftice.lua ###
-### craftitem.lua ###
-### craftred.lua ###
-
-Hemp Leaves=Hanfblätter
 Hemp Seed=Hanfsamen
-
+Hemp Leaves=Hanfblätter
-### craftitem.lua ###
-
-BioFuel=BioKraftstoff
-Bread=Brot
-Cloth=
 Fiber=Faser
-Flour=Mehl
+BioFuel=BioKraftstoff
-Hemp Flower=Hanfblume
-Hemp Glue=Hanfkleber
-Hemp Oil=Hanföl
-Hemp Resin=Hanfharz
-Paper=Papier
 Plastic=Plastik
-
+Cloth=
-### craftred.lua ###
+Paper=Papier
-
+Flour=Mehl
+Bread=Brot
+Hemp Flower=Hanfblume
+Hemp Resin=Hanfharz
+Hemp Oil=Hanföl
+Hemp Glue=Hanfkleber
 Hemp red Flower=Roter Hanf Blüte
-
-### joint.lua ###
-
-Ice flowering chopped=
-Joint of ice_weed lit=
-Joint of ice_weed unlit=
-Joint of red_weed unlit=
-Red flowering chopped=
-Rolling paper with hemp leaves and ice flowering chopped =
-Rolling paper with hemp leaves and melted hash=
-Rolling paper with hemp leaves and red flowering chopped =
-
-### joint.lua ###
-### o_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
+Joint of red_weed unlit=
+Joint of ice_weed unlit=
+Joint of weed lit=Joint aus Gras angezündet
+Joint of ice_weed lit=
+Flowering chopped=blühend gehäckselt
+Red flowering chopped=
+Ice flowering chopped=
+Hash melted=Haschisch geschmolzen
 Rolling paper=Zigarettenpapier
 Rolling paper with hemp leaves and flowering chopped =Zigarettenpapier mit Hanfblättern und gehäckselten Blüten
-lighter=
+Rolling paper with hemp leaves and red flowering chopped =
-
+Rolling paper with hemp leaves and ice flowering chopped =
-### node_ingot.lua ###
+Rolling paper with hemp leaves and melted hash=
-
+Filters pack=Filterpaket
-Adminh Block=Adminh Block
+Filter=Filter
-Adminh Ingot=Adminh Barren
+Lighter=Feuerzeug
-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
-Ice Leaves Block=
-Leaves Block=Blätterblock
-Leaves Ingot=Blätterbarren
 Mixed HR Ingot=Gemischter HR Barren
+Fiber Ingot=Faserbarren
+Leaves Ingot=Blätterbarren
+High Performance Ingot=Hochwertiger Barren
+Fabric Ingot=Stoffbarren
+Adminh Ingot=Adminh Barren
+High Performance Block Hemp=Hochwertiger Hanfblock
+Leaves Block=Blätterblock
 Red Leaves Block=Roter Blätterblock
-
+Ice Leaves Block=
-### o_joint.lua ###
+Fabric Block=Stoffblock
-
+High Performance Block=Hochwertiger Block
-Rolling paper with hemp leaves melted hash=Zigarettenpapier mit Hanfblättern und geschmolzenem Haschisch
+Fiber Block=Faserblock
-
+Adminh Block=Adminh Block
-### tools.lua ###
-
-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 Bronze Pickaxe=Hanf Bronze Spitzhacke
+Hemp Mese Pickaxe=Hanf Mese Spitzhacke
+Hemp Diamond Pickaxe=Hanf Diamant Spitzhacke
+Hemp High Pickaxe=Hanf hochwertige Spitzhacke
+Hemp Adminh Pickaxe=Hanf Admin hochwertige Spitzhacke
+Hemp High Shovel=Hanf hochwertige Schaufel
 Hemp Steel Shovel=Hanf Eisen Schaufel
+Hemp Bronze Shovel=Hanf Bronze Schaufel
+Hemp Mese Shovel=Hanf Mese Schaufel
+Hemp Diamond Shovel=Hanf Diamant Schaufel
+Hemp Steel Axe=Hanf Eisen Axt
+Hemp Bronze Axe= Hanf Bronze Axt
+Hemp Mese Axe=Hanf Mese Axt
+Hemp Diamond Axe=Hanf Diamant Axt
+Hemp High Performance Axe=Hanf Hochwertige Axt
 Hemp Steel Sword=Hanf Eisen Schwert
+Hemp Bronze Sword=Hanf Bronze Schaufel
+Hemp Mese Sword=Hanf Mese Schwert
+Hemp Diamond Sword=Hanf Diamant Schwert
+Hemp High Performance Sword=Hanf Hochwertiges Schwert
 
 
 ##### not used anymore #####
 
-Lighter=Feuerzeug
+Rolling paper with hemp leaves melted hash=Zigarettenpapier mit Hanfblättern und geschmolzenem Haschisch
 Hemp Admin High Performance Sword=Hanf Admin hochwertiges Schwert

locale/cannabis.it.tr

@@ -1,132 +1,98 @@
 # textdomain: cannabis
-
-
-### armor.lua ###
-
- Boots=Stivali
- Chestplate=Corazza
  Helmet=Elmo
- Hemp Shield= Scudo di canapa
+ Chestplate=Corazza
  Leggings=Gambali
-
+ Boots=Stivali
-### bag.lua ###
+ Hemp Shield= Scudo di canapa
-
-Large Bob Bag= Borsa BOB larga
-Medium Bob Bag= Borsa BOB media
 Small Bob Bag= Borsa BOB piccola
-
+Medium Bob Bag= Borsa BOB media
-### canapa.lua ###
+Large Bob Bag= Borsa BOB larga
-
 Hemp=Canapa
-Hemp (climbing plant)=Canapa (rampicante)
-Hemp (flowering)=Canapa (infiorescena)
 Hemp (seedling)=Canapa (piantina)
 Hemp (sproutling)=Canapa (germoglio)
-
+Hemp (flowering)=Canapa (infiorescena)
-### canapa_ice.lua ###
+Hemp (climbing plant)=Canapa (rampicante)
-
-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)
-
+Hemp ice (sproutling)=Canapa Glaciale (piantina)
-### canapa_red.lua ###
+Hemp ice (climbing plant)=Canapa Glaciale(rampicante)
-
+Hemp (Ice flowering)= Inffiorescenza di canapa Glaciale
-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)
-
+Hemp red (sproutling)=Canapa rossa (piantina)
-### craftice.lua ###
+Hemp red (climbing plant)=Canapa rossa (rampicante)
-
+Hemp (Red flowering)=Canapa rossa (infiorescena)
 Hemp ice Flower= Fiore di canapa glaciale
-
-### craftice.lua ###
-### craftitem.lua ###
-### craftred.lua ###
-
-Hemp Leaves= Foglie di canapa
 Hemp Seed= Semi di canapa
-
+Hemp Leaves= Foglie di canapa
-### craftitem.lua ###
-
-BioFuel=BioCarburante
-Bread=Pane
-Cloth= Stoffa
 Fiber=Fibra
-Flour=Farina
+BioFuel=BioCarburante
-Hemp Flower=Fiore di Canapa 
-Hemp Glue=Colla di Canapa 
-Hemp Oil=Olio di Canapa 
-Hemp Resin=Resina di Canapa
-Paper=Carta
 Plastic=Plastica
-
+Cloth= Stoffa
-### craftred.lua ###
+Paper=Carta
-
+Flour=Farina
+Bread=Pane
+Hemp Flower=Fiore di Canapa 
+Hemp Resin=Resina di Canapa
+Hemp Oil=Olio di Canapa 
+Hemp Glue=Colla di Canapa 
 Hemp red Flower=Fiore di canapa rossa
-
-### joint.lua ###
-
-Filter=Filtro
-Filters pack=Pacchetto di filtri
-Flowering chopped=Infiorescenza triturata
-Hash melted=Fumo sciolto
-Ice flowering chopped=Infiorescenza canapa_ice tritata
 Joint of hash lit=Sigaretta con fumo accesa
 Joint of hash unlit=Sigaretta con fumo spenta
-Joint of ice_weed lit= Sigaretta di canapa_ice accesa
-Joint of ice_weed unlit=Sigaretta di canapa spenta
-Joint of red_weed unlit=Sigaretta di canapa_rossa spenta
-Joint of weed lit=Sigaretta di erba acceso
 Joint of weed unlit=Sigaretta di erba spenta
-Lighter=Accendino
+Joint of red_weed unlit=Sigaretta di canapa_rossa spenta
+Joint of ice_weed unlit=Sigaretta di canapa spenta
+Half Joint of hash lit=
+Joint of weed lit=Sigaretta di erba acceso
+Half Joint of weed lit=
+Joint of red weed lit=
+Half Joint of red weed lit=
+Joint of ice_weed lit= Sigaretta di canapa_ice accesa
+Half Joint of ice_weed lit=
+Flowering chopped=Infiorescenza triturata
 Red flowering chopped= Infiorescenza canapa_rossa tritata
+Ice flowering chopped=Infiorescenza canapa_ice tritata
+Hash melted=Fumo sciolto
 Rolling paper=Cartine
 Rolling paper with hemp leaves and flowering chopped =Cartina con foglie e cime di canapa
+Rolling paper with hemp leaves and red flowering chopped = Cartina con infiorescenza di canapa_rossa e foglie di canapa
 Rolling paper with hemp leaves and ice flowering chopped =Cartina con infiorescenza di canapa_ice e foglie di canapa
 Rolling paper with hemp leaves and melted hash=Cartina con resina e foglie di canapa
-Rolling paper with hemp leaves and red flowering chopped = Cartina con infiorescenza di canapa_rossa e foglie di canapa
+Filters pack=Pacchetto di filtri
-
+Filter=Filtro
-### node_ingot.lua ###
+Lighter=Accendino
-
-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
-Ice Leaves Block=Blocco di foglie canapa_ice
-Leaves Block=Blocco di foglie
-Leaves Ingot=Lingotto di foglie
 Mixed HR Ingot=Lingotto mescola HR
+Fiber Ingot=Lingotto di fibra
+Leaves Ingot=Lingotto di foglie
+High Performance Ingot=Lingotto alte prestazioni
+Fabric Ingot=Lingotto tessuto
+Adminh Ingot=Lingotto Adminh
+High Performance Block Hemp=Blocco alla fibra di canapa ad alte prestazioni
+Leaves Block=Blocco di foglie
 Red Leaves Block=Blocco di foglie rosse
-
+Ice Leaves Block=Blocco di foglie canapa_ice
-### tools.lua ###
+Fabric Block=Blocco di Tessuto
-
+High Performance Block=Blocco ad alte prestazioni
-Hemp Adminh Pickaxe=Piccone Adminh di canapa
+Fiber Block=Blocco di fibra
-Hemp Bronze Axe=Ascia di canapa e bronzo
+Adminh Block=Blocco Adminh (indistruttibile)
-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 Bronze Pickaxe=Piccone di canapa e bronzo
+Hemp Mese Pickaxe=Piccone di canapa e mese
+Hemp Diamond Pickaxe=Picconedi canapa e diamante
+Hemp High Pickaxe=Piccone di canapa ad alte prestazioni
+Hemp Adminh Pickaxe=Piccone Adminh di canapa
+Hemp High Shovel=Pala di canapa ad alte prestazioni
 Hemp Steel Shovel=Pala di canapa ed acciaio
+Hemp Bronze Shovel=Pala di canapa e bronzo
+Hemp Mese Shovel=Pala di canapa e mese
+Hemp Diamond Shovel=Pala di canapa e diamante
+Hemp Steel Axe=Ascia di canapa ed acciaio
+Hemp Bronze Axe=Ascia di canapa e bronzo
+Hemp Mese Axe=Ascia di canapa e mese
+Hemp Diamond Axe=Ascia di canapa e diamante
+Hemp High Performance Axe=Ascia di canapa ad alte prestazioni
 Hemp Steel Sword=Spada di canapa ed acciaio
+Hemp Bronze Sword=Spada di canapa e bronzo
+Hemp Mese Sword=Spada di canapa e mese
+Hemp Diamond Sword=Spada di canapa e diamante
+Hemp High Performance Sword=Spada di canapa ad alte prestazioni

locale/cannabis.it.tr.old

@@ -1,139 +1,94 @@
 # textdomain: cannabis
 
-
-### armor.lua ###
-
- Boots=Stivali
- Chestplate=Corazza
  Helmet=Elmo
- Hemp Shield= Scudo di canapa
+ Chestplate=Corazza
  Leggings=Gambali
-
+ Boots=Stivali
-### bag.lua ###
+ Hemp Shield= Scudo di canapa
-
-Large Bob Bag= Borsa BOB larga
-Medium Bob Bag= Borsa BOB media
 Small Bob Bag= Borsa BOB piccola
-
+Medium Bob Bag= Borsa BOB media
-### canapa.lua ###
+Large Bob Bag= Borsa BOB larga
-
 Hemp=Canapa
-Hemp (climbing plant)=Canapa (rampicante)
-Hemp (flowering)=Canapa (infiorescena)
 Hemp (seedling)=Canapa (piantina)
 Hemp (sproutling)=Canapa (germoglio)
-
+Hemp (flowering)=Canapa (infiorescena)
-### canapa_ice.lua ###
+Hemp (climbing plant)=Canapa (rampicante)
-
-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)
-
+Hemp ice (sproutling)=Canapa Glaciale (piantina)
-### canapa_red.lua ###
+Hemp ice (climbing plant)=Canapa Glaciale(rampicante)
-
+Hemp (Ice flowering)= Inffiorescenza di canapa Glaciale
-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)
-
+Hemp red (sproutling)=Canapa rossa (piantina)
-### craftice.lua ###
+Hemp red (climbing plant)=Canapa rossa (rampicante)
-
+Hemp (Red flowering)=Canapa rossa (infiorescena)
 Hemp ice Flower= Fiore di canapa glaciale
-
-### craftice.lua ###
-### craftitem.lua ###
-### craftred.lua ###
-
-Hemp Leaves= Foglie di canapa
 Hemp Seed= Semi di canapa
-
+Hemp Leaves= Foglie di canapa
-### craftitem.lua ###
-
-BioFuel=BioCarburante
-Bread=Pane
-Cloth= Stoffa
 Fiber=Fibra
-Flour=Farina
+BioFuel=BioCarburante
-Hemp Flower=Fiore di Canapa 
-Hemp Glue=Colla di Canapa 
-Hemp Oil=Olio di Canapa 
-Hemp Resin=Resina di Canapa
-Paper=Carta
 Plastic=Plastica
-
+Cloth= Stoffa
-### craftred.lua ###
+Paper=Carta
-
+Flour=Farina
+Bread=Pane
+Hemp Flower=Fiore di Canapa 
+Hemp Resin=Resina di Canapa
+Hemp Oil=Olio di Canapa 
+Hemp Glue=Colla di Canapa 
 Hemp red Flower=Fiore di canapa rossa
-
-### joint.lua ###
-
-Ice flowering chopped=Infiorescenza canapa_ice tritata
-Joint of ice_weed lit= Sigaretta di canapa_ice accesa
-Joint of ice_weed unlit=Sigaretta di canapa spenta
-Joint of red_weed unlit=Sigaretta di canapa_rossa spenta
-Red flowering chopped= Infiorescenza canapa_rossa tritata
-Rolling paper with hemp leaves and ice flowering chopped =Cartina con infiorescenza di canapa_ice e foglie di canapa
-Rolling paper with hemp leaves and melted hash=Cartina con resina e foglie di canapa
-Rolling paper with hemp leaves and red flowering chopped = Cartina con infiorescenza di canapa_rossa e foglie di canapa
-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
+Joint of red_weed unlit=Sigaretta di canapa_rossa spenta
+Joint of ice_weed unlit=Sigaretta di canapa spenta
+Joint of weed lit=Sigaretta di erba acceso
+Joint of ice_weed lit= Sigaretta di canapa_ice accesa
+Flowering chopped=Infiorescenza triturata
+Red flowering chopped= Infiorescenza canapa_rossa tritata
+Ice flowering chopped=Infiorescenza canapa_ice tritata
+Hash melted=Fumo sciolto
 Rolling paper=Cartine
 Rolling paper with hemp leaves and flowering chopped =Cartina con foglie e cime di canapa
+Rolling paper with hemp leaves and red flowering chopped = Cartina con infiorescenza di canapa_rossa e foglie di canapa
+Rolling paper with hemp leaves and ice flowering chopped =Cartina con infiorescenza di canapa_ice e foglie di canapa
+Rolling paper with hemp leaves and melted hash=Cartina con resina e foglie di canapa
+Filters pack=Pacchetto di filtri
+Filter=Filtro
 Lighter=Accendino
-
-### 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
-Ice Leaves Block=Blocco di foglie canapa_ice
-Leaves Block=Blocco di foglie
-Leaves Ingot=Lingotto di foglie
 Mixed HR Ingot=Lingotto mescola HR
+Fiber Ingot=Lingotto di fibra
+Leaves Ingot=Lingotto di foglie
+High Performance Ingot=Lingotto alte prestazioni
+Fabric Ingot=Lingotto tessuto
+Adminh Ingot=Lingotto Adminh
+High Performance Block Hemp=Blocco alla fibra di canapa ad alte prestazioni
+Leaves Block=Blocco di foglie
 Red Leaves Block=Blocco di foglie rosse
-
+Ice Leaves Block=Blocco di foglie canapa_ice
-
+Fabric Block=Blocco di Tessuto
-
+High Performance Block=Blocco ad alte prestazioni
-
+Fiber Block=Blocco di fibra
-
+Adminh Block=Blocco Adminh (indistruttibile)
-### tools.lua ###
-
-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 Bronze Pickaxe=Piccone di canapa e bronzo
+Hemp Mese Pickaxe=Piccone di canapa e mese
+Hemp Diamond Pickaxe=Picconedi canapa e diamante
+Hemp High Pickaxe=Piccone di canapa ad alte prestazioni
+Hemp Adminh Pickaxe=Piccone Adminh di canapa
+Hemp High Shovel=Pala di canapa ad alte prestazioni
 Hemp Steel Shovel=Pala di canapa ed acciaio
+Hemp Bronze Shovel=Pala di canapa e bronzo
+Hemp Mese Shovel=Pala di canapa e mese
+Hemp Diamond Shovel=Pala di canapa e diamante
+Hemp Steel Axe=Ascia di canapa ed acciaio
+Hemp Bronze Axe=Ascia di canapa e bronzo
+Hemp Mese Axe=Ascia di canapa e mese
+Hemp Diamond Axe=Ascia di canapa e diamante
+Hemp High Performance Axe=Ascia di canapa ad alte prestazioni
 Hemp Steel Sword=Spada di canapa ed acciaio
-
+Hemp Bronze Sword=Spada di canapa e bronzo
-
+Hemp Mese Sword=Spada di canapa e mese
-
+Hemp Diamond Sword=Spada di canapa e diamante
+Hemp High Performance Sword=Spada di canapa ad alte prestazioni

locale/template.txt

@@ -1,132 +1,98 @@
 # textdomain: cannabis
-
-
-### armor.lua ###
-
- Boots=
- Chestplate=
  Helmet=
- Hemp Shield=
+ Chestplate=
  Leggings=
-
+ Boots=
-### bag.lua ###
+ Hemp Shield=
-
-Large Bob Bag=
-Medium Bob Bag=
 Small Bob Bag=
-
+Medium Bob Bag=
-### canapa.lua ###
+Large Bob Bag=
-
 Hemp=
-Hemp (climbing plant)=
-Hemp (flowering)=
 Hemp (seedling)=
 Hemp (sproutling)=
-
+Hemp (flowering)=
-### canapa_ice.lua ###
+Hemp (climbing plant)=
-
-Hemp (Ice flowering)=
 Hemp ice=
-Hemp ice (climbing plant)=
-Hemp ice (sproutling)=
 Hemp ice(seedling)=
-
+Hemp ice (sproutling)=
-### canapa_red.lua ###
+Hemp ice (climbing plant)=
-
+Hemp (Ice flowering)=
-Hemp (Red flowering)=
 Hemp red=
-Hemp red (climbing plant)=
-Hemp red (sproutling)=
 Hemp red(seedling)=
-
+Hemp red (sproutling)=
-### craftice.lua ###
+Hemp red (climbing plant)=
-
+Hemp (Red flowering)=
 Hemp ice Flower=
-
-### craftice.lua ###
-### craftitem.lua ###
-### craftred.lua ###
-
-Hemp Leaves=
 Hemp Seed=
-
+Hemp Leaves=
-### craftitem.lua ###
-
-BioFuel=
-Bread=
-Cloth=
 Fiber=
-Flour=
+BioFuel=
-Hemp Flower=
-Hemp Glue=
-Hemp Oil=
-Hemp Resin=
-Paper=
 Plastic=
-
+Cloth=
-### craftred.lua ###
+Paper=
-
+Flour=
+Bread=
+Hemp Flower=
+Hemp Resin=
+Hemp Oil=
+Hemp Glue=
 Hemp red Flower=
-
-### joint.lua ###
-
-Filter=
-Filters pack=
-Flowering chopped=
-Hash melted=
-Ice flowering chopped=
 Joint of hash lit=
 Joint of hash unlit=
-Joint of ice_weed lit=
-Joint of ice_weed unlit=
-Joint of red_weed unlit=
-Joint of weed lit=
 Joint of weed unlit=
-Lighter=
+Joint of red_weed unlit=
+Joint of ice_weed unlit=
+Half Joint of hash lit=
+Joint of weed lit=
+Half Joint of weed lit=
+Joint of red weed lit=
+Half Joint of red weed lit=
+Joint of ice_weed lit=
+Half Joint of ice_weed lit=
+Flowering chopped=
 Red flowering chopped=
+Ice flowering chopped=
+Hash melted=
 Rolling paper=
 Rolling paper with hemp leaves and flowering chopped =
+Rolling paper with hemp leaves and red flowering chopped =
 Rolling paper with hemp leaves and ice flowering chopped =
 Rolling paper with hemp leaves and melted hash=
-Rolling paper with hemp leaves and red flowering chopped =
+Filters pack=
-
+Filter=
-### node_ingot.lua ###
+Lighter=
-
-Adminh Block=
-Adminh Ingot=
-Fabric Block=
-Fabric Ingot=
-Fiber Block=
-Fiber Ingot=
-High Performance Block=
-High Performance Block Hemp=
-High Performance Ingot=
-Ice Leaves Block=
-Leaves Block=
-Leaves Ingot=
 Mixed HR Ingot=
+Fiber Ingot=
+Leaves Ingot=
+High Performance Ingot=
+Fabric Ingot=
+Adminh Ingot=
+High Performance Block Hemp=
+Leaves Block=
 Red Leaves Block=
-
+Ice Leaves Block=
-### tools.lua ###
+Fabric Block=
-
+High Performance Block=
-Hemp Adminh Pickaxe=
+Fiber Block=
-Hemp Bronze Axe=
+Adminh Block=
-Hemp Bronze Pickaxe=
-Hemp Bronze Shovel=
-Hemp Bronze Sword=
-Hemp Diamond Axe=
-Hemp Diamond Pickaxe=
-Hemp Diamond Shovel=
-Hemp Diamond Sword=
-Hemp High Performance Axe=
-Hemp High Performance Sword=
-Hemp High Pickaxe=
-Hemp High Shovel=
-Hemp Mese Axe=
-Hemp Mese Pickaxe=
-Hemp Mese Shovel=
-Hemp Mese Sword=
-Hemp Steel Axe=
 Hemp Steel Pickaxe=
+Hemp Bronze Pickaxe=
+Hemp Mese Pickaxe=
+Hemp Diamond Pickaxe=
+Hemp High Pickaxe=
+Hemp Adminh Pickaxe=
+Hemp High Shovel=
 Hemp Steel Shovel=
+Hemp Bronze Shovel=
+Hemp Mese Shovel=
+Hemp Diamond Shovel=
+Hemp Steel Axe=
+Hemp Bronze Axe=
+Hemp Mese Axe=
+Hemp Diamond Axe=
+Hemp High Performance Axe=
 Hemp Steel Sword=
+Hemp Bronze Sword=
+Hemp Mese Sword=
+Hemp Diamond Sword=
+Hemp High Performance Sword=

mod.conf

@@ -4,3 +4,4 @@ optional_default = 3d_armor,fire,ropes,unified_inventory,wool
 author = ulla
 title = Hemp mod 
 description = Hemp with all possible utility  see readme.md | La canapa e tutti i suoi usi guardare il readme.md
+release = 10228