Merge 7937d522af into e4b9ff0373

README.md

@@ -3,7 +3,7 @@ The Food Mod
 
 This is the main mod in the food mod collection.
 
-Version 2.2
+Version 2.3
 
 The Aims
 --------
@@ -16,7 +16,9 @@ All content should follow these aims:
 Documentation
 -------------
 
-Recipe guide: https://www.dropbox.com/s/tsvjmobv9n3isu0/food_crafting.pdf?dl=1
+2.2: Recipe guide: https://www.dropbox.com/s/tsvjmobv9n3isu0/food_crafting.pdf?dl=1
+
+2.3: There are several changes in recipes, due to conflicts with other mods. Recipe guide is in crafting_guide.txt
 
 Expansion Packs
 ---------------
@@ -36,7 +38,5 @@ License for textures: CC-BY-SA
 Exceptions:
 
 * Baked potato texture by Doc, WTFPL
-* Dough, flour and wheat textures from default farming mod, WTFPL
+* Various other textures by Flipsels, WTFPL
-* Egg and milk textures from Mobf, CC BY SA
+* Dough, flour and wheat textures from default farming mod, WTFPL
-
-Have I missed out credit? Please tell me.

crafting_guide.txt

@@ -0,0 +1,385 @@
+food -- Crafting Guide
+--------------------------------------------------------------------------------
+
+
+SECTION 1
+--------------------------------------------------------------------------------
+Recipes
+--------------------------------------------------------------------------------
+
+
+APPLE JUICE
++---+---+---+
+|   |   |   |
++---+---+---+
+|   | A |   |
++---+---+---+
+|   | C |   |
++---+---+---+
+A = Apple
+C = Cup
+
+BOWL
++---+---+---+
+|   |   |   |
++---+---+---+
+| X |   | X |
++---+---+---+
+|   | X |   |
++---+---+---+
+X = Cay lump
+
+BUTTER
++---+---+---+
+|   |   |   |
++---+---+---+
+|   | M | M |
++---+---+---+
+|   |   |   |
++---+---+---+
+M = Milk
+
+CACTUS JUICE
++---+---+---+
+|   |   |   |
++---+---+---+
+|   | A |   |
++---+---+---+
+|   | C |   |
++---+---+---+
+A = CACTUS
+C = Cup
+
+CAKEMIX
++---+---+---+
+|   |   |   |
++---+---+---+
+| X | Y | Z |
++---+---+---+
+|   |   |   |
++---+---+---+
+X = FLOUR
+Y = SUGAR
+Z = EGG
+
+CAKEMIX
++---+---+---+
+|   |   |   |
++---+---+---+
+| X | Y | Z |
++---+---+---+
+|   |   |   |
++---+---+---+
+X = FLOUR
+Y = SUGAR
+Z = EGG
+
+CAKEMIX COCOA
++---+---+---+
+|   | C |   |
++---+---+---+
+| X | Y | Z |
++---+---+---+
+|   |   |   |
++---+---+---+
+C = COCOA
+X = FLOUR
+Y = SUGAR
+Z = EGG
+
+CAKEMIX CARROT
++---+---+---+
+|   | C |   |
++---+---+---+
+| X | Y | Z |
++---+---+---+
+|   |   |   |
++---+---+---+
+C = CARROT
+X = FLOUR
+Y = SUGAR
+Z = EGG
+
+RAW CHICKEN SOUP
++---+---+---+
+|   |   |   |
++---+---+---+
+| W | V | W |
++---+---+---+
+|   | B |   |
++---+---+---+
+V = Meat
+W = Water bucket
+B = Bowl
+
+CHEESE
++---+---+---+
+|   |   |   |
++---+---+---+
+|   | B | B |
++---+---+---+
+|   |   |   |
++---+---+---+
+B = Butter
+
+DARK CHOCOLAT
++---+---+---+
+|   |   |   |
++---+---+---+
+| X | X | X |
++---+---+---+
+|   |   |   |
++---+---+---+
+X = Cocoa bean
+
+MILK CHOCOLAT
++---+---+---+
+|   | M |   |
++---+---+---+
+| X | X | X |
++---+---+---+
+|   |   |   |
++---+---+---+
+M = Milk
+X = Cocoa bean
+
+PASTA
++---+---+---+
+|   |   |   |
++---+---+---+
+| X | Y | Y |
++---+---+---+
+|   |   |   |
++---+---+---+
+X = Flour
+Y = Egg
+
+RAW PASTA BAKE
++---+---+---+
+|   | X |   |
++---+---+---+
+|   | Y |   |
++---+---+---+
+|   | Z |   |
++---+---+---+
+X = Cheese
+Y = Pasta
+Z = Bowl
+
+RHUBARB JUICE
++---+---+---+
+|   |   |   |
++---+---+---+
+|   | A |   |
++---+---+---+
+|   | C |   |
++---+---+---+
+A = Rhubarb
+C = Cup
+
+RAINBOW JUICE
++---+---+---+
+|   |   |   |
++---+---+---+
+|   | A |   |
++---+---+---+
+|   | C |   |
++---+---+---+
+A = NYANCAT RAINBOW BLOCK
+C = Cup
+
+STRAWBERRY JUICE
++---+---+---+
+|   |   |   |
++---+---+---+
+|   | A |   |
++---+---+---+
+|   | C |   |
++---+---+---+
+A = STRAWBERRY
+C = Cup
+
+RAW TOMATO SOUP
++---+---+---+
+|   |   |   |
++---+---+---+
+| W | T | W |
++---+---+---+
+|   | B |   |
++---+---+---+
+T = Tomato
+W = Water bucket
+B = Bowl
+
+
+SECTION 2
+--------------------------------------------------------------------------------
+There are several options to craft basic ingredients Within the food module.
+This is normally only necessary when some optional mods are omitted.
+To enable/disable crafting of basic ingredients, adjust food.conf.
+Further note: crafted items can only be used for food. It doesn't
+--------------------------------------------------------------------------------
+
+CARROT
+mod:	    docfarming,farming_plus,jkfarming,plantlib
++---+---+---+
+|   | Y |   |
++---+---+---+
+|   | X |   |
++---+---+---+
+|   | X |   |
++---+---+---+
+X = [group:potato]			(check below how to craft potatoes)
+Y = [default:grass_1]
+
+COCOA
+mod:	    farming_plus
++---+---+---+
+|   | X |   |
++---+---+---+
+| X |   | X |
++---+---+---+
+|   | X |   |
++---+---+---+
+X = [default:apple]
+
+EGG
+mod:	    animalmaterials,jkanimals
++---+---+---+
+|   | X |   |
++---+---+---+
+| X | Y | X |
++---+---+---+
+|   | X |   |
++---+---+---+
+X = [default:sand]
+Y = [default:dirt]
+
+FISH (RAW)
+mod:        animalmaterials
++---+---+---+
+|   |   |   |
++---+---+---+
+| X | X | Y |
++---+---+---+
+|   |   |   |
++---+---+---+
+X = [default:apple]
+Y = [default:dirt]
+
+FLOUR
+mod:        farming
++---+---+---+
+| X |   |   |
++---+---+---+
+| X | X | X |
++---+---+---+
+|   |   |   |
++---+---+---+
+X = [wheat]
+
+MEAT (RAW)
+mod:        animalmaterials
++---+---+---+
+|   |   |   |
++---+---+---+
+| Y | X | X |
++---+---+---+
+|   |   |   |
++---+---+---+
+X = [default:apple]
+Y = [default:dirt]
+
+MILK
+mod:        animalmaterials
++---+---+---+
+|   |   |   |
++---+---+---+
+|   | X |   |
++---+---+---+
+|   | Y |   |
++---+---+---+
+X = [default:sand]
+Y = [bucket:bucket_water]
+
+POTATO
+mod:        docfarming,farming_plus,veggies
++---+---+---+
+|   | X |   |
++---+---+---+
+|   | Y |   |
++---+---+---+
+|   | X |   |
++---+---+---+
+X = [default:dirt]
+Y = [default:apple]
+
+RHUBARB
+mod:	    farming_plus
++---+---+---+
+|   | Y |   |
++---+---+---+
+|   | X |   |
++---+---+---+
+|   | X |   |
++---+---+---+
+Y = [default:grass_1]
+X = [default:apple]
+
+
+STRAWBERRY
+mod:	    bushes_classic(plantlife),farming_plus
++---+---+---+
+|   | Y |   |
++---+---+---+
+|   | X |   |
++---+---+---+
+|   |   |   |
++---+---+---+
+Y = [default:grass_1]
+X = [default:apple]
+
+SUGAR
+mod:	    bushes_classic(plantlife),jkfarming
++---+---+---+
+|   |   |   |
++---+---+---+
+| X | X |   |
++---+---+---+
+|   |   |   |
++---+---+---+
+X = [default:papyrus]
+
+TOMATO
+mod:	    farming_plus
++---+---+---+
+|   | X |   |
++---+---+---+
+|   | Y |   |
++---+---+---+
+|   | X |   |
++---+---+---+
+X = [default:desert_sand]
+Y = [default:apple]
+
+WHEAT
+mod:  		farming
++---+---+---+
+|   | X |   |
++---+---+---+
+|   | X |   |
++---+---+---+
+|   | X |   |
++---+---+---+
+X = [default:dry_shrub]
+
+GLASS (CUP)
+mod:  		vessels
++---+---+---+
+| X |   | X |
++---+---+---+
+| X |   | X |
++---+---+---+
+| X | X | X |
++---+---+---+
+X = [default:glass]

