Skip to content

Commit

Permalink
Merge pull request #50 from simon-82/dev
Browse files Browse the repository at this point in the history
1.18
  • Loading branch information
simon-82 committed Nov 28, 2015
2 parents fbcc76d + 7b6f34c commit 64edcd2
Show file tree
Hide file tree
Showing 48 changed files with 1,180 additions and 215 deletions.
Expand Up @@ -36,17 +36,18 @@
</AdvancedResearchDef>

<AdvancedResearchDef>
<defName>AgricultureIIICook</defName>
<defName>AgricultureIIIFoodPrep</defName>
<Priority>0</Priority>
<researchDefs>
<li>Hydroponics</li>
</researchDefs>
<recipeDefs>
<li>MakeTofu</li>
<li>MakeTofu10x</li>
<li>MakeTofubulk</li>
<li>Makesoymilk</li>
</recipeDefs>
<thingDefs>
<li>CookStove</li>
<li>TableButcher</li>
</thingDefs>
</AdvancedResearchDef>

Expand All @@ -71,7 +72,25 @@

<!-- Cooking -->
<AdvancedResearchDef>
<defName>CookingII</defName>
<defName>CookingIFoodPrep</defName>
<Priority>0</Priority>
<researchDefs>
<li>Brewing</li>
</researchDefs>
<recipeDefs>
<li>MakeSugar</li>
<li>MakeFlour</li>
<li>Makecheese</li>
<li>MakeFruitDrink</li>
<li>MakeEthanolFuel</li>
</recipeDefs>
<thingDefs>
<li>TableButcher</li>
</thingDefs>
</AdvancedResearchDef>

<AdvancedResearchDef>
<defName>CookingIIStove</defName>
<Priority>0</Priority>
<researchDefs>
<li>CookingII</li>
Expand All @@ -80,12 +99,46 @@
<li>BrewTea</li>
<li>BrewSpectagoTea</li>
<li>MakeChocolate</li>
<li>MakeChocoMilk</li>
<li>MakeFruitYogurt</li>
</recipeDefs>
<thingDefs>
<li>CookStove</li>
</thingDefs>
</AdvancedResearchDef>

<AdvancedResearchDef>
<defName>CookingIIGrill</defName>
<Priority>0</Priority>
<researchDefs>
<li>CookingII</li>
</researchDefs>
<recipeDefs>
<li>MakeBurger</li>
<li>MakeBurgerCheese</li>
<li>MakeBurgerDeluxe</li>
<li>MakeCheeseGrilled</li>
</recipeDefs>
<thingDefs>
<li>TableGrill</li>
</thingDefs>
</AdvancedResearchDef>

<AdvancedResearchDef>
<defName>CookingIIOven</defName>
<Priority>0</Priority>
<researchDefs>
<li>CookingII</li>
</researchDefs>
<recipeDefs>
<li>MakeSweetBun</li>
<li>MakePizza</li>
</recipeDefs>
<thingDefs>
<li>TableOven</li>
</thingDefs>
</AdvancedResearchDef>




Expand Down

0 comments on commit 64edcd2

Please sign in to comment.