diff --git a/cannabis/LICENSE.txt b/LICENSE.txt similarity index 100% rename from cannabis/LICENSE.txt rename to LICENSE.txt diff --git a/cannabis/README.md b/README.md similarity index 100% rename from cannabis/README.md rename to README.md diff --git a/cannabis/armor.lua b/armor.lua similarity index 100% rename from cannabis/armor.lua rename to armor.lua diff --git a/cannabis/canapa.lua b/canapa.lua similarity index 100% rename from cannabis/canapa.lua rename to canapa.lua diff --git a/cannabis/canapa_rossa.lua b/canapa_rossa.lua similarity index 100% rename from cannabis/canapa_rossa.lua rename to canapa_rossa.lua diff --git a/cannabis/locale/cannabis.de.tr.old b/cannabis/locale/cannabis.de.tr.old deleted file mode 100644 index 94e00f7..0000000 --- a/cannabis/locale/cannabis.de.tr.old +++ /dev/null @@ -1,109 +0,0 @@ -# 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 (seedling)=Hanf (Sämling) -Hemp (sproutling)=Hanf (Sprießend) - -### canapa_rossa.lua ### - -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= -Bread=Brot -Fiber=Faser -Flour=Mehl -Hemp Flower=Hanfblume -Hemp Glue=Hanfkleber -Hemp Oil=Hanföl -Hemp Resin= -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= -Filters pack= -Flowering chopped= -Hash melted= -Joint of hash lit= -Joint of hash unlit= -Joint of weed lit= -Joint of weed unlit= -Lighter= -Rolling paper= -Rolling paper with hemp leaves and flowering chopped = -Rolling paper with hemp leaves melted hash= - -### 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 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 - - -##### not used anymore ##### - -Fuel=Kraftstoff -Hemp Raisin=Hanfrosine -Hemp Admin High Performance Sword=Hanf Admin hochwertiges Schwert diff --git a/cannabis/locale/cannabis.it.tr.old b/cannabis/locale/cannabis.it.tr.old deleted file mode 100644 index 27dc3f3..0000000 --- a/cannabis/locale/cannabis.it.tr.old +++ /dev/null @@ -1,102 +0,0 @@ -# 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 (seedling)=Canapa (piantina) -Hemp (sproutling)=Canapa (germoglio) - -### canapa_rossa.lua ### - -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 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/cannabis/locale/template.txt b/cannabis/locale/template.txt deleted file mode 100644 index 523f22d..0000000 --- a/cannabis/locale/template.txt +++ /dev/null @@ -1,104 +0,0 @@ -# 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)= -Hemp (seedling)=Canapa (piantina) -Hemp (sproutling)=Canapa (germoglio) - -### canapa_rossa.lua ### - -Hemp (Red flowering)= -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 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/cannabis/schematics/canapa.mts b/cannabis/schematics/canapa.mts deleted file mode 100644 index a4ba978..0000000 Binary files a/cannabis/schematics/canapa.mts and /dev/null differ diff --git a/cannabis/craftitem.lua b/craftitem.lua similarity index 100% rename from cannabis/craftitem.lua rename to craftitem.lua diff --git a/cannabis/craftred.lua b/craftred.lua similarity index 100% rename from cannabis/craftred.lua rename to craftred.lua diff --git a/cannabis/depends.txt b/depends.txt similarity index 100% rename from cannabis/depends.txt rename to depends.txt diff --git a/cannabis/i18n.py b/i18n.py similarity index 100% rename from cannabis/i18n.py rename to i18n.py diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..a589dd5 --- /dev/null +++ b/init.lua @@ -0,0 +1,30 @@ +--aliases +--minetest.get_modpath("cannabis") +minetest.register_alias("canapa","cannabis:canapa") + +--tools +cannabis = {} -- A global Object for the mod +cannabis.path = minetest.get_modpath("cannabis") -- The path of the mod +local path = cannabis.path + +-- Get Boilerplate to translate +local S +if(minetest.get_translator) then + S = minetest.get_translator(minetest.get_current_modname()) + +else + S = function ( s ) return s end + +end + +cannabis.S = S -- Stores the boilerplate for global access + +dofile(path.."/tools.lua") +dofile(path.."/canapa.lua") +dofile(path.."/node_ingot.lua") +dofile(path.."/craftitem.lua") +dofile(path.."/armor.lua") +dofile(path.."/joint.lua") +dofile(path.."/canapa_rossa.lua") +dofile(path.."/craftred.lua") +dofile(path.."/rope.lua") diff --git a/cannabis/joint.lua b/joint.lua similarity index 99% rename from cannabis/joint.lua rename to joint.lua index 319f725..1770674 100644 --- a/cannabis/joint.lua +++ b/joint.lua @@ -181,6 +181,4 @@ minetest.register_craft({ -- underwatercolor will be the value (one of the tables above) --for color, smokecolor in pairs(smokeCOLOR) do -- water - - --end diff --git a/cannabis/locale/cannabis.de.tr b/locale/cannabis.de.tr similarity index 74% rename from cannabis/locale/cannabis.de.tr rename to locale/cannabis.de.tr index 5d01087..a98aa7a 100644 --- a/cannabis/locale/cannabis.de.tr +++ b/locale/cannabis.de.tr @@ -13,13 +13,13 @@ Hemp=Hanf Hemp (climbing plant)=Hanf (kletternde Pflanze) -Hemp (flowering)= +Hemp (flowering)=Hanf (blühend) Hemp (seedling)=Hanf (Sämling) -Hemp (sproutling)=Hanf (Sprießend) +Hemp (sproutling)=Hanf (sprießend) ### canapa_rossa.lua ### -Hemp (Red flowering)= +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) @@ -27,14 +27,14 @@ Hemp red(seedling)=Roter Hanf (Sprießend) ### craftitem.lua ### -BioFuel= +BioFuel=BioKraftstoff Bread=Brot Fiber=Faser Flour=Mehl Hemp Flower=Hanfblume Hemp Glue=Hanfkleber Hemp Oil=Hanföl -Hemp Resin= +Hemp Resin=Hanfharz Paper=Papier Plastic=Plastik @@ -50,18 +50,18 @@ Hemp red Flower=Roter Hanf Blüte ### joint.lua ### -Filter= -Filters pack= -Flowering chopped= -Hash melted= -Joint of hash lit= -Joint of hash unlit= -Joint of weed lit= -Joint of weed unlit= -Lighter= -Rolling paper= -Rolling paper with hemp leaves and flowering chopped = -Rolling paper with hemp leaves melted hash= +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 ### @@ -81,6 +81,7 @@ 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 @@ -102,10 +103,3 @@ 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 ##### - -Fuel=Kraftstoff -Hemp Raisin=Hanfrosine -Hemp Admin High Performance Sword=Hanf Admin hochwertiges Schwert diff --git a/cannabis/locale/cannabis.it.tr b/locale/cannabis.it.tr similarity index 98% rename from cannabis/locale/cannabis.it.tr rename to locale/cannabis.it.tr index 2b670de..a79e6c0 100644 --- a/cannabis/locale/cannabis.it.tr +++ b/locale/cannabis.it.tr @@ -81,6 +81,7 @@ 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/template.txt b/locale/template.txt new file mode 100644 index 0000000..3f732fa --- /dev/null +++ b/locale/template.txt @@ -0,0 +1,105 @@ +# textdomain: cannabis + + +### armor.lua ### + + Boots= + Chestplate= + Helmet= + Hemp Shield= + Leggings= + +### canapa.lua ### + +Hemp= +Hemp (climbing plant)= +Hemp (flowering)= +Hemp (seedling)= +Hemp (sproutling)= + +### canapa_rossa.lua ### + +Hemp (Red flowering)= +Hemp red= +Hemp red (climbing plant)= +Hemp red (sproutling)= +Hemp red(seedling)= + +### craftitem.lua ### + +BioFuel= +Bread= +Fiber= +Flour= +Hemp Flower= +Hemp Glue= +Hemp Oil= +Hemp Resin= +Paper= +Plastic= + +### craftitem.lua ### +### craftred.lua ### + +Hemp Leaves= +Hemp Seed= + +### craftred.lua ### + +Hemp red Flower= + +### joint.lua ### + +Filter= +Filters pack= +Flowering chopped= +Hash melted= +Joint of hash lit= +Joint of hash unlit= +Joint of weed lit= +Joint of weed unlit= +Lighter= +Rolling paper= +Rolling paper with hemp leaves and flowering chopped = +Rolling paper with hemp leaves melted hash= + +### node_ingot.lua ### + +Adminh Block= +Adminh Ingot= +Fabric Block= +Fabric Ingot= +Fiber Block= +Fiber Ingot= +High Performance Block= +High Performance Block Hemp= +High Performance Ingot= +Leaves Block= +Leaves Ingot= +Mixed HR Ingot= +Red Leaves Block= + +### tools.lua ### + +Hemp Admin High Performance Sword= +Hemp Adminh Pickaxe= +Hemp Bronze Axe= +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 Steel Shovel= +Hemp Steel Sword= diff --git a/mod.conf b/mod.conf new file mode 100644 index 0000000..5fd0a19 --- /dev/null +++ b/mod.conf @@ -0,0 +1,3 @@ +name = cannabis +depends = default, fire +optional_default = 3d_armor, maptools diff --git a/cannabis/node_ingot.lua b/node_ingot.lua similarity index 100% rename from cannabis/node_ingot.lua rename to node_ingot.lua diff --git a/cannabis/rope.lua b/rope.lua similarity index 100% rename from cannabis/rope.lua rename to rope.lua diff --git a/cannabis/canapa.mts b/schematics/canapa.mts similarity index 100% rename from cannabis/canapa.mts rename to schematics/canapa.mts diff --git a/cannabis/sounds/0cannabis_canapa_s.ogg b/sounds/0cannabis_canapa_s.ogg similarity index 100% rename from cannabis/sounds/0cannabis_canapa_s.ogg rename to sounds/0cannabis_canapa_s.ogg diff --git a/cannabis/sounds/cannabis_canapa_s.ogg b/sounds/cannabis_canapa_s.ogg similarity index 100% rename from cannabis/sounds/cannabis_canapa_s.ogg rename to sounds/cannabis_canapa_s.ogg diff --git a/cannabis/sounds/cannabis_canapa_s2.ogg b/sounds/cannabis_canapa_s2.ogg similarity index 100% rename from cannabis/sounds/cannabis_canapa_s2.ogg rename to sounds/cannabis_canapa_s2.ogg diff --git a/cannabis/sounds/cannabis_canapa_s3.ogg b/sounds/cannabis_canapa_s3.ogg similarity index 100% rename from cannabis/sounds/cannabis_canapa_s3.ogg rename to sounds/cannabis_canapa_s3.ogg diff --git a/cannabis/textures/.directory b/textures/.directory similarity index 100% rename from cannabis/textures/.directory rename to textures/.directory diff --git a/cannabis/textures/1hemp_seedling.png b/textures/1hemp_seedling.png similarity index 100% rename from cannabis/textures/1hemp_seedling.png rename to textures/1hemp_seedling.png diff --git a/cannabis/textures/1hemp_seedling_red.png b/textures/1hemp_seedling_red.png similarity index 100% rename from cannabis/textures/1hemp_seedling_red.png rename to textures/1hemp_seedling_red.png diff --git a/cannabis/textures/adminh.png b/textures/adminh.png similarity index 100% rename from cannabis/textures/adminh.png rename to textures/adminh.png diff --git a/cannabis/textures/cannabis_adminh_block.png b/textures/cannabis_adminh_block.png similarity index 100% rename from cannabis/textures/cannabis_adminh_block.png rename to textures/cannabis_adminh_block.png diff --git a/cannabis/textures/cannabis_adminh_ingot.png b/textures/cannabis_adminh_ingot.png similarity index 100% rename from cannabis/textures/cannabis_adminh_ingot.png rename to textures/cannabis_adminh_ingot.png diff --git a/cannabis/textures/cannabis_armor_boots_fibra_preview.png b/textures/cannabis_armor_boots_fibra_preview.png similarity index 100% rename from cannabis/textures/cannabis_armor_boots_fibra_preview.png rename to textures/cannabis_armor_boots_fibra_preview.png diff --git a/cannabis/textures/cannabis_armor_boots_foglie_preview.png b/textures/cannabis_armor_boots_foglie_preview.png similarity index 100% rename from cannabis/textures/cannabis_armor_boots_foglie_preview.png rename to textures/cannabis_armor_boots_foglie_preview.png diff --git a/cannabis/textures/cannabis_armor_boots_high_preview.png b/textures/cannabis_armor_boots_high_preview.png similarity index 100% rename from cannabis/textures/cannabis_armor_boots_high_preview.png rename to textures/cannabis_armor_boots_high_preview.png diff --git a/cannabis/textures/cannabis_armor_boots_tessuto_preview.png b/textures/cannabis_armor_boots_tessuto_preview.png similarity index 100% rename from cannabis/textures/cannabis_armor_boots_tessuto_preview.png rename to textures/cannabis_armor_boots_tessuto_preview.png diff --git a/cannabis/textures/cannabis_armor_inv_boots_adminh.png b/textures/cannabis_armor_inv_boots_adminh.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_boots_adminh.png rename to textures/cannabis_armor_inv_boots_adminh.png diff --git a/cannabis/textures/cannabis_armor_inv_boots_fibra.png b/textures/cannabis_armor_inv_boots_fibra.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_boots_fibra.png rename to textures/cannabis_armor_inv_boots_fibra.png diff --git a/cannabis/textures/cannabis_armor_inv_boots_foglie.png b/textures/cannabis_armor_inv_boots_foglie.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_boots_foglie.png rename to textures/cannabis_armor_inv_boots_foglie.png diff --git a/cannabis/textures/cannabis_armor_inv_boots_high.png b/textures/cannabis_armor_inv_boots_high.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_boots_high.png rename to textures/cannabis_armor_inv_boots_high.png diff --git a/cannabis/textures/cannabis_armor_inv_boots_tessuto.png b/textures/cannabis_armor_inv_boots_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_boots_tessuto.png rename to textures/cannabis_armor_inv_boots_tessuto.png diff --git a/cannabis/textures/cannabis_armor_inv_chestplate_adminh.png b/textures/cannabis_armor_inv_chestplate_adminh.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_chestplate_adminh.png rename to textures/cannabis_armor_inv_chestplate_adminh.png diff --git a/cannabis/textures/cannabis_armor_inv_chestplate_fibra.png b/textures/cannabis_armor_inv_chestplate_fibra.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_chestplate_fibra.png rename to textures/cannabis_armor_inv_chestplate_fibra.png diff --git a/cannabis/textures/cannabis_armor_inv_chestplate_foglie.png b/textures/cannabis_armor_inv_chestplate_foglie.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_chestplate_foglie.png rename to textures/cannabis_armor_inv_chestplate_foglie.png diff --git a/cannabis/textures/cannabis_armor_inv_chestplate_high.png b/textures/cannabis_armor_inv_chestplate_high.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_chestplate_high.png rename to textures/cannabis_armor_inv_chestplate_high.png diff --git a/cannabis/textures/cannabis_armor_inv_chestplate_tessuto.png b/textures/cannabis_armor_inv_chestplate_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_chestplate_tessuto.png rename to textures/cannabis_armor_inv_chestplate_tessuto.png diff --git a/cannabis/textures/cannabis_armor_inv_helmet_adminh.png b/textures/cannabis_armor_inv_helmet_adminh.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_helmet_adminh.png rename to textures/cannabis_armor_inv_helmet_adminh.png diff --git a/cannabis/textures/cannabis_armor_inv_helmet_fibra.png b/textures/cannabis_armor_inv_helmet_fibra.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_helmet_fibra.png rename to textures/cannabis_armor_inv_helmet_fibra.png diff --git a/cannabis/textures/cannabis_armor_inv_helmet_foglie.png b/textures/cannabis_armor_inv_helmet_foglie.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_helmet_foglie.png rename to textures/cannabis_armor_inv_helmet_foglie.png diff --git a/cannabis/textures/cannabis_armor_inv_helmet_high.png b/textures/cannabis_armor_inv_helmet_high.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_helmet_high.png rename to textures/cannabis_armor_inv_helmet_high.png diff --git a/cannabis/textures/cannabis_armor_inv_helmet_tessuto.png b/textures/cannabis_armor_inv_helmet_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_helmet_tessuto.png rename to textures/cannabis_armor_inv_helmet_tessuto.png diff --git a/cannabis/textures/cannabis_armor_inv_leggings_adminh.png b/textures/cannabis_armor_inv_leggings_adminh.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_leggings_adminh.png rename to textures/cannabis_armor_inv_leggings_adminh.png diff --git a/cannabis/textures/cannabis_armor_inv_leggings_fibra.png b/textures/cannabis_armor_inv_leggings_fibra.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_leggings_fibra.png rename to textures/cannabis_armor_inv_leggings_fibra.png diff --git a/cannabis/textures/cannabis_armor_inv_leggings_foglie.png b/textures/cannabis_armor_inv_leggings_foglie.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_leggings_foglie.png rename to textures/cannabis_armor_inv_leggings_foglie.png diff --git a/cannabis/textures/cannabis_armor_inv_leggings_high.png b/textures/cannabis_armor_inv_leggings_high.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_leggings_high.png rename to textures/cannabis_armor_inv_leggings_high.png diff --git a/cannabis/textures/cannabis_armor_inv_leggings_tessuto.png b/textures/cannabis_armor_inv_leggings_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_leggings_tessuto.png rename to textures/cannabis_armor_inv_leggings_tessuto.png diff --git a/cannabis/textures/cannabis_armor_inv_shield_adminh.png b/textures/cannabis_armor_inv_shield_adminh.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_shield_adminh.png rename to textures/cannabis_armor_inv_shield_adminh.png diff --git a/cannabis/textures/cannabis_armor_inv_shield_fibra.png b/textures/cannabis_armor_inv_shield_fibra.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_shield_fibra.png rename to textures/cannabis_armor_inv_shield_fibra.png diff --git a/cannabis/textures/cannabis_armor_inv_shield_foglie.png b/textures/cannabis_armor_inv_shield_foglie.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_shield_foglie.png rename to textures/cannabis_armor_inv_shield_foglie.png diff --git a/cannabis/textures/cannabis_armor_inv_shield_high.png b/textures/cannabis_armor_inv_shield_high.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_shield_high.png rename to textures/cannabis_armor_inv_shield_high.png diff --git a/cannabis/textures/cannabis_armor_inv_shield_tessuto.png b/textures/cannabis_armor_inv_shield_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_armor_inv_shield_tessuto.png rename to textures/cannabis_armor_inv_shield_tessuto.png diff --git a/cannabis/textures/cannabis_armor_leggings_high_preview.png b/textures/cannabis_armor_leggings_high_preview.png similarity index 100% rename from cannabis/textures/cannabis_armor_leggings_high_preview.png rename to textures/cannabis_armor_leggings_high_preview.png diff --git a/cannabis/textures/cannabis_armor_leggings_tessuto_preview.png b/textures/cannabis_armor_leggings_tessuto_preview.png similarity index 100% rename from cannabis/textures/cannabis_armor_leggings_tessuto_preview.png rename to textures/cannabis_armor_leggings_tessuto_preview.png diff --git a/cannabis/textures/cannabis_boots_adminh.png b/textures/cannabis_boots_adminh.png similarity index 100% rename from cannabis/textures/cannabis_boots_adminh.png rename to textures/cannabis_boots_adminh.png diff --git a/cannabis/textures/cannabis_boots_adminh_preview.png b/textures/cannabis_boots_adminh_preview.png similarity index 100% rename from cannabis/textures/cannabis_boots_adminh_preview.png rename to textures/cannabis_boots_adminh_preview.png diff --git a/cannabis/textures/cannabis_boots_fibra.png b/textures/cannabis_boots_fibra.png similarity index 100% rename from cannabis/textures/cannabis_boots_fibra.png rename to textures/cannabis_boots_fibra.png diff --git a/cannabis/textures/cannabis_boots_fibra_preview.png b/textures/cannabis_boots_fibra_preview.png similarity index 100% rename from cannabis/textures/cannabis_boots_fibra_preview.png rename to textures/cannabis_boots_fibra_preview.png diff --git a/cannabis/textures/cannabis_boots_foglie.png b/textures/cannabis_boots_foglie.png similarity index 100% rename from cannabis/textures/cannabis_boots_foglie.png rename to textures/cannabis_boots_foglie.png diff --git a/cannabis/textures/cannabis_boots_foglie_preview.png b/textures/cannabis_boots_foglie_preview.png similarity index 100% rename from cannabis/textures/cannabis_boots_foglie_preview.png rename to textures/cannabis_boots_foglie_preview.png diff --git a/cannabis/textures/cannabis_boots_high.png b/textures/cannabis_boots_high.png similarity index 100% rename from cannabis/textures/cannabis_boots_high.png rename to textures/cannabis_boots_high.png diff --git a/cannabis/textures/cannabis_boots_high_preview.png b/textures/cannabis_boots_high_preview.png similarity index 100% rename from cannabis/textures/cannabis_boots_high_preview.png rename to textures/cannabis_boots_high_preview.png diff --git a/cannabis/textures/cannabis_boots_tessuto.png b/textures/cannabis_boots_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_boots_tessuto.png rename to textures/cannabis_boots_tessuto.png diff --git a/cannabis/textures/cannabis_boots_tessuto_preview.png b/textures/cannabis_boots_tessuto_preview.png similarity index 100% rename from cannabis/textures/cannabis_boots_tessuto_preview.png rename to textures/cannabis_boots_tessuto_preview.png diff --git a/cannabis/textures/cannabis_canapa.png b/textures/cannabis_canapa.png similarity index 100% rename from cannabis/textures/cannabis_canapa.png rename to textures/cannabis_canapa.png diff --git a/cannabis/textures/cannabis_canapa_bread.png b/textures/cannabis_canapa_bread.png similarity index 100% rename from cannabis/textures/cannabis_canapa_bread.png rename to textures/cannabis_canapa_bread.png diff --git a/cannabis/textures/cannabis_canapa_fiber.png b/textures/cannabis_canapa_fiber.png similarity index 100% rename from cannabis/textures/cannabis_canapa_fiber.png rename to textures/cannabis_canapa_fiber.png diff --git a/cannabis/textures/cannabis_canapa_flour.png b/textures/cannabis_canapa_flour.png similarity index 100% rename from cannabis/textures/cannabis_canapa_flour.png rename to textures/cannabis_canapa_flour.png diff --git a/cannabis/textures/cannabis_canapa_flower.png b/textures/cannabis_canapa_flower.png similarity index 100% rename from cannabis/textures/cannabis_canapa_flower.png rename to textures/cannabis_canapa_flower.png diff --git a/cannabis/textures/cannabis_canapa_glue.png b/textures/cannabis_canapa_glue.png similarity index 100% rename from cannabis/textures/cannabis_canapa_glue.png rename to textures/cannabis_canapa_glue.png diff --git a/cannabis/textures/cannabis_canapa_leaves.png b/textures/cannabis_canapa_leaves.png similarity index 100% rename from cannabis/textures/cannabis_canapa_leaves.png rename to textures/cannabis_canapa_leaves.png diff --git a/cannabis/textures/cannabis_canapa_oil.png b/textures/cannabis_canapa_oil.png similarity index 100% rename from cannabis/textures/cannabis_canapa_oil.png rename to textures/cannabis_canapa_oil.png diff --git a/cannabis/textures/cannabis_canapa_raisin.png b/textures/cannabis_canapa_raisin.png similarity index 100% rename from cannabis/textures/cannabis_canapa_raisin.png rename to textures/cannabis_canapa_raisin.png diff --git a/cannabis/textures/cannabis_canapa_red.png b/textures/cannabis_canapa_red.png similarity index 100% rename from cannabis/textures/cannabis_canapa_red.png rename to textures/cannabis_canapa_red.png diff --git a/cannabis/textures/cannabis_canapa_red_bread.png b/textures/cannabis_canapa_red_bread.png similarity index 100% rename from cannabis/textures/cannabis_canapa_red_bread.png rename to textures/cannabis_canapa_red_bread.png diff --git a/cannabis/textures/cannabis_canapa_red_fiber.png b/textures/cannabis_canapa_red_fiber.png similarity index 100% rename from cannabis/textures/cannabis_canapa_red_fiber.png rename to textures/cannabis_canapa_red_fiber.png diff --git a/cannabis/textures/cannabis_canapa_red_flour.png b/textures/cannabis_canapa_red_flour.png similarity index 100% rename from cannabis/textures/cannabis_canapa_red_flour.png rename to textures/cannabis_canapa_red_flour.png diff --git a/cannabis/textures/cannabis_canapa_red_flower.png b/textures/cannabis_canapa_red_flower.png similarity index 100% rename from cannabis/textures/cannabis_canapa_red_flower.png rename to textures/cannabis_canapa_red_flower.png diff --git a/cannabis/textures/cannabis_canapa_red_glue.png b/textures/cannabis_canapa_red_glue.png similarity index 100% rename from cannabis/textures/cannabis_canapa_red_glue.png rename to textures/cannabis_canapa_red_glue.png diff --git a/cannabis/textures/cannabis_canapa_red_leaves.png b/textures/cannabis_canapa_red_leaves.png similarity index 100% rename from cannabis/textures/cannabis_canapa_red_leaves.png rename to textures/cannabis_canapa_red_leaves.png diff --git a/cannabis/textures/cannabis_canapa_red_oil.png b/textures/cannabis_canapa_red_oil.png similarity index 100% rename from cannabis/textures/cannabis_canapa_red_oil.png rename to textures/cannabis_canapa_red_oil.png diff --git a/cannabis/textures/cannabis_canapa_red_raisin.png b/textures/cannabis_canapa_red_raisin.png similarity index 100% rename from cannabis/textures/cannabis_canapa_red_raisin.png rename to textures/cannabis_canapa_red_raisin.png diff --git a/cannabis/textures/cannabis_canapa_red_seed.png b/textures/cannabis_canapa_red_seed.png similarity index 100% rename from cannabis/textures/cannabis_canapa_red_seed.png rename to textures/cannabis_canapa_red_seed.png diff --git a/cannabis/textures/cannabis_canapa_seed.png b/textures/cannabis_canapa_seed.png similarity index 100% rename from cannabis/textures/cannabis_canapa_seed.png rename to textures/cannabis_canapa_seed.png diff --git a/cannabis/textures/cannabis_chestplate_adminh.png b/textures/cannabis_chestplate_adminh.png similarity index 100% rename from cannabis/textures/cannabis_chestplate_adminh.png rename to textures/cannabis_chestplate_adminh.png diff --git a/cannabis/textures/cannabis_chestplate_adminh_preview.png b/textures/cannabis_chestplate_adminh_preview.png similarity index 100% rename from cannabis/textures/cannabis_chestplate_adminh_preview.png rename to textures/cannabis_chestplate_adminh_preview.png diff --git a/cannabis/textures/cannabis_chestplate_fibra.png b/textures/cannabis_chestplate_fibra.png similarity index 100% rename from cannabis/textures/cannabis_chestplate_fibra.png rename to textures/cannabis_chestplate_fibra.png diff --git a/cannabis/textures/cannabis_chestplate_fibra_preview.png b/textures/cannabis_chestplate_fibra_preview.png similarity index 100% rename from cannabis/textures/cannabis_chestplate_fibra_preview.png rename to textures/cannabis_chestplate_fibra_preview.png diff --git a/cannabis/textures/cannabis_chestplate_foglie.png b/textures/cannabis_chestplate_foglie.png similarity index 100% rename from cannabis/textures/cannabis_chestplate_foglie.png rename to textures/cannabis_chestplate_foglie.png diff --git a/cannabis/textures/cannabis_chestplate_foglie_preview.png b/textures/cannabis_chestplate_foglie_preview.png similarity index 100% rename from cannabis/textures/cannabis_chestplate_foglie_preview.png rename to textures/cannabis_chestplate_foglie_preview.png diff --git a/cannabis/textures/cannabis_chestplate_high.png b/textures/cannabis_chestplate_high.png similarity index 100% rename from cannabis/textures/cannabis_chestplate_high.png rename to textures/cannabis_chestplate_high.png diff --git a/cannabis/textures/cannabis_chestplate_high_preview.png b/textures/cannabis_chestplate_high_preview.png similarity index 100% rename from cannabis/textures/cannabis_chestplate_high_preview.png rename to textures/cannabis_chestplate_high_preview.png diff --git a/cannabis/textures/cannabis_chestplate_tessuto.png b/textures/cannabis_chestplate_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_chestplate_tessuto.png rename to textures/cannabis_chestplate_tessuto.png diff --git a/cannabis/textures/cannabis_chestplate_tessuto_preview.png b/textures/cannabis_chestplate_tessuto_preview.png similarity index 100% rename from cannabis/textures/cannabis_chestplate_tessuto_preview.png rename to textures/cannabis_chestplate_tessuto_preview.png diff --git a/cannabis/textures/cannabis_fibra_block.png b/textures/cannabis_fibra_block.png similarity index 100% rename from cannabis/textures/cannabis_fibra_block.png rename to textures/cannabis_fibra_block.png diff --git a/cannabis/textures/cannabis_fibra_ingot.png b/textures/cannabis_fibra_ingot.png similarity index 100% rename from cannabis/textures/cannabis_fibra_ingot.png rename to textures/cannabis_fibra_ingot.png diff --git a/cannabis/textures/cannabis_foglie_block.png b/textures/cannabis_foglie_block.png similarity index 100% rename from cannabis/textures/cannabis_foglie_block.png rename to textures/cannabis_foglie_block.png diff --git a/cannabis/textures/cannabis_foglie_ingot.png b/textures/cannabis_foglie_ingot.png similarity index 100% rename from cannabis/textures/cannabis_foglie_ingot.png rename to textures/cannabis_foglie_ingot.png diff --git a/cannabis/textures/cannabis_foglie_red_block.png b/textures/cannabis_foglie_red_block.png similarity index 100% rename from cannabis/textures/cannabis_foglie_red_block.png rename to textures/cannabis_foglie_red_block.png diff --git a/cannabis/textures/cannabis_fuel.png b/textures/cannabis_fuel.png similarity index 100% rename from cannabis/textures/cannabis_fuel.png rename to textures/cannabis_fuel.png diff --git a/cannabis/textures/cannabis_helmet_adminh.png b/textures/cannabis_helmet_adminh.png similarity index 100% rename from cannabis/textures/cannabis_helmet_adminh.png rename to textures/cannabis_helmet_adminh.png diff --git a/cannabis/textures/cannabis_helmet_adminh_preview.png b/textures/cannabis_helmet_adminh_preview.png similarity index 100% rename from cannabis/textures/cannabis_helmet_adminh_preview.png rename to textures/cannabis_helmet_adminh_preview.png diff --git a/cannabis/textures/cannabis_helmet_fibra.png b/textures/cannabis_helmet_fibra.png similarity index 100% rename from cannabis/textures/cannabis_helmet_fibra.png rename to textures/cannabis_helmet_fibra.png diff --git a/cannabis/textures/cannabis_helmet_fibra_preview.png b/textures/cannabis_helmet_fibra_preview.png similarity index 100% rename from cannabis/textures/cannabis_helmet_fibra_preview.png rename to textures/cannabis_helmet_fibra_preview.png diff --git a/cannabis/textures/cannabis_helmet_foglie.png b/textures/cannabis_helmet_foglie.png similarity index 100% rename from cannabis/textures/cannabis_helmet_foglie.png rename to textures/cannabis_helmet_foglie.png diff --git a/cannabis/textures/cannabis_helmet_foglie0.png b/textures/cannabis_helmet_foglie0.png similarity index 100% rename from cannabis/textures/cannabis_helmet_foglie0.png rename to textures/cannabis_helmet_foglie0.png diff --git a/cannabis/textures/cannabis_helmet_foglie_preview.png b/textures/cannabis_helmet_foglie_preview.png similarity index 100% rename from cannabis/textures/cannabis_helmet_foglie_preview.png rename to textures/cannabis_helmet_foglie_preview.png diff --git a/cannabis/textures/cannabis_helmet_high.png b/textures/cannabis_helmet_high.png similarity index 100% rename from cannabis/textures/cannabis_helmet_high.png rename to textures/cannabis_helmet_high.png diff --git a/cannabis/textures/cannabis_helmet_high_preview.png b/textures/cannabis_helmet_high_preview.png similarity index 100% rename from cannabis/textures/cannabis_helmet_high_preview.png rename to textures/cannabis_helmet_high_preview.png diff --git a/cannabis/textures/cannabis_helmet_tessuto.png b/textures/cannabis_helmet_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_helmet_tessuto.png rename to textures/cannabis_helmet_tessuto.png diff --git a/cannabis/textures/cannabis_helmet_tessuto_preview.png b/textures/cannabis_helmet_tessuto_preview.png similarity index 100% rename from cannabis/textures/cannabis_helmet_tessuto_preview.png rename to textures/cannabis_helmet_tessuto_preview.png diff --git a/cannabis/textures/cannabis_high_performance_block.png b/textures/cannabis_high_performance_block.png similarity index 100% rename from cannabis/textures/cannabis_high_performance_block.png rename to textures/cannabis_high_performance_block.png diff --git a/cannabis/textures/cannabis_high_performance_ingot.png b/textures/cannabis_high_performance_ingot.png similarity index 100% rename from cannabis/textures/cannabis_high_performance_ingot.png rename to textures/cannabis_high_performance_ingot.png diff --git a/cannabis/textures/cannabis_inv_helmet_fibra.png b/textures/cannabis_inv_helmet_fibra.png similarity index 100% rename from cannabis/textures/cannabis_inv_helmet_fibra.png rename to textures/cannabis_inv_helmet_fibra.png diff --git a/cannabis/textures/cannabis_inv_helmet_foglie.png b/textures/cannabis_inv_helmet_foglie.png similarity index 100% rename from cannabis/textures/cannabis_inv_helmet_foglie.png rename to textures/cannabis_inv_helmet_foglie.png diff --git a/cannabis/textures/cannabis_inv_helmet_high.png b/textures/cannabis_inv_helmet_high.png similarity index 100% rename from cannabis/textures/cannabis_inv_helmet_high.png rename to textures/cannabis_inv_helmet_high.png diff --git a/cannabis/textures/cannabis_inv_helmet_tessuto.png b/textures/cannabis_inv_helmet_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_inv_helmet_tessuto.png rename to textures/cannabis_inv_helmet_tessuto.png diff --git a/cannabis/textures/cannabis_leggings_adminh.png b/textures/cannabis_leggings_adminh.png similarity index 100% rename from cannabis/textures/cannabis_leggings_adminh.png rename to textures/cannabis_leggings_adminh.png diff --git a/cannabis/textures/cannabis_leggings_adminh_preview.png b/textures/cannabis_leggings_adminh_preview.png similarity index 100% rename from cannabis/textures/cannabis_leggings_adminh_preview.png rename to textures/cannabis_leggings_adminh_preview.png diff --git a/cannabis/textures/cannabis_leggings_fibra.png b/textures/cannabis_leggings_fibra.png similarity index 100% rename from cannabis/textures/cannabis_leggings_fibra.png rename to textures/cannabis_leggings_fibra.png diff --git a/cannabis/textures/cannabis_leggings_fibra_preview.png b/textures/cannabis_leggings_fibra_preview.png similarity index 100% rename from cannabis/textures/cannabis_leggings_fibra_preview.png rename to textures/cannabis_leggings_fibra_preview.png diff --git a/cannabis/textures/cannabis_leggings_foglie.png b/textures/cannabis_leggings_foglie.png similarity index 100% rename from cannabis/textures/cannabis_leggings_foglie.png rename to textures/cannabis_leggings_foglie.png diff --git a/cannabis/textures/cannabis_leggings_foglie_preview.png b/textures/cannabis_leggings_foglie_preview.png similarity index 100% rename from cannabis/textures/cannabis_leggings_foglie_preview.png rename to textures/cannabis_leggings_foglie_preview.png diff --git a/cannabis/textures/cannabis_leggings_high.png b/textures/cannabis_leggings_high.png similarity index 100% rename from cannabis/textures/cannabis_leggings_high.png rename to textures/cannabis_leggings_high.png diff --git a/cannabis/textures/cannabis_leggings_high_preview.png b/textures/cannabis_leggings_high_preview.png similarity index 100% rename from cannabis/textures/cannabis_leggings_high_preview.png rename to textures/cannabis_leggings_high_preview.png diff --git a/cannabis/textures/cannabis_leggings_tessuto.png b/textures/cannabis_leggings_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_leggings_tessuto.png rename to textures/cannabis_leggings_tessuto.png diff --git a/cannabis/textures/cannabis_leggings_tessuto_preview.png b/textures/cannabis_leggings_tessuto_preview.png similarity index 100% rename from cannabis/textures/cannabis_leggings_tessuto_preview.png rename to textures/cannabis_leggings_tessuto_preview.png diff --git a/cannabis/textures/cannabis_mixed_hr_ingot.png b/textures/cannabis_mixed_hr_ingot.png similarity index 100% rename from cannabis/textures/cannabis_mixed_hr_ingot.png rename to textures/cannabis_mixed_hr_ingot.png diff --git a/cannabis/textures/cannabis_paper.png b/textures/cannabis_paper.png similarity index 100% rename from cannabis/textures/cannabis_paper.png rename to textures/cannabis_paper.png diff --git a/cannabis/textures/cannabis_plastic.png b/textures/cannabis_plastic.png similarity index 100% rename from cannabis/textures/cannabis_plastic.png rename to textures/cannabis_plastic.png diff --git a/cannabis/textures/cannabis_shield_adminh.png b/textures/cannabis_shield_adminh.png similarity index 100% rename from cannabis/textures/cannabis_shield_adminh.png rename to textures/cannabis_shield_adminh.png diff --git a/cannabis/textures/cannabis_shield_adminh_preview.png b/textures/cannabis_shield_adminh_preview.png similarity index 100% rename from cannabis/textures/cannabis_shield_adminh_preview.png rename to textures/cannabis_shield_adminh_preview.png diff --git a/cannabis/textures/cannabis_shield_fibra.png b/textures/cannabis_shield_fibra.png similarity index 100% rename from cannabis/textures/cannabis_shield_fibra.png rename to textures/cannabis_shield_fibra.png diff --git a/cannabis/textures/cannabis_shield_fibra_preview.png b/textures/cannabis_shield_fibra_preview.png similarity index 100% rename from cannabis/textures/cannabis_shield_fibra_preview.png rename to textures/cannabis_shield_fibra_preview.png diff --git a/cannabis/textures/cannabis_shield_foglie.png b/textures/cannabis_shield_foglie.png similarity index 100% rename from cannabis/textures/cannabis_shield_foglie.png rename to textures/cannabis_shield_foglie.png diff --git a/cannabis/textures/cannabis_shield_foglie_preview.png b/textures/cannabis_shield_foglie_preview.png similarity index 100% rename from cannabis/textures/cannabis_shield_foglie_preview.png rename to textures/cannabis_shield_foglie_preview.png diff --git a/cannabis/textures/cannabis_shield_high.png b/textures/cannabis_shield_high.png similarity index 100% rename from cannabis/textures/cannabis_shield_high.png rename to textures/cannabis_shield_high.png diff --git a/cannabis/textures/cannabis_shield_high_preview.png b/textures/cannabis_shield_high_preview.png similarity index 100% rename from cannabis/textures/cannabis_shield_high_preview.png rename to textures/cannabis_shield_high_preview.png diff --git a/cannabis/textures/cannabis_shield_tessuto.png b/textures/cannabis_shield_tessuto.png similarity index 100% rename from cannabis/textures/cannabis_shield_tessuto.png rename to textures/cannabis_shield_tessuto.png diff --git a/cannabis/textures/cannabis_shield_tessuto_preview.png b/textures/cannabis_shield_tessuto_preview.png similarity index 100% rename from cannabis/textures/cannabis_shield_tessuto_preview.png rename to textures/cannabis_shield_tessuto_preview.png diff --git a/cannabis/textures/cannabis_tessuto_block.png b/textures/cannabis_tessuto_block.png similarity index 100% rename from cannabis/textures/cannabis_tessuto_block.png rename to textures/cannabis_tessuto_block.png diff --git a/cannabis/textures/cannabis_tessuto_ingot.png b/textures/cannabis_tessuto_ingot.png similarity index 100% rename from cannabis/textures/cannabis_tessuto_ingot.png rename to textures/cannabis_tessuto_ingot.png diff --git a/cannabis/textures/cannabis_tool_adminhaxe.png b/textures/cannabis_tool_adminhaxe.png similarity index 100% rename from cannabis/textures/cannabis_tool_adminhaxe.png rename to textures/cannabis_tool_adminhaxe.png diff --git a/cannabis/textures/cannabis_tool_adminhpick.png b/textures/cannabis_tool_adminhpick.png similarity index 100% rename from cannabis/textures/cannabis_tool_adminhpick.png rename to textures/cannabis_tool_adminhpick.png diff --git a/cannabis/textures/cannabis_tool_adminhshovel.png b/textures/cannabis_tool_adminhshovel.png similarity index 100% rename from cannabis/textures/cannabis_tool_adminhshovel.png rename to textures/cannabis_tool_adminhshovel.png diff --git a/cannabis/textures/cannabis_tool_adminhsword.png b/textures/cannabis_tool_adminhsword.png similarity index 100% rename from cannabis/textures/cannabis_tool_adminhsword.png rename to textures/cannabis_tool_adminhsword.png diff --git a/cannabis/textures/cannabis_tool_bronzeaxe.png b/textures/cannabis_tool_bronzeaxe.png similarity index 100% rename from cannabis/textures/cannabis_tool_bronzeaxe.png rename to textures/cannabis_tool_bronzeaxe.png diff --git a/cannabis/textures/cannabis_tool_bronzepick.png b/textures/cannabis_tool_bronzepick.png similarity index 100% rename from cannabis/textures/cannabis_tool_bronzepick.png rename to textures/cannabis_tool_bronzepick.png diff --git a/cannabis/textures/cannabis_tool_bronzeshovel.png b/textures/cannabis_tool_bronzeshovel.png similarity index 100% rename from cannabis/textures/cannabis_tool_bronzeshovel.png rename to textures/cannabis_tool_bronzeshovel.png diff --git a/cannabis/textures/cannabis_tool_bronzesword.png b/textures/cannabis_tool_bronzesword.png similarity index 100% rename from cannabis/textures/cannabis_tool_bronzesword.png rename to textures/cannabis_tool_bronzesword.png diff --git a/cannabis/textures/cannabis_tool_diamondaxe.png b/textures/cannabis_tool_diamondaxe.png similarity index 100% rename from cannabis/textures/cannabis_tool_diamondaxe.png rename to textures/cannabis_tool_diamondaxe.png diff --git a/cannabis/textures/cannabis_tool_diamondpick.png b/textures/cannabis_tool_diamondpick.png similarity index 100% rename from cannabis/textures/cannabis_tool_diamondpick.png rename to textures/cannabis_tool_diamondpick.png diff --git a/cannabis/textures/cannabis_tool_diamondshovel.png b/textures/cannabis_tool_diamondshovel.png similarity index 100% rename from cannabis/textures/cannabis_tool_diamondshovel.png rename to textures/cannabis_tool_diamondshovel.png diff --git a/cannabis/textures/cannabis_tool_diamondsword.png b/textures/cannabis_tool_diamondsword.png similarity index 100% rename from cannabis/textures/cannabis_tool_diamondsword.png rename to textures/cannabis_tool_diamondsword.png diff --git a/cannabis/textures/cannabis_tool_highaxe.png b/textures/cannabis_tool_highaxe.png similarity index 100% rename from cannabis/textures/cannabis_tool_highaxe.png rename to textures/cannabis_tool_highaxe.png diff --git a/cannabis/textures/cannabis_tool_highpick.png b/textures/cannabis_tool_highpick.png similarity index 100% rename from cannabis/textures/cannabis_tool_highpick.png rename to textures/cannabis_tool_highpick.png diff --git a/cannabis/textures/cannabis_tool_highshovel.png b/textures/cannabis_tool_highshovel.png similarity index 100% rename from cannabis/textures/cannabis_tool_highshovel.png rename to textures/cannabis_tool_highshovel.png diff --git a/cannabis/textures/cannabis_tool_highsword.png b/textures/cannabis_tool_highsword.png similarity index 100% rename from cannabis/textures/cannabis_tool_highsword.png rename to textures/cannabis_tool_highsword.png diff --git a/cannabis/textures/cannabis_tool_meseaxe.png b/textures/cannabis_tool_meseaxe.png similarity index 100% rename from cannabis/textures/cannabis_tool_meseaxe.png rename to textures/cannabis_tool_meseaxe.png diff --git a/cannabis/textures/cannabis_tool_mesepick.png b/textures/cannabis_tool_mesepick.png similarity index 100% rename from cannabis/textures/cannabis_tool_mesepick.png rename to textures/cannabis_tool_mesepick.png diff --git a/cannabis/textures/cannabis_tool_meseshovel.png b/textures/cannabis_tool_meseshovel.png similarity index 100% rename from cannabis/textures/cannabis_tool_meseshovel.png rename to textures/cannabis_tool_meseshovel.png diff --git a/cannabis/textures/cannabis_tool_mesesword.png b/textures/cannabis_tool_mesesword.png similarity index 100% rename from cannabis/textures/cannabis_tool_mesesword.png rename to textures/cannabis_tool_mesesword.png diff --git a/cannabis/textures/cannabis_tool_steelaxe.png b/textures/cannabis_tool_steelaxe.png similarity index 100% rename from cannabis/textures/cannabis_tool_steelaxe.png rename to textures/cannabis_tool_steelaxe.png diff --git a/cannabis/textures/cannabis_tool_steelpick.png b/textures/cannabis_tool_steelpick.png similarity index 100% rename from cannabis/textures/cannabis_tool_steelpick.png rename to textures/cannabis_tool_steelpick.png diff --git a/cannabis/textures/cannabis_tool_steelshovel.png b/textures/cannabis_tool_steelshovel.png similarity index 100% rename from cannabis/textures/cannabis_tool_steelshovel.png rename to textures/cannabis_tool_steelshovel.png diff --git a/cannabis/textures/cannabis_tool_steelsword.png b/textures/cannabis_tool_steelsword.png similarity index 100% rename from cannabis/textures/cannabis_tool_steelsword.png rename to textures/cannabis_tool_steelsword.png diff --git a/cannabis/textures/hemp_climbing.png b/textures/hemp_climbing.png similarity index 100% rename from cannabis/textures/hemp_climbing.png rename to textures/hemp_climbing.png diff --git a/cannabis/textures/hemp_climbing_red.png b/textures/hemp_climbing_red.png similarity index 100% rename from cannabis/textures/hemp_climbing_red.png rename to textures/hemp_climbing_red.png diff --git a/cannabis/textures/hemp_sproutling.png b/textures/hemp_sproutling.png similarity index 100% rename from cannabis/textures/hemp_sproutling.png rename to textures/hemp_sproutling.png diff --git a/cannabis/textures/hemp_sproutling_red.png b/textures/hemp_sproutling_red.png similarity index 100% rename from cannabis/textures/hemp_sproutling_red.png rename to textures/hemp_sproutling_red.png diff --git a/cannabis/textures/hp_block_canapa.png b/textures/hp_block_canapa.png similarity index 100% rename from cannabis/textures/hp_block_canapa.png rename to textures/hp_block_canapa.png diff --git a/cannabis/textures/hp_block_canapa_red.png b/textures/hp_block_canapa_red.png similarity index 100% rename from cannabis/textures/hp_block_canapa_red.png rename to textures/hp_block_canapa_red.png diff --git a/cannabis/textures/joint_accendino.png b/textures/joint_accendino.png similarity index 100% rename from cannabis/textures/joint_accendino.png rename to textures/joint_accendino.png diff --git a/cannabis/textures/joint_cartina.png b/textures/joint_cartina.png similarity index 100% rename from cannabis/textures/joint_cartina.png rename to textures/joint_cartina.png diff --git a/cannabis/textures/joint_cartina_cima.png b/textures/joint_cartina_cima.png similarity index 100% rename from cannabis/textures/joint_cartina_cima.png rename to textures/joint_cartina_cima.png diff --git a/cannabis/textures/joint_cartina_fumo.png b/textures/joint_cartina_fumo.png similarity index 100% rename from cannabis/textures/joint_cartina_fumo.png rename to textures/joint_cartina_fumo.png diff --git a/cannabis/textures/joint_cima_s.png b/textures/joint_cima_s.png similarity index 100% rename from cannabis/textures/joint_cima_s.png rename to textures/joint_cima_s.png diff --git a/cannabis/textures/joint_filter.png b/textures/joint_filter.png similarity index 100% rename from cannabis/textures/joint_filter.png rename to textures/joint_filter.png diff --git a/cannabis/textures/joint_filter_p.png b/textures/joint_filter_p.png similarity index 100% rename from cannabis/textures/joint_filter_p.png rename to textures/joint_filter_p.png diff --git a/cannabis/textures/joint_fumo_s.png b/textures/joint_fumo_s.png similarity index 100% rename from cannabis/textures/joint_fumo_s.png rename to textures/joint_fumo_s.png diff --git a/cannabis/textures/joint_joint_cac.png b/textures/joint_joint_cac.png similarity index 100% rename from cannabis/textures/joint_joint_cac.png rename to textures/joint_joint_cac.png diff --git a/cannabis/textures/joint_joint_csp.png b/textures/joint_joint_csp.png similarity index 100% rename from cannabis/textures/joint_joint_csp.png rename to textures/joint_joint_csp.png diff --git a/cannabis/textures/joint_joint_fac.png b/textures/joint_joint_fac.png similarity index 100% rename from cannabis/textures/joint_joint_fac.png rename to textures/joint_joint_fac.png diff --git a/cannabis/textures/joint_joint_fsp.png b/textures/joint_joint_fsp.png similarity index 100% rename from cannabis/textures/joint_joint_fsp.png rename to textures/joint_joint_fsp.png diff --git a/cannabis/tools.lua b/tools.lua similarity index 99% rename from cannabis/tools.lua rename to tools.lua index 13533d4..b399a96 100644 --- a/cannabis/tools.lua +++ b/tools.lua @@ -295,10 +295,6 @@ minetest.register_tool("cannabis:sword_hemp_high", { }) - - - - --pick:___________________________________________________________________ minetest.register_craft({