depends.txt

@@ -1,8 +1,8 @@
 animalmaterials?
 bushes_classic?
-default?
+default
-docfarming?
 diet?
+docfarming?
 farming?
 farming_plus?
 hud?
@@ -14,4 +14,4 @@ mobs?
 mobfcooking?
 plantlib?
 veggies?
-vessels?
+vessels?

food.conf

@@ -0,0 +1,24 @@
+-- Food MOD Configuration
+---------------------------------------------------------------------------------------------
+-- craft options:
+-- 0: unable to craft. The items must be gained from other mods (see crafting guide for mods)
+-- 1: able to craft.
+-- 2: autodetect: If the item is detected in a loaded mod
+--                crafting this item within food mod is disabled.
+---------------------------------------------------------------------------------------------
+-- note: disabling craft options in existing worlds might result in unknown items.
+---------------------------------------------------------------------------------------------
+FOOD_CRAFT_CARROT  = 2
+FOOD_CRAFT_COCOA   = 2
+FOOD_CRAFT_EGG	   = 2
+FOOD_CRAFT_FISH    = 2
+FOOD_CRAFT_FLOUR   = 2
+FOOD_CRAFT_MEAT    = 2
+FOOD_CRAFT_MILK    = 2
+FOOD_CRAFT_POTATO  = 2
+FOOD_CRAFT_RHUBARB = 2
+FOOD_CRAFT_SBERRY  = 2
+FOOD_CRAFT_SUGAR   = 2
+FOOD_CRAFT_TOMATO  = 2
+FOOD_CRAFT_WHEAT   = 2
+FOOD_CRAFT_GLASS   = 2

