From 0ec2e54bc8c87f75008b5c186dc94e7a6b6f04d9 Mon Sep 17 00:00:00 2001 From: Rubenwardy Date: Thu, 5 Sep 2013 19:12:08 +0100 Subject: Initial version 2 commit --- textures/animalmaterials_egg.png | Bin 672 -> 0 bytes textures/animalmaterials_meat_raw.png | Bin 426 -> 0 bytes textures/animalmaterials_milk.png | Bin 559 -> 0 bytes textures/farming_banana.png | Bin 515 -> 0 bytes textures/farming_cake_mix.png | Bin 343 -> 0 bytes textures/farming_carrot.png | Bin 575 -> 0 bytes textures/farming_cocoa_bean.png | Bin 184 -> 0 bytes textures/farming_flour.png | Bin 344 -> 0 bytes textures/farming_rhubarb.png | Bin 502 -> 0 bytes textures/farming_strawberry.png | Bin 250 -> 0 bytes textures/food_baked_potato.png | Bin 321 -> 0 bytes textures/food_baking_bread_slice.png | Bin 0 -> 437 bytes textures/food_baking_bun_mix.png | Bin 0 -> 474 bytes textures/food_baking_dough.png | Bin 0 -> 343 bytes textures/food_bread.png | Bin 918 -> 0 bytes textures/food_bread_slice.png | Bin 519 -> 0 bytes textures/food_bun.png | Bin 457 -> 0 bytes textures/food_bun_mix.png | Bin 474 -> 0 bytes textures/food_butter.png | Bin 506 -> 476 bytes textures/food_cactus_slice.png | Bin 726 -> 0 bytes textures/food_cake.png | Bin 908 -> 0 bytes textures/food_cake_carrot.png | Bin 782 -> 0 bytes textures/food_cake_carrot_texture.png | Bin 0 -> 786 bytes textures/food_cake_carrot_texture_side.png | Bin 0 -> 780 bytes textures/food_cake_cheese.png | Bin 0 -> 363 bytes textures/food_cake_choco.png | Bin 942 -> 0 bytes textures/food_cake_choco_texture.png | Bin 0 -> 712 bytes textures/food_cake_choco_texture_side.png | Bin 0 -> 709 bytes textures/food_cake_texture.png | Bin 0 -> 758 bytes textures/food_cake_texture_side.png | Bin 0 -> 758 bytes textures/food_cakemix_carrot.png | Bin 0 -> 335 bytes textures/food_cakemix_choco.png | Bin 0 -> 331 bytes textures/food_cakemix_plain.png | Bin 0 -> 327 bytes textures/food_carrot.png | Bin 0 -> 575 bytes textures/food_cheese.png | Bin 518 -> 487 bytes textures/food_choco_dark.png | Bin 480 -> 0 bytes textures/food_choco_milk.png | Bin 479 -> 0 bytes textures/food_choco_powder.png | Bin 510 -> 0 bytes textures/food_chocolate_powder.png | Bin 0 -> 510 bytes textures/food_clay_mug.png | Bin 596 -> 0 bytes textures/food_cocoa.png | Bin 0 -> 184 bytes textures/food_coffee.png | Bin 1399 -> 0 bytes textures/food_coffee_cooked.png | Bin 895 -> 0 bytes textures/food_coffee_cup.png | Bin 873 -> 0 bytes textures/food_corn_pip.png | Bin 286 -> 0 bytes textures/food_crumble_rhubarb.png | Bin 523 -> 0 bytes textures/food_crumble_rhubarb_raw.png | Bin 500 -> 0 bytes textures/food_cup.png | Bin 564 -> 0 bytes textures/food_dark_chocolate.png | Bin 0 -> 480 bytes textures/food_egg.png | Bin 0 -> 672 bytes textures/food_flour.png | Bin 0 -> 378 bytes textures/food_juice_apple.png | Bin 729 -> 0 bytes textures/food_juice_cactus.png | Bin 867 -> 0 bytes textures/food_juice_rainbow.png | Bin 396 -> 0 bytes textures/food_meat.png | Bin 624 -> 0 bytes textures/food_milk.png | Bin 0 -> 559 bytes textures/food_milk_chocolate.png | Bin 0 -> 479 bytes textures/food_mug.png | Bin 780 -> 0 bytes textures/food_oven_bottom.png | Bin 731 -> 0 bytes textures/food_oven_front.png | Bin 250 -> 0 bytes textures/food_oven_front_active.png | Bin 293 -> 0 bytes textures/food_oven_side.png | Bin 731 -> 0 bytes textures/food_oven_top.png | Bin 731 -> 0 bytes textures/food_pasta.png | Bin 0 -> 310 bytes textures/food_pasta_bake.png | Bin 0 -> 366 bytes textures/food_pasta_bake_raw.png | Bin 0 -> 324 bytes textures/food_pastry.png | Bin 842 -> 0 bytes textures/food_pastry_carrot.png | Bin 846 -> 0 bytes textures/food_pastry_choco.png | Bin 854 -> 0 bytes textures/food_potato.png | Bin 252 -> 0 bytes textures/food_soup_chicken.png | Bin 355 -> 0 bytes textures/food_soup_chicken_raw.png | Bin 356 -> 0 bytes textures/food_soup_tomato.png | Bin 1216 -> 0 bytes textures/food_soup_tomato_raw.png | Bin 321 -> 0 bytes textures/food_strawberry.png | Bin 0 -> 250 bytes textures/food_sw_cheese.png | Bin 545 -> 0 bytes textures/food_sw_meat.png | Bin 549 -> 0 bytes textures/food_tart_base.png | Bin 521 -> 0 bytes textures/food_tart_base_raw.png | Bin 521 -> 0 bytes textures/food_tart_strawberry.png | Bin 548 -> 0 bytes textures/food_tomato.png | Bin 0 -> 338 bytes textures/food_wheat.png | Bin 0 -> 566 bytes textures/my_mobs_cooked_rabbit.png | Bin 271 -> 0 bytes 83 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 textures/animalmaterials_egg.png delete mode 100644 textures/animalmaterials_meat_raw.png delete mode 100644 textures/animalmaterials_milk.png delete mode 100644 textures/farming_banana.png delete mode 100644 textures/farming_cake_mix.png delete mode 100644 textures/farming_carrot.png delete mode 100644 textures/farming_cocoa_bean.png delete mode 100644 textures/farming_flour.png delete mode 100644 textures/farming_rhubarb.png delete mode 100644 textures/farming_strawberry.png delete mode 100644 textures/food_baked_potato.png create mode 100644 textures/food_baking_bread_slice.png create mode 100644 textures/food_baking_bun_mix.png create mode 100644 textures/food_baking_dough.png delete mode 100644 textures/food_bread.png delete mode 100644 textures/food_bread_slice.png delete mode 100644 textures/food_bun.png delete mode 100644 textures/food_bun_mix.png delete mode 100644 textures/food_cactus_slice.png delete mode 100644 textures/food_cake.png delete mode 100644 textures/food_cake_carrot.png create mode 100644 textures/food_cake_carrot_texture.png create mode 100644 textures/food_cake_carrot_texture_side.png create mode 100644 textures/food_cake_cheese.png delete mode 100644 textures/food_cake_choco.png create mode 100644 textures/food_cake_choco_texture.png create mode 100644 textures/food_cake_choco_texture_side.png create mode 100644 textures/food_cake_texture.png create mode 100644 textures/food_cake_texture_side.png create mode 100644 textures/food_cakemix_carrot.png create mode 100644 textures/food_cakemix_choco.png create mode 100644 textures/food_cakemix_plain.png create mode 100644 textures/food_carrot.png delete mode 100644 textures/food_choco_dark.png delete mode 100644 textures/food_choco_milk.png delete mode 100644 textures/food_choco_powder.png create mode 100644 textures/food_chocolate_powder.png delete mode 100644 textures/food_clay_mug.png create mode 100644 textures/food_cocoa.png delete mode 100644 textures/food_coffee.png delete mode 100644 textures/food_coffee_cooked.png delete mode 100644 textures/food_coffee_cup.png delete mode 100644 textures/food_corn_pip.png delete mode 100644 textures/food_crumble_rhubarb.png delete mode 100644 textures/food_crumble_rhubarb_raw.png delete mode 100644 textures/food_cup.png create mode 100644 textures/food_dark_chocolate.png create mode 100644 textures/food_egg.png create mode 100644 textures/food_flour.png delete mode 100644 textures/food_juice_apple.png delete mode 100644 textures/food_juice_cactus.png delete mode 100644 textures/food_juice_rainbow.png delete mode 100644 textures/food_meat.png create mode 100644 textures/food_milk.png create mode 100644 textures/food_milk_chocolate.png delete mode 100644 textures/food_mug.png delete mode 100644 textures/food_oven_bottom.png delete mode 100644 textures/food_oven_front.png delete mode 100644 textures/food_oven_front_active.png delete mode 100644 textures/food_oven_side.png delete mode 100644 textures/food_oven_top.png create mode 100644 textures/food_pasta.png create mode 100644 textures/food_pasta_bake.png create mode 100644 textures/food_pasta_bake_raw.png delete mode 100644 textures/food_pastry.png delete mode 100644 textures/food_pastry_carrot.png delete mode 100644 textures/food_pastry_choco.png delete mode 100644 textures/food_potato.png delete mode 100644 textures/food_soup_chicken.png delete mode 100644 textures/food_soup_chicken_raw.png delete mode 100644 textures/food_soup_tomato.png delete mode 100644 textures/food_soup_tomato_raw.png create mode 100644 textures/food_strawberry.png delete mode 100644 textures/food_sw_cheese.png delete mode 100644 textures/food_sw_meat.png delete mode 100644 textures/food_tart_base.png delete mode 100644 textures/food_tart_base_raw.png delete mode 100644 textures/food_tart_strawberry.png create mode 100644 textures/food_tomato.png create mode 100644 textures/food_wheat.png delete mode 100644 textures/my_mobs_cooked_rabbit.png (limited to 'textures') diff --git a/textures/animalmaterials_egg.png b/textures/animalmaterials_egg.png deleted file mode 100644 index 50010de..0000000 Binary files a/textures/animalmaterials_egg.png and /dev/null differ diff --git a/textures/animalmaterials_meat_raw.png b/textures/animalmaterials_meat_raw.png deleted file mode 100644 index 0dea4ec..0000000 Binary files a/textures/animalmaterials_meat_raw.png and /dev/null differ diff --git a/textures/animalmaterials_milk.png b/textures/animalmaterials_milk.png deleted file mode 100644 index e535264..0000000 Binary files a/textures/animalmaterials_milk.png and /dev/null differ diff --git a/textures/farming_banana.png b/textures/farming_banana.png deleted file mode 100644 index f775e14..0000000 Binary files a/textures/farming_banana.png and /dev/null differ diff --git a/textures/farming_cake_mix.png b/textures/farming_cake_mix.png deleted file mode 100644 index 5c4b197..0000000 Binary files a/textures/farming_cake_mix.png and /dev/null differ diff --git a/textures/farming_carrot.png b/textures/farming_carrot.png deleted file mode 100644 index 5ed61ac..0000000 Binary files a/textures/farming_carrot.png and /dev/null differ diff --git a/textures/farming_cocoa_bean.png b/textures/farming_cocoa_bean.png deleted file mode 100644 index 4ad6b35..0000000 Binary files a/textures/farming_cocoa_bean.png and /dev/null differ diff --git a/textures/farming_flour.png b/textures/farming_flour.png deleted file mode 100644 index 7c302bf..0000000 Binary files a/textures/farming_flour.png and /dev/null differ diff --git a/textures/farming_rhubarb.png b/textures/farming_rhubarb.png deleted file mode 100644 index 849f61b..0000000 Binary files a/textures/farming_rhubarb.png and /dev/null differ diff --git a/textures/farming_strawberry.png b/textures/farming_strawberry.png deleted file mode 100644 index 0a80f45..0000000 Binary files a/textures/farming_strawberry.png and /dev/null differ diff --git a/textures/food_baked_potato.png b/textures/food_baked_potato.png deleted file mode 100644 index 425c4ae..0000000 Binary files a/textures/food_baked_potato.png and /dev/null differ diff --git a/textures/food_baking_bread_slice.png b/textures/food_baking_bread_slice.png new file mode 100644 index 0000000..174c900 Binary files /dev/null and b/textures/food_baking_bread_slice.png differ diff --git a/textures/food_baking_bun_mix.png b/textures/food_baking_bun_mix.png new file mode 100644 index 0000000..ac2e7f4 Binary files /dev/null and b/textures/food_baking_bun_mix.png differ diff --git a/textures/food_baking_dough.png b/textures/food_baking_dough.png new file mode 100644 index 0000000..5c4b197 Binary files /dev/null and b/textures/food_baking_dough.png differ diff --git a/textures/food_bread.png b/textures/food_bread.png deleted file mode 100644 index 6dca983..0000000 Binary files a/textures/food_bread.png and /dev/null differ diff --git a/textures/food_bread_slice.png b/textures/food_bread_slice.png deleted file mode 100644 index 6ada224..0000000 Binary files a/textures/food_bread_slice.png and /dev/null differ diff --git a/textures/food_bun.png b/textures/food_bun.png deleted file mode 100644 index abbe121..0000000 Binary files a/textures/food_bun.png and /dev/null differ diff --git a/textures/food_bun_mix.png b/textures/food_bun_mix.png deleted file mode 100644 index ac2e7f4..0000000 Binary files a/textures/food_bun_mix.png and /dev/null differ diff --git a/textures/food_butter.png b/textures/food_butter.png index 97ea805..cb6f054 100644 Binary files a/textures/food_butter.png and b/textures/food_butter.png differ diff --git a/textures/food_cactus_slice.png b/textures/food_cactus_slice.png deleted file mode 100644 index 5af32ad..0000000 Binary files a/textures/food_cactus_slice.png and /dev/null differ diff --git a/textures/food_cake.png b/textures/food_cake.png deleted file mode 100644 index 250303b..0000000 Binary files a/textures/food_cake.png and /dev/null differ diff --git a/textures/food_cake_carrot.png b/textures/food_cake_carrot.png deleted file mode 100644 index 9e95bbd..0000000 Binary files a/textures/food_cake_carrot.png and /dev/null differ diff --git a/textures/food_cake_carrot_texture.png b/textures/food_cake_carrot_texture.png new file mode 100644 index 0000000..1acfccd Binary files /dev/null and b/textures/food_cake_carrot_texture.png differ diff --git a/textures/food_cake_carrot_texture_side.png b/textures/food_cake_carrot_texture_side.png new file mode 100644 index 0000000..ef961d0 Binary files /dev/null and b/textures/food_cake_carrot_texture_side.png differ diff --git a/textures/food_cake_cheese.png b/textures/food_cake_cheese.png new file mode 100644 index 0000000..dc7467e Binary files /dev/null and b/textures/food_cake_cheese.png differ diff --git a/textures/food_cake_choco.png b/textures/food_cake_choco.png deleted file mode 100644 index b75f8ed..0000000 Binary files a/textures/food_cake_choco.png and /dev/null differ diff --git a/textures/food_cake_choco_texture.png b/textures/food_cake_choco_texture.png new file mode 100644 index 0000000..20ae8b5 Binary files /dev/null and b/textures/food_cake_choco_texture.png differ diff --git a/textures/food_cake_choco_texture_side.png b/textures/food_cake_choco_texture_side.png new file mode 100644 index 0000000..4f7a8b4 Binary files /dev/null and b/textures/food_cake_choco_texture_side.png differ diff --git a/textures/food_cake_texture.png b/textures/food_cake_texture.png new file mode 100644 index 0000000..f4e9b27 Binary files /dev/null and b/textures/food_cake_texture.png differ diff --git a/textures/food_cake_texture_side.png b/textures/food_cake_texture_side.png new file mode 100644 index 0000000..314ed39 Binary files /dev/null and b/textures/food_cake_texture_side.png differ diff --git a/textures/food_cakemix_carrot.png b/textures/food_cakemix_carrot.png new file mode 100644 index 0000000..30dd002 Binary files /dev/null and b/textures/food_cakemix_carrot.png differ diff --git a/textures/food_cakemix_choco.png b/textures/food_cakemix_choco.png new file mode 100644 index 0000000..cd88169 Binary files /dev/null and b/textures/food_cakemix_choco.png differ diff --git a/textures/food_cakemix_plain.png b/textures/food_cakemix_plain.png new file mode 100644 index 0000000..7b9f392 Binary files /dev/null and b/textures/food_cakemix_plain.png differ diff --git a/textures/food_carrot.png b/textures/food_carrot.png new file mode 100644 index 0000000..5ed61ac Binary files /dev/null and b/textures/food_carrot.png differ diff --git a/textures/food_cheese.png b/textures/food_cheese.png index aef8b59..eec185c 100644 Binary files a/textures/food_cheese.png and b/textures/food_cheese.png differ diff --git a/textures/food_choco_dark.png b/textures/food_choco_dark.png deleted file mode 100644 index 3e1df7b..0000000 Binary files a/textures/food_choco_dark.png and /dev/null differ diff --git a/textures/food_choco_milk.png b/textures/food_choco_milk.png deleted file mode 100644 index bbfa37e..0000000 Binary files a/textures/food_choco_milk.png and /dev/null differ diff --git a/textures/food_choco_powder.png b/textures/food_choco_powder.png deleted file mode 100644 index 49840ed..0000000 Binary files a/textures/food_choco_powder.png and /dev/null differ diff --git a/textures/food_chocolate_powder.png b/textures/food_chocolate_powder.png new file mode 100644 index 0000000..49840ed Binary files /dev/null and b/textures/food_chocolate_powder.png differ diff --git a/textures/food_clay_mug.png b/textures/food_clay_mug.png deleted file mode 100644 index 73eeecf..0000000 Binary files a/textures/food_clay_mug.png and /dev/null differ diff --git a/textures/food_cocoa.png b/textures/food_cocoa.png new file mode 100644 index 0000000..4ad6b35 Binary files /dev/null and b/textures/food_cocoa.png differ diff --git a/textures/food_coffee.png b/textures/food_coffee.png deleted file mode 100644 index 944fd73..0000000 Binary files a/textures/food_coffee.png and /dev/null differ diff --git a/textures/food_coffee_cooked.png b/textures/food_coffee_cooked.png deleted file mode 100644 index 8f75897..0000000 Binary files a/textures/food_coffee_cooked.png and /dev/null differ diff --git a/textures/food_coffee_cup.png b/textures/food_coffee_cup.png deleted file mode 100644 index 272299a..0000000 Binary files a/textures/food_coffee_cup.png and /dev/null differ diff --git a/textures/food_corn_pip.png b/textures/food_corn_pip.png deleted file mode 100644 index bf2ac77..0000000 Binary files a/textures/food_corn_pip.png and /dev/null differ diff --git a/textures/food_crumble_rhubarb.png b/textures/food_crumble_rhubarb.png deleted file mode 100644 index 4b8811e..0000000 Binary files a/textures/food_crumble_rhubarb.png and /dev/null differ diff --git a/textures/food_crumble_rhubarb_raw.png b/textures/food_crumble_rhubarb_raw.png deleted file mode 100644 index 5c1689e..0000000 Binary files a/textures/food_crumble_rhubarb_raw.png and /dev/null differ diff --git a/textures/food_cup.png b/textures/food_cup.png deleted file mode 100644 index 9fadc0d..0000000 Binary files a/textures/food_cup.png and /dev/null differ diff --git a/textures/food_dark_chocolate.png b/textures/food_dark_chocolate.png new file mode 100644 index 0000000..3e1df7b Binary files /dev/null and b/textures/food_dark_chocolate.png differ diff --git a/textures/food_egg.png b/textures/food_egg.png new file mode 100644 index 0000000..50010de Binary files /dev/null and b/textures/food_egg.png differ diff --git a/textures/food_flour.png b/textures/food_flour.png new file mode 100644 index 0000000..a526b20 Binary files /dev/null and b/textures/food_flour.png differ diff --git a/textures/food_juice_apple.png b/textures/food_juice_apple.png deleted file mode 100644 index fc2b8ef..0000000 Binary files a/textures/food_juice_apple.png and /dev/null differ diff --git a/textures/food_juice_cactus.png b/textures/food_juice_cactus.png deleted file mode 100644 index 6180eed..0000000 Binary files a/textures/food_juice_cactus.png and /dev/null differ diff --git a/textures/food_juice_rainbow.png b/textures/food_juice_rainbow.png deleted file mode 100644 index 7eb97cf..0000000 Binary files a/textures/food_juice_rainbow.png and /dev/null differ diff --git a/textures/food_meat.png b/textures/food_meat.png deleted file mode 100644 index d4e4abb..0000000 Binary files a/textures/food_meat.png and /dev/null differ diff --git a/textures/food_milk.png b/textures/food_milk.png new file mode 100644 index 0000000..e535264 Binary files /dev/null and b/textures/food_milk.png differ diff --git a/textures/food_milk_chocolate.png b/textures/food_milk_chocolate.png new file mode 100644 index 0000000..bbfa37e Binary files /dev/null and b/textures/food_milk_chocolate.png differ diff --git a/textures/food_mug.png b/textures/food_mug.png deleted file mode 100644 index f68173b..0000000 Binary files a/textures/food_mug.png and /dev/null differ diff --git a/textures/food_oven_bottom.png b/textures/food_oven_bottom.png deleted file mode 100644 index c86782a..0000000 Binary files a/textures/food_oven_bottom.png and /dev/null differ diff --git a/textures/food_oven_front.png b/textures/food_oven_front.png deleted file mode 100644 index 55ee708..0000000 Binary files a/textures/food_oven_front.png and /dev/null differ diff --git a/textures/food_oven_front_active.png b/textures/food_oven_front_active.png deleted file mode 100644 index ba732e6..0000000 Binary files a/textures/food_oven_front_active.png and /dev/null differ diff --git a/textures/food_oven_side.png b/textures/food_oven_side.png deleted file mode 100644 index c86782a..0000000 Binary files a/textures/food_oven_side.png and /dev/null differ diff --git a/textures/food_oven_top.png b/textures/food_oven_top.png deleted file mode 100644 index c86782a..0000000 Binary files a/textures/food_oven_top.png and /dev/null differ diff --git a/textures/food_pasta.png b/textures/food_pasta.png new file mode 100644 index 0000000..9fa194b Binary files /dev/null and b/textures/food_pasta.png differ diff --git a/textures/food_pasta_bake.png b/textures/food_pasta_bake.png new file mode 100644 index 0000000..81221a6 Binary files /dev/null and b/textures/food_pasta_bake.png differ diff --git a/textures/food_pasta_bake_raw.png b/textures/food_pasta_bake_raw.png new file mode 100644 index 0000000..2a6294a Binary files /dev/null and b/textures/food_pasta_bake_raw.png differ diff --git a/textures/food_pastry.png b/textures/food_pastry.png deleted file mode 100644 index 2df203b..0000000 Binary files a/textures/food_pastry.png and /dev/null differ diff --git a/textures/food_pastry_carrot.png b/textures/food_pastry_carrot.png deleted file mode 100644 index b0b973b..0000000 Binary files a/textures/food_pastry_carrot.png and /dev/null differ diff --git a/textures/food_pastry_choco.png b/textures/food_pastry_choco.png deleted file mode 100644 index 578637b..0000000 Binary files a/textures/food_pastry_choco.png and /dev/null differ diff --git a/textures/food_potato.png b/textures/food_potato.png deleted file mode 100644 index 6e91d6a..0000000 Binary files a/textures/food_potato.png and /dev/null differ diff --git a/textures/food_soup_chicken.png b/textures/food_soup_chicken.png deleted file mode 100644 index db9f10d..0000000 Binary files a/textures/food_soup_chicken.png and /dev/null differ diff --git a/textures/food_soup_chicken_raw.png b/textures/food_soup_chicken_raw.png deleted file mode 100644 index 468c73f..0000000 Binary files a/textures/food_soup_chicken_raw.png and /dev/null differ diff --git a/textures/food_soup_tomato.png b/textures/food_soup_tomato.png deleted file mode 100644 index 5cc23be..0000000 Binary files a/textures/food_soup_tomato.png and /dev/null differ diff --git a/textures/food_soup_tomato_raw.png b/textures/food_soup_tomato_raw.png deleted file mode 100644 index 1eac22c..0000000 Binary files a/textures/food_soup_tomato_raw.png and /dev/null differ diff --git a/textures/food_strawberry.png b/textures/food_strawberry.png new file mode 100644 index 0000000..0a80f45 Binary files /dev/null and b/textures/food_strawberry.png differ diff --git a/textures/food_sw_cheese.png b/textures/food_sw_cheese.png deleted file mode 100644 index d025e8f..0000000 Binary files a/textures/food_sw_cheese.png and /dev/null differ diff --git a/textures/food_sw_meat.png b/textures/food_sw_meat.png deleted file mode 100644 index 56f4e56..0000000 Binary files a/textures/food_sw_meat.png and /dev/null differ diff --git a/textures/food_tart_base.png b/textures/food_tart_base.png deleted file mode 100644 index 43e056d..0000000 Binary files a/textures/food_tart_base.png and /dev/null differ diff --git a/textures/food_tart_base_raw.png b/textures/food_tart_base_raw.png deleted file mode 100644 index e6d1ac4..0000000 Binary files a/textures/food_tart_base_raw.png and /dev/null differ diff --git a/textures/food_tart_strawberry.png b/textures/food_tart_strawberry.png deleted file mode 100644 index 6fcfa99..0000000 Binary files a/textures/food_tart_strawberry.png and /dev/null differ diff --git a/textures/food_tomato.png b/textures/food_tomato.png new file mode 100644 index 0000000..c998b60 Binary files /dev/null and b/textures/food_tomato.png differ diff --git a/textures/food_wheat.png b/textures/food_wheat.png new file mode 100644 index 0000000..8ecd735 Binary files /dev/null and b/textures/food_wheat.png differ diff --git a/textures/my_mobs_cooked_rabbit.png b/textures/my_mobs_cooked_rabbit.png deleted file mode 100644 index 339ab20..0000000 Binary files a/textures/my_mobs_cooked_rabbit.png and /dev/null differ -- cgit v1.2.3 From c40055af83fb46ff2e00d8a0c0b76c494c9c3a97 Mon Sep 17 00:00:00 2001 From: Rubenwardy Date: Tue, 10 Sep 2013 18:35:04 +0100 Subject: Soup and BetterHud support --- depends.txt | 1 + init.lua | 95 +++++++++++++++++++++++++++++++++---- textures/food_soup_chicken.png | Bin 0 -> 355 bytes textures/food_soup_chicken_raw.png | Bin 0 -> 325 bytes textures/food_soup_tomato.png | Bin 0 -> 1216 bytes textures/food_soup_tomato_raw.png | Bin 0 -> 321 bytes 6 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 textures/food_soup_chicken.png create mode 100644 textures/food_soup_chicken_raw.png create mode 100644 textures/food_soup_tomato.png create mode 100644 textures/food_soup_tomato_raw.png (limited to 'textures') diff --git a/depends.txt b/depends.txt index 4efe608..928e6b7 100644 --- a/depends.txt +++ b/depends.txt @@ -5,3 +5,4 @@ plantlib? docfarming? animalmaterials? my_mobs? +hud? diff --git a/init.lua b/init.lua index f44f02e..4cfd58b 100644 --- a/init.lua +++ b/init.lua @@ -52,6 +52,13 @@ function food.asupport(group,add) add() end +function food.item_eat(amt) + if minetest.get_modpath("hud") then + return hud.item_eat(hunger_change) + else + return minetest.item_eat(amt) + end +end -- Add support for other mods food.support("wheat","farming","farming:wheat") @@ -67,6 +74,9 @@ food.support("cocoa","farming_plus","farming_plus:cocoa_bean") food.support("milk","animalmaterials","animalmaterials:milk") food.support("milk","my_mobs","my_mobs:milk_glass_cup") food.support("egg","animalmaterials","animalmaterials:egg") +--food.support("meat_raw","mobs","mobs:meat_raw") +food.support("meat_raw","animalmaterials","animalmaterials:meat_raw") +food.support("meat","mobs","mobs:meat") -- Default inbuilt ingrediants food.asupport("wheat",function() @@ -123,7 +133,7 @@ food.asupport("strawberry",function() minetest.register_craftitem("food:strawberry", { description = "Strawberry", inventory_image = "food_strawberry.png", - on_use = minetest.item_eat(2), + on_use = food.item_eat(2), groups = {food_strawberry=1} }) minetest.register_craft({ @@ -138,7 +148,7 @@ food.asupport("carrot",function() description = "Carrot", inventory_image = "food_carrot.png", groups = {food_carrot=1}, - on_use = minetest.item_eat(3) + on_use = food.item_eat(3) }) minetest.register_craft({ output = "food:carrot", @@ -151,7 +161,7 @@ food.asupport("milk",function() minetest.register_craftitem("food:milk", { description = "Milk", image = "food_milk.png", - on_use = minetest.item_eat(1), + on_use = food.item_eat(1), groups = { eatable=1, food_milk = 1 }, stack_max=10 }) @@ -194,6 +204,36 @@ food.asupport("cocoa",function() } }) end) +food.asupport("meat_raw",function() + minetest.register_craftitem("food:meat_raw", { + description = "Raw meat", + image = "food_meat_raw.png", + on_use = food.item_eat(1), + groups = { meat=1, eatable=1, food_meat_raw=1 }, + stack_max=25 + }) + minetest.register_craft({ + output = "food:meat_raw", + recipe = { + {"default:apple"}, + {"default:dirt"} + } + }) +end) +food.asupport("food:meat",function() + minetest.register_craftitem("food:meat", { + description = "Venison", + inventory_image = "food_meat.png", + groups = {food_meat=1,food_chicken=1} + }) + + minetest.register_craft({ + type = "cooking", + output = "food:meat", + recipe = "group:food_meat_raw", + cooktime = 30 + }) +end) -- Register sugar minetest.register_craftitem("food:sugar", { @@ -268,6 +308,13 @@ minetest.register_craftitem("food:bowl",{ inventory_image = "food_bowl.png", groups = {food_bowl=1} }) +minetest.register_craft({ + output = "food:bowl", + recipe = { + {"default:clay_lump","","default:clay_lump"}, + {"","default:clay_lump",""} + } +}) -- Register butter minetest.register_craftitem("food:butter", { description = "Butter", @@ -285,7 +332,7 @@ minetest.register_craft({ minetest.register_craftitem("food:cheese", { description = "Cheese", inventory_image = "food_cheese.png", - on_use = minetest.item_eat(4), + on_use = food.item_eat(4), groups = {food_cheese=1} }) minetest.register_craft({ @@ -299,6 +346,7 @@ minetest.register_craft({ minetest.register_craftitem("food:pasta_bake",{ description = "Pasta Bake", inventory_image = "food_pasta_bake.png", + on_use = food.item_eat(4), groups = {food=3} }) minetest.register_craftitem("food:pasta_bake_raw",{ @@ -319,10 +367,41 @@ minetest.register_craft({ } }) +-- Soups +local soups = {"tomato","chicken"} +for i=1, #soups do + local flav = soups[i] + minetest.register_craftitem("food:soup_"..flav,{ + description = flav.." Soup", + inventory_image = "food_soup_"..flav..".png", + on_use = food.item_eat(4), + groups = {food=3} + }) + minetest.register_craftitem("food:soup_"..flav.."_raw",{ + description = "Uncooked ".. flav.." Soup", + inventory_image = "food_soup_"..flav.."_raw.png", + + }) + minetest.register_craft({ + type = "cooking", + output = "food:soup_"..flav, + recipe = "food:soup_"..flav.."_raw", + }) + minetest.register_craft({ + output = "food:soup_"..flav.."_raw", + recipe = { + {"", "", ""}, + {"bucket:bucket_water", "group:food_"..flav, "bucket:bucket_water"}, + {"", "group:food_bowl", ""}, + }, + replacements = {{"bucket:bucket_water", "bucket:bucket_empty"},{"bucket:bucket_water", "bucket:bucket_empty"}} + }) +end + -- Register cakes minetest.register_node("food:cake", { description = "Cake", - on_use = minetest.item_eat(4), + on_use = food.item_eat(4), groups={food=3,crumbly=3}, tiles = { "food_cake_texture.png", @@ -347,7 +426,7 @@ minetest.register_node("food:cake", { }) minetest.register_node("food:cake_choco", { description = "Chocolate Cake", - on_use = minetest.item_eat(4), + on_use = food.item_eat(4), groups={food=3,crumbly=3}, tiles = { "food_cake_choco_texture.png", @@ -372,7 +451,7 @@ minetest.register_node("food:cake_choco", { }) minetest.register_node("food:cake_carrot", { description = "Carrot Cake", - on_use = minetest.item_eat(4), + on_use = food.item_eat(4), groups={food=3,crumbly=3}, walkable = false, sunlight_propagates = true, @@ -398,7 +477,7 @@ minetest.register_node("food:cake_carrot", { minetest.register_craftitem("food:cake_cheese",{ description = "Cheese cake", inventory_image = "food_cake_cheese.png", - on_use = minetest.item_eat(4), + on_use = food.item_eat(4), groups={food=3,crumbly=3} }) minetest.register_craft({ diff --git a/textures/food_soup_chicken.png b/textures/food_soup_chicken.png new file mode 100644 index 0000000..db9f10d Binary files /dev/null and b/textures/food_soup_chicken.png differ diff --git a/textures/food_soup_chicken_raw.png b/textures/food_soup_chicken_raw.png new file mode 100644 index 0000000..0cf6b21 Binary files /dev/null and b/textures/food_soup_chicken_raw.png differ diff --git a/textures/food_soup_tomato.png b/textures/food_soup_tomato.png new file mode 100644 index 0000000..5cc23be Binary files /dev/null and b/textures/food_soup_tomato.png differ diff --git a/textures/food_soup_tomato_raw.png b/textures/food_soup_tomato_raw.png new file mode 100644 index 0000000..1eac22c Binary files /dev/null and b/textures/food_soup_tomato_raw.png differ -- cgit v1.2.3 From b17c3c6ed423752a55072180076718b9c36eab3d Mon Sep 17 00:00:00 2001 From: Rubenwardy Date: Mon, 16 Sep 2013 19:21:22 +0100 Subject: Juices, potato, meat and more --- README.md | 15 ++++-- depends.txt | 1 + init.lua | 113 +++++++++++++++++++++++++++++++++++++--- textures/food_apple_juice.png | Bin 0 -> 729 bytes textures/food_baked_potato.png | Bin 0 -> 321 bytes textures/food_cactus_juice.png | Bin 0 -> 867 bytes textures/food_meat.png | Bin 0 -> 624 bytes textures/food_meat_raw.png | Bin 0 -> 426 bytes textures/food_potato.png | Bin 0 -> 252 bytes textures/food_rainbow_juice.png | Bin 0 -> 396 bytes 10 files changed, 118 insertions(+), 11 deletions(-) create mode 100644 textures/food_apple_juice.png create mode 100644 textures/food_baked_potato.png create mode 100644 textures/food_cactus_juice.png create mode 100644 textures/food_meat.png create mode 100644 textures/food_meat_raw.png create mode 100644 textures/food_potato.png create mode 100644 textures/food_rainbow_juice.png (limited to 'textures') diff --git a/README.md b/README.md index 2762b24..59ddd96 100644 --- a/README.md +++ b/README.md @@ -21,17 +21,22 @@ Other mods There are expansion mods avaliable. Just install them in a mod folder, and everything should be fine. -* Modern food (Needs updating) -* English food (Coming Soon) -* Asian food (Coming Soon) +* Modern food (Needs updating) - burgers, soft drinks, pop corn, coffee, etc +* English food (Coming Soon) - breakfast, pastries, pasties, buns, muffins, teas, cheese +* Asian food (Coming Soon) - indian, chinese, thai Licensing --------- -This mod, its code, images and nodeboxes, are licensed under: +The code, textures and nodeboxes in this mod are, unless otherwise notified, licensed under CC BY SA. ANDREW "RUBENWARDY" WARD Creative Commons BY-SA 3.0 (or similar) -http://creativecommons.org/licenses/by-sa/3.0/ \ No newline at end of file +http://creativecommons.org/licenses/by-sa/3.0/ + +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. \ No newline at end of file diff --git a/depends.txt b/depends.txt index 928e6b7..dc26709 100644 --- a/depends.txt +++ b/depends.txt @@ -6,3 +6,4 @@ docfarming? animalmaterials? my_mobs? hud? +vessels? diff --git a/init.lua b/init.lua index 4cfd58b..d308eb8 100644 --- a/init.lua +++ b/init.lua @@ -7,10 +7,17 @@ -- basic foods -- ===================================== -food = { supported={} } +food = { + supported={}, + atsup={}, + df={}, + debug=true +} + function food.support(group,mod,item) + food.atsup[group] = true if not minetest.get_modpath(mod) then - print("'"..mod.."' is not installed") + print("mod '"..mod.."' is not installed") return end @@ -23,7 +30,7 @@ function food.support(group,mod,item) local data = minetest.registered_items[item] if not data then - print(item.." not found") + print("item '",item.."' not found") return end @@ -34,9 +41,10 @@ function food.support(group,mod,item) else minetest.register_node(":"..item,data) end - food.supported[group] = true + food.supported[group] = true end function food.asupport(group,add) + food.df[group] = true if food.supported[group] then return end @@ -60,9 +68,29 @@ function food.item_eat(amt) end end +-- Debug to check all supports have inbuilt +if food.debug then +minetest.after(0, function() + for name, val in pairs(food.atsup) do + if not food.df[name] then + print("[FOOD DEBUG] Ingredient "..name.." has no built in equiv") + + end + end + + for name, val in pairs(food.df) do + if not food.atsup[name] then + print("[FOOD DEBUG] Inbuilt ingredient "..name.." has no supported external equiv") + + end + end +end) +end + -- Add support for other mods food.support("wheat","farming","farming:wheat") food.support("flour","farming","farming:flour") +food.support("potato","docfarming","docfarming:potato") food.support("tomato","farming_plus","farming_plus:tomato_item") food.support("tomato","plantlib","plantlib:tomato") food.support("strawberry","farming_plus","farming_plus:strawberry_item") @@ -77,6 +105,8 @@ food.support("egg","animalmaterials","animalmaterials:egg") --food.support("meat_raw","mobs","mobs:meat_raw") food.support("meat_raw","animalmaterials","animalmaterials:meat_raw") food.support("meat","mobs","mobs:meat") +food.support("cup","vessels","vessels:drinking_glass") +food.support("cup","animalmaterials","animalmaterials:glass") -- Default inbuilt ingrediants food.asupport("wheat",function() @@ -114,6 +144,20 @@ food.asupport("flour",function() } }) end) +food.asupport("potato",function() + minetest.register_craftitem("food:potato", { + description = "Potato", + inventory_image = "food_potato.png", + }) + minetest.register_craft({ + output = "food:potato", + recipe = { + {"default:dirt"}, + {"default:apple"} + + } + }) +end) food.asupport("tomato",function() minetest.register_craftitem("food:tomato", { description = "Tomato", @@ -220,7 +264,7 @@ food.asupport("meat_raw",function() } }) end) -food.asupport("food:meat",function() +food.asupport("meat",function() minetest.register_craftitem("food:meat", { description = "Venison", inventory_image = "food_meat.png", @@ -235,6 +279,16 @@ food.asupport("food:meat",function() }) end) +if minetest.get_modpath("animalmaterials") then + minetest.register_craft({ + type = "cooking", + output = "group:food_meat", + recipe = "group:food_meat_raw", + cooktime = 30 + }) + +end + -- Register sugar minetest.register_craftitem("food:sugar", { description = "Sugar", @@ -342,6 +396,18 @@ minetest.register_craft({ } }) +-- Register baked potato +minetest.register_craftitem("food:baked_potato", { + description = "Baked Potato", + inventory_image = "food_baked_potato.png", + on_use = food.item_eat(6), +}) +minetest.register_craft({ + type = "cooking", + output = "food:baked_potato", + recipe = "group:food_potato", +}) + -- Register pasta bake minetest.register_craftitem("food:pasta_bake",{ description = "Pasta Bake", @@ -367,7 +433,7 @@ minetest.register_craft({ } }) --- Soups +-- Register Soups local soups = {"tomato","chicken"} for i=1, #soups do local flav = soups[i] @@ -398,6 +464,41 @@ for i=1, #soups do }) end +-- Juices +local juices = {"apple","cactus"} +for i=1, #juices do + local flav = juices[i] + minetest.register_craftitem("food:"..flav.."_juice", { + description = flav.." Juice", + inventory_image = "food_"..flav.."_juice.png", + on_use = minetest.item_eat(2), + }) + + minetest.register_craft({ + output = "food:"..flav.."_juice 4", + recipe = { + {"","",""}, + {"","default:"..flav,""}, + {"","group:food_cup",""}, + } + }) +end + +minetest.register_craftitem("food:rainbow_juice", { + description = "Rainbow Juice", + inventory_image = "food_rainbow_juice.png", + on_use = minetest.item_eat(20), +}) + +minetest.register_craft({ + output = "food:rainbow_juice 99", + recipe = { + {"","",""}, + {"","default:nyancat_rainbow",""}, + {"","group:food_cup",""}, + } +}) + -- Register cakes minetest.register_node("food:cake", { description = "Cake", diff --git a/textures/food_apple_juice.png b/textures/food_apple_juice.png new file mode 100644 index 0000000..fc2b8ef Binary files /dev/null and b/textures/food_apple_juice.png differ diff --git a/textures/food_baked_potato.png b/textures/food_baked_potato.png new file mode 100644 index 0000000..425c4ae Binary files /dev/null and b/textures/food_baked_potato.png differ diff --git a/textures/food_cactus_juice.png b/textures/food_cactus_juice.png new file mode 100644 index 0000000..6180eed Binary files /dev/null and b/textures/food_cactus_juice.png differ diff --git a/textures/food_meat.png b/textures/food_meat.png new file mode 100644 index 0000000..d4e4abb Binary files /dev/null and b/textures/food_meat.png differ diff --git a/textures/food_meat_raw.png b/textures/food_meat_raw.png new file mode 100644 index 0000000..0dea4ec Binary files /dev/null and b/textures/food_meat_raw.png differ diff --git a/textures/food_potato.png b/textures/food_potato.png new file mode 100644 index 0000000..6e91d6a Binary files /dev/null and b/textures/food_potato.png differ diff --git a/textures/food_rainbow_juice.png b/textures/food_rainbow_juice.png new file mode 100644 index 0000000..7eb97cf Binary files /dev/null and b/textures/food_rainbow_juice.png differ -- cgit v1.2.3