From 30f3b6d7bc3415e37bb4bfb53ad3667dedab42c9 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sun, 16 Nov 2014 12:48:24 +0000 Subject: [PATCH] Move stuff around --- food/description.txt | 1 + api.lua => food/init.lua | 0 food_basic/README.md | 42 ++++++++++++++++++ depends.txt => food_basic/depends.txt | 1 + food_basic/description.txt | 1 + ingredients.lua => food_basic/ingredients.lua | 2 +- init.lua => food_basic/init.lua | 2 +- {locale => food_basic/locale}/de.txt | 0 {locale => food_basic/locale}/template.txt | 0 support.lua => food_basic/support.lua | 0 .../textures}/food_apple_juice.png | Bin .../textures}/food_baked_potato.png | Bin .../textures}/food_baking_bread_slice.png | Bin .../textures}/food_baking_bun_mix.png | Bin .../textures}/food_baking_dough.png | Bin .../textures}/food_bowl.png | Bin .../textures}/food_butter.png | Bin .../textures}/food_cactus_juice.png | Bin .../textures}/food_cake_carrot_texture.png | Bin .../food_cake_carrot_texture_side.png | Bin .../textures}/food_cake_choco_texture.png | Bin .../food_cake_choco_texture_side.png | Bin .../textures}/food_cake_texture.png | Bin .../textures}/food_cake_texture_side.png | Bin .../textures}/food_cakemix_carrot.png | Bin .../textures}/food_cakemix_choco.png | Bin .../textures}/food_cakemix_plain.png | Bin .../textures}/food_carrot.png | Bin .../textures}/food_cheese.png | Bin .../textures}/food_chocolate_powder.png | Bin .../textures}/food_cocoa.png | Bin .../textures}/food_dark_chocolate.png | Bin .../textures}/food_egg.png | Bin .../textures}/food_flour.png | Bin .../textures}/food_meat.png | Bin .../textures}/food_meat_raw.png | Bin .../textures}/food_milk.png | Bin .../textures}/food_milk_chocolate.png | Bin .../textures}/food_orange_juice.png | Bin .../textures}/food_pasta.png | Bin .../textures}/food_pasta_bake.png | Bin .../textures}/food_pasta_bake_raw.png | Bin .../textures}/food_potato.png | Bin .../textures}/food_rainbow_juice.png | Bin .../textures}/food_soup_chicken.png | Bin .../textures}/food_soup_chicken_raw.png | Bin .../textures}/food_soup_tomato.png | Bin .../textures}/food_soup_tomato_raw.png | Bin .../textures}/food_strawberry.png | Bin .../textures}/food_sugar.png | Bin .../textures}/food_tomato.png | Bin .../textures}/food_wheat.png | Bin modpack.txt | 0 53 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 food/description.txt rename api.lua => food/init.lua (100%) create mode 100644 food_basic/README.md rename depends.txt => food_basic/depends.txt (97%) create mode 100644 food_basic/description.txt rename ingredients.lua => food_basic/ingredients.lua (99%) rename init.lua => food_basic/init.lua (99%) rename {locale => food_basic/locale}/de.txt (100%) rename {locale => food_basic/locale}/template.txt (100%) rename support.lua => food_basic/support.lua (100%) rename {textures => food_basic/textures}/food_apple_juice.png (100%) rename {textures => food_basic/textures}/food_baked_potato.png (100%) rename {textures => food_basic/textures}/food_baking_bread_slice.png (100%) rename {textures => food_basic/textures}/food_baking_bun_mix.png (100%) rename {textures => food_basic/textures}/food_baking_dough.png (100%) rename {textures => food_basic/textures}/food_bowl.png (100%) rename {textures => food_basic/textures}/food_butter.png (100%) rename {textures => food_basic/textures}/food_cactus_juice.png (100%) rename {textures => food_basic/textures}/food_cake_carrot_texture.png (100%) rename {textures => food_basic/textures}/food_cake_carrot_texture_side.png (100%) rename {textures => food_basic/textures}/food_cake_choco_texture.png (100%) rename {textures => food_basic/textures}/food_cake_choco_texture_side.png (100%) rename {textures => food_basic/textures}/food_cake_texture.png (100%) rename {textures => food_basic/textures}/food_cake_texture_side.png (100%) rename {textures => food_basic/textures}/food_cakemix_carrot.png (100%) rename {textures => food_basic/textures}/food_cakemix_choco.png (100%) rename {textures => food_basic/textures}/food_cakemix_plain.png (100%) rename {textures => food_basic/textures}/food_carrot.png (100%) rename {textures => food_basic/textures}/food_cheese.png (100%) rename {textures => food_basic/textures}/food_chocolate_powder.png (100%) rename {textures => food_basic/textures}/food_cocoa.png (100%) rename {textures => food_basic/textures}/food_dark_chocolate.png (100%) rename {textures => food_basic/textures}/food_egg.png (100%) rename {textures => food_basic/textures}/food_flour.png (100%) rename {textures => food_basic/textures}/food_meat.png (100%) rename {textures => food_basic/textures}/food_meat_raw.png (100%) rename {textures => food_basic/textures}/food_milk.png (100%) rename {textures => food_basic/textures}/food_milk_chocolate.png (100%) rename {textures => food_basic/textures}/food_orange_juice.png (100%) rename {textures => food_basic/textures}/food_pasta.png (100%) rename {textures => food_basic/textures}/food_pasta_bake.png (100%) rename {textures => food_basic/textures}/food_pasta_bake_raw.png (100%) rename {textures => food_basic/textures}/food_potato.png (100%) rename {textures => food_basic/textures}/food_rainbow_juice.png (100%) rename {textures => food_basic/textures}/food_soup_chicken.png (100%) rename {textures => food_basic/textures}/food_soup_chicken_raw.png (100%) rename {textures => food_basic/textures}/food_soup_tomato.png (100%) rename {textures => food_basic/textures}/food_soup_tomato_raw.png (100%) rename {textures => food_basic/textures}/food_strawberry.png (100%) rename {textures => food_basic/textures}/food_sugar.png (100%) rename {textures => food_basic/textures}/food_tomato.png (100%) rename {textures => food_basic/textures}/food_wheat.png (100%) create mode 100644 modpack.txt diff --git a/food/description.txt b/food/description.txt new file mode 100644 index 0000000..1c7469f --- /dev/null +++ b/food/description.txt @@ -0,0 +1 @@ +(API framework) The largest supporting food mod for Minetest. Adds soups, cakes, bakes and juices. diff --git a/api.lua b/food/init.lua similarity index 100% rename from api.lua rename to food/init.lua diff --git a/food_basic/README.md b/food_basic/README.md new file mode 100644 index 0000000..c5dcd0c --- /dev/null +++ b/food_basic/README.md @@ -0,0 +1,42 @@ +The Food Mod +============ + +This is the main mod in the food mod collection. + +Version 2.3 + +The Aims +-------- + +All content should follow these aims: +* Basis for expansion - supplies a framework of ingredients for other mods to build upon +* Mod support without dependancies - this allows flexibility for the user +* Minetest-game worthy - (Minimalism) This mod only contains traditional foods - such as cakes, soups and bread. + +Documentation +------------- + +Recipe guide: https://www.dropbox.com/s/tsvjmobv9n3isu0/food_crafting.pdf?dl=1 + +Expansion Packs +--------------- + +There are expansion mods available. Just install them in a mod folder, and everything should be fine. + +* Sweet Foods - https://github.com/rubenwardy/food_sweet +* Modern food (Needs updating) - burgers, soft drinks, pop corn, coffee, etc + +Licensing +--------- + +Created by rubenwardy +License for code: GPL 3.0 or later. +License for textures: CC-BY-SA + +Exceptions: + +* Baked potato texture by Doc, WTFPL +* Dough, flour and wheat textures from default farming mod, WTFPL +* Egg and milk textures from Mobf, CC BY SA + +Have I missed out credit? Please tell me. diff --git a/depends.txt b/food_basic/depends.txt similarity index 97% rename from depends.txt rename to food_basic/depends.txt index f3f515d..974ed7c 100644 --- a/depends.txt +++ b/food_basic/depends.txt @@ -1,3 +1,4 @@ +food animalmaterials? bushes_classic? default? diff --git a/food_basic/description.txt b/food_basic/description.txt new file mode 100644 index 0000000..eb392e0 --- /dev/null +++ b/food_basic/description.txt @@ -0,0 +1 @@ +The largest supporting food mod for Minetest. Adds soups, cakes, bakes and juices. diff --git a/ingredients.lua b/food_basic/ingredients.lua similarity index 99% rename from ingredients.lua rename to food_basic/ingredients.lua index 1d14acf..de209da 100644 --- a/ingredients.lua +++ b/food_basic/ingredients.lua @@ -2,7 +2,7 @@ -- A mod written by rubenwardy that adds -- food to the minetest game -- ===================================== --- >> food/ingredients.lua +-- >> food_basic/ingredients.lua -- Fallback ingredients -- ===================================== diff --git a/init.lua b/food_basic/init.lua similarity index 99% rename from init.lua rename to food_basic/init.lua index e7b7152..4f438a1 100644 --- a/init.lua +++ b/food_basic/init.lua @@ -2,7 +2,7 @@ -- A mod written by rubenwardy that adds -- food to the minetest game -- ===================================== --- >> food/init.lua +-- >> food_basic/init.lua -- Some basic foods -- ===================================== diff --git a/locale/de.txt b/food_basic/locale/de.txt similarity index 100% rename from locale/de.txt rename to food_basic/locale/de.txt diff --git a/locale/template.txt b/food_basic/locale/template.txt similarity index 100% rename from locale/template.txt rename to food_basic/locale/template.txt diff --git a/support.lua b/food_basic/support.lua similarity index 100% rename from support.lua rename to food_basic/support.lua diff --git a/textures/food_apple_juice.png b/food_basic/textures/food_apple_juice.png similarity index 100% rename from textures/food_apple_juice.png rename to food_basic/textures/food_apple_juice.png diff --git a/textures/food_baked_potato.png b/food_basic/textures/food_baked_potato.png similarity index 100% rename from textures/food_baked_potato.png rename to food_basic/textures/food_baked_potato.png diff --git a/textures/food_baking_bread_slice.png b/food_basic/textures/food_baking_bread_slice.png similarity index 100% rename from textures/food_baking_bread_slice.png rename to food_basic/textures/food_baking_bread_slice.png diff --git a/textures/food_baking_bun_mix.png b/food_basic/textures/food_baking_bun_mix.png similarity index 100% rename from textures/food_baking_bun_mix.png rename to food_basic/textures/food_baking_bun_mix.png diff --git a/textures/food_baking_dough.png b/food_basic/textures/food_baking_dough.png similarity index 100% rename from textures/food_baking_dough.png rename to food_basic/textures/food_baking_dough.png diff --git a/textures/food_bowl.png b/food_basic/textures/food_bowl.png similarity index 100% rename from textures/food_bowl.png rename to food_basic/textures/food_bowl.png diff --git a/textures/food_butter.png b/food_basic/textures/food_butter.png similarity index 100% rename from textures/food_butter.png rename to food_basic/textures/food_butter.png diff --git a/textures/food_cactus_juice.png b/food_basic/textures/food_cactus_juice.png similarity index 100% rename from textures/food_cactus_juice.png rename to food_basic/textures/food_cactus_juice.png diff --git a/textures/food_cake_carrot_texture.png b/food_basic/textures/food_cake_carrot_texture.png similarity index 100% rename from textures/food_cake_carrot_texture.png rename to food_basic/textures/food_cake_carrot_texture.png diff --git a/textures/food_cake_carrot_texture_side.png b/food_basic/textures/food_cake_carrot_texture_side.png similarity index 100% rename from textures/food_cake_carrot_texture_side.png rename to food_basic/textures/food_cake_carrot_texture_side.png diff --git a/textures/food_cake_choco_texture.png b/food_basic/textures/food_cake_choco_texture.png similarity index 100% rename from textures/food_cake_choco_texture.png rename to food_basic/textures/food_cake_choco_texture.png diff --git a/textures/food_cake_choco_texture_side.png b/food_basic/textures/food_cake_choco_texture_side.png similarity index 100% rename from textures/food_cake_choco_texture_side.png rename to food_basic/textures/food_cake_choco_texture_side.png diff --git a/textures/food_cake_texture.png b/food_basic/textures/food_cake_texture.png similarity index 100% rename from textures/food_cake_texture.png rename to food_basic/textures/food_cake_texture.png diff --git a/textures/food_cake_texture_side.png b/food_basic/textures/food_cake_texture_side.png similarity index 100% rename from textures/food_cake_texture_side.png rename to food_basic/textures/food_cake_texture_side.png diff --git a/textures/food_cakemix_carrot.png b/food_basic/textures/food_cakemix_carrot.png similarity index 100% rename from textures/food_cakemix_carrot.png rename to food_basic/textures/food_cakemix_carrot.png diff --git a/textures/food_cakemix_choco.png b/food_basic/textures/food_cakemix_choco.png similarity index 100% rename from textures/food_cakemix_choco.png rename to food_basic/textures/food_cakemix_choco.png diff --git a/textures/food_cakemix_plain.png b/food_basic/textures/food_cakemix_plain.png similarity index 100% rename from textures/food_cakemix_plain.png rename to food_basic/textures/food_cakemix_plain.png diff --git a/textures/food_carrot.png b/food_basic/textures/food_carrot.png similarity index 100% rename from textures/food_carrot.png rename to food_basic/textures/food_carrot.png diff --git a/textures/food_cheese.png b/food_basic/textures/food_cheese.png similarity index 100% rename from textures/food_cheese.png rename to food_basic/textures/food_cheese.png diff --git a/textures/food_chocolate_powder.png b/food_basic/textures/food_chocolate_powder.png similarity index 100% rename from textures/food_chocolate_powder.png rename to food_basic/textures/food_chocolate_powder.png diff --git a/textures/food_cocoa.png b/food_basic/textures/food_cocoa.png similarity index 100% rename from textures/food_cocoa.png rename to food_basic/textures/food_cocoa.png diff --git a/textures/food_dark_chocolate.png b/food_basic/textures/food_dark_chocolate.png similarity index 100% rename from textures/food_dark_chocolate.png rename to food_basic/textures/food_dark_chocolate.png diff --git a/textures/food_egg.png b/food_basic/textures/food_egg.png similarity index 100% rename from textures/food_egg.png rename to food_basic/textures/food_egg.png diff --git a/textures/food_flour.png b/food_basic/textures/food_flour.png similarity index 100% rename from textures/food_flour.png rename to food_basic/textures/food_flour.png diff --git a/textures/food_meat.png b/food_basic/textures/food_meat.png similarity index 100% rename from textures/food_meat.png rename to food_basic/textures/food_meat.png diff --git a/textures/food_meat_raw.png b/food_basic/textures/food_meat_raw.png similarity index 100% rename from textures/food_meat_raw.png rename to food_basic/textures/food_meat_raw.png diff --git a/textures/food_milk.png b/food_basic/textures/food_milk.png similarity index 100% rename from textures/food_milk.png rename to food_basic/textures/food_milk.png diff --git a/textures/food_milk_chocolate.png b/food_basic/textures/food_milk_chocolate.png similarity index 100% rename from textures/food_milk_chocolate.png rename to food_basic/textures/food_milk_chocolate.png diff --git a/textures/food_orange_juice.png b/food_basic/textures/food_orange_juice.png similarity index 100% rename from textures/food_orange_juice.png rename to food_basic/textures/food_orange_juice.png diff --git a/textures/food_pasta.png b/food_basic/textures/food_pasta.png similarity index 100% rename from textures/food_pasta.png rename to food_basic/textures/food_pasta.png diff --git a/textures/food_pasta_bake.png b/food_basic/textures/food_pasta_bake.png similarity index 100% rename from textures/food_pasta_bake.png rename to food_basic/textures/food_pasta_bake.png diff --git a/textures/food_pasta_bake_raw.png b/food_basic/textures/food_pasta_bake_raw.png similarity index 100% rename from textures/food_pasta_bake_raw.png rename to food_basic/textures/food_pasta_bake_raw.png diff --git a/textures/food_potato.png b/food_basic/textures/food_potato.png similarity index 100% rename from textures/food_potato.png rename to food_basic/textures/food_potato.png diff --git a/textures/food_rainbow_juice.png b/food_basic/textures/food_rainbow_juice.png similarity index 100% rename from textures/food_rainbow_juice.png rename to food_basic/textures/food_rainbow_juice.png diff --git a/textures/food_soup_chicken.png b/food_basic/textures/food_soup_chicken.png similarity index 100% rename from textures/food_soup_chicken.png rename to food_basic/textures/food_soup_chicken.png diff --git a/textures/food_soup_chicken_raw.png b/food_basic/textures/food_soup_chicken_raw.png similarity index 100% rename from textures/food_soup_chicken_raw.png rename to food_basic/textures/food_soup_chicken_raw.png diff --git a/textures/food_soup_tomato.png b/food_basic/textures/food_soup_tomato.png similarity index 100% rename from textures/food_soup_tomato.png rename to food_basic/textures/food_soup_tomato.png diff --git a/textures/food_soup_tomato_raw.png b/food_basic/textures/food_soup_tomato_raw.png similarity index 100% rename from textures/food_soup_tomato_raw.png rename to food_basic/textures/food_soup_tomato_raw.png diff --git a/textures/food_strawberry.png b/food_basic/textures/food_strawberry.png similarity index 100% rename from textures/food_strawberry.png rename to food_basic/textures/food_strawberry.png diff --git a/textures/food_sugar.png b/food_basic/textures/food_sugar.png similarity index 100% rename from textures/food_sugar.png rename to food_basic/textures/food_sugar.png diff --git a/textures/food_tomato.png b/food_basic/textures/food_tomato.png similarity index 100% rename from textures/food_tomato.png rename to food_basic/textures/food_tomato.png diff --git a/textures/food_wheat.png b/food_basic/textures/food_wheat.png similarity index 100% rename from textures/food_wheat.png rename to food_basic/textures/food_wheat.png diff --git a/modpack.txt b/modpack.txt new file mode 100644 index 0000000..e69de29