locale/de.txt

@@ -34,3 +34,4 @@ Carrot Cake = Karottenkuchen
 Cake Mix = Backmischung
 Chocolate Cake Mix = Backmischung fuer Schokoladenkuchen
 Carrot Cake Mix = Backmischung fuer Karottenkuchen
+Strawberry = Erdbeer

locale/nl.txt

@@ -0,0 +1,36 @@
+# Translation by Flipsels
+
+Wheat = Tarwe
+Flour = Meel
+Potato = Aardappel
+Tomato = Tomaat
+Carrot = Wortel
+Milk = Melk
+Egg = Ei
+Cocoa Bean = Cacaoboon
+Raw meat = rauw vlees
+Venison = Wildbraad
+Sugar = Suiker
+Dark Chocolate = Pure chokolade
+Milk Chocolate = Melk chokolade
+Pasta = Pasta
+Bowl = Schotel
+Butter = Boter
+Cheese = Kaas
+Baked Potato = Gebakken Aardappel
+Pasta Bake = Pastaschotel
+Raw Pasta Bake = Ongekookte Pastaschotel
+chicken Soup = Kippensoep
+tomato Soup = Tomatensoep
+Uncooked tomato Soup = Ongekookte Tomatensoep
+Uncooked chicken Soup = Gekookte Kippensoep
+apple Juice = Appelsap
+cactus Juice = Cactussap
+Rainbow Juice = Regenboogsap
+Cake = Koek
+Chocolate Cake = Chokoladekoek
+Carrot Cake = Wortelkoek
+Cake Mix = Bakbeslag
+Chocolate Cake Mix = Bakbeslag voor chokoladekoek
+Carrot Cake Mix = Bakbeslag voor wortelkoek
+Strawberry = Aardbei