diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d3de401
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.dds
\ No newline at end of file
diff --git a/About/About.xml b/About/About.xml
index c7089ec..d2dc10b 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -38,7 +38,8 @@
VanillaExpanded.VCookEHaute
Van.Beasts
erin.cottagecollection
- ferny.betterarchitect
- ferny.progressioncore
+
+
\ No newline at end of file
diff --git a/Mods and Shit/Keshig/Patches/keshig patch.xml b/Mods and Shit/Keshig/Patches/keshig patch.xml
index 3aeb7e9..8057fc0 100644
--- a/Mods and Shit/Keshig/Patches/keshig patch.xml
+++ b/Mods and Shit/Keshig/Patches/keshig patch.xml
@@ -1,4 +1,28 @@
-
+
-
+
+
+ Vanilla Factions Expanded - Medieval 2
+
+
+
+
+ Defs/RecipeDef[defName="DV_MakeGoreMust"]/researchPrerequisite
+
+
+ VFEM2_Wine
+
+
+
+
+ Defs/ThingDef[defName="DV_BloodwineBarrel"]/researchPrerequisites
+
+
+ VFEM2_Wine
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Mods and Shit/Medieval Overhaul/Patches/MO_Brewing&Wine.xml b/Mods and Shit/Medieval Overhaul/Patches/MO_Brewing&Wine.xml
new file mode 100644
index 0000000..6458e8f
--- /dev/null
+++ b/Mods and Shit/Medieval Overhaul/Patches/MO_Brewing&Wine.xml
@@ -0,0 +1,165 @@
+
+
+
+ Defs/RecipeDef[defName="Make_Wort"]
+
+
+ Brewing
+
+
+
+
+
+
+ Vanilla Brewing Expanded
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Mead" or defName="DankPyon_Wine"]
+
+
+ VBE_DrinksSimpleSpirits
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_JuiceApple"]/thingCategories
+
+
+ VBE_DrinksNonAlcoholic
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_JuiceAppleUnfermented"]/thingCategories
+
+
+ VBE_Musts
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_JuiceAppleUnfermented"]/thingCategories
+
+
+ VBE_Musts
+
+
+
+
+
+
+
+
+ Vanilla Factions Expanded - Medieval 2
+
+
+
+
+
+ Defs/RecipeDef[defName="DankPyon_MakeMustWine"]/researchPrerequisites
+
+
+ VFEM2_Wine
+
+
+
+
+ Defs/RecipeDef[defName="DankPyon_MakeMustMulberry"]/researchPrerequisites
+
+
+ VFEM2_Wine
+
+
+
+
+ Defs/RecipeDef[defName="DankPyon_MakeMustGriffon"]/researchPrerequisites
+
+
+ VFEM2_Wine
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Wine"]/researchPrerequisites
+
+
+ Defs/ThingDef[defName="DankPyon_Ale"]/researchPrerequisites
+
+
+ Defs/ThingDef[defName="DankPyon_Mead"]/researchPrerequisites
+
+
+ Defs/ThingDef[defName="DankPyon_Cider"]/researchPrerequisites
+
+
+ Defs/ResearchProjectDef[defName="VFEM2_Wine"]
+
+
+ Brewing
+
+
+
+
+ Defs
+
+
+ Ferny_MedievalOverhaul_VFEM2_ProgKitchen
+
+
+ VFEM2_Plant_Grape
+ DankPyon_Plant_Grape
+
+
+ VFEM2_Must
+ DankPyon_MustWine
+
+
+ VFEM2_Wine
+ DankPyon_Wine
+
+
+ VFEM2_RawGrapes
+ DankPyon_RawGrapes
+
+
+ VFEM2_MeadFermentingBarrel
+ BarrelProcessor
+
+
+ VFEM2_VFEM2_WineBarrel
+ BarrelProcessor
+
+
+ VFEM2_Mead
+ DankPyon_Mead
+
+
+
+
+
+
+ Defs/ThingDef[defName="BarrelProcessor"]/comps/li[@Class="ProcessorFramework.CompProperties_Processor"]/processes/li[.="VFEM2_Mead"]
+
+
+ Defs/ThingDef[defName="BarrelProcessor"]/comps/li[@Class="ProcessorFramework.CompProperties_Processor"]/processes/li[.="VFEM2_Wine"]
+
+
+
+ Defs/ThingDef[defName="FermentingBarrel"]/researchPrerequisites
+
+
+ Defs/ThingDef[defName="VFEM2_WineBarrel"]/researchPrerequisites
+
+
+
+
+
\ No newline at end of file
diff --git a/Mods and Shit/Medieval Overhaul/Patches/MO_VCE_Bakes.xml b/Mods and Shit/Medieval Overhaul/Patches/MO_VCE_Bakes.xml
new file mode 100644
index 0000000..03321cc
--- /dev/null
+++ b/Mods and Shit/Medieval Overhaul/Patches/MO_VCE_Bakes.xml
@@ -0,0 +1,46 @@
+
+
+
+ Defs/ThingDef[defName="DankPyon_StoneOven"]/researchPrerequisites
+
+
+ DankPyon_Oven
+
+
+
+
+ Always
+ Defs/ThingDef[defName="DankPyon_StoneOven"]/label
+
+ oven
+
+
+
+
+ Vanilla Cooking Expanded
+
+
+
+
+
+ Defs/RecipeDef[contains(defName, "VCE_CookBakeSimple")]
+
+
+ Defs/RecipeDef[contains(defName, "VCE_CookBakeFine")]/researchPrerequisites
+
+
+ DankPyon_Oven
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Mods and Shit/Medieval Overhaul/Patches/MO_VCE_Grilling.xml b/Mods and Shit/Medieval Overhaul/Patches/MO_VCE_Grilling.xml
new file mode 100644
index 0000000..668622e
--- /dev/null
+++ b/Mods and Shit/Medieval Overhaul/Patches/MO_VCE_Grilling.xml
@@ -0,0 +1,55 @@
+
+
+
+
+ Defs/RecipeDef[contains(defName, "DankPyon_MakeSausages")]/researchPrerequisites
+
+
+ DankPyon_Grill
+
+
+
+
+
+ Vanilla Cooking Expanded
+
+
+
+
+
+ Defs/RecipeDef[contains(defName, "VCE_CookGrill")]/recipeUsers
+
+
+ DankPyon_Grill
+
+
+
+
+ /Defs/RecipeDef[contains(defName, "VCE_CookGrillSimple")]
+
+
+ DankPyon_Grill
+
+
+
+
+ Defs/RecipeDef[contains(defName, "VCE_CookGrillFine")]/researchPrerequisites
+
+
+ DankPyon_Grill
+
+
+
+
+ Defs/ThingDef[defName="VCE_Grill"]/researchPrerequisites
+
+
+ Defs/ThingDef[defName="VCE_Grill"]/designationCategory
+
+
+ Defs/ResearchProjectDef[defName="VCE_Grilling"]
+
+
+
+
+
\ No newline at end of file
diff --git a/Mods and Shit/Medieval Overhaul/Patches/MO_VCE_Stews.xml b/Mods and Shit/Medieval Overhaul/Patches/MO_VCE_Stews.xml
new file mode 100644
index 0000000..e2df1d6
--- /dev/null
+++ b/Mods and Shit/Medieval Overhaul/Patches/MO_VCE_Stews.xml
@@ -0,0 +1,151 @@
+
+
+
+ Defs/ResearchProjectDef[defName="DankPyon_StewPot"]/label
+
+ soups & stews
+
+
+
+ Defs/ThingDef[defName="DankPyon_StewPot"]/researchPrerequisites
+
+
+ DankPyon_StewPot
+
+
+
+
+ Defs/RecipeDef[contains(defName, "DankPyon_CookMealCheeseSoup")]/researchPrerequisites
+
+ DankPyon_StewPot
+
+
+
+ Defs/RecipeDef[contains(defName, "DankPyon_CookMealCheeseSoup")]/recipeUsers
+
+
+ DankPyon_StewPot
+
+
+
+
+ Defs/RecipeDef[contains(defName, "DankPyon_CookMealBreadSoup")]/researchPrerequisites
+
+
+ DankPyon_StewPot
+
+
+
+
+ Defs/RecipeDef[contains(defName, "DankPyon_CookMealBreadSoup")]/recipeUsers
+
+
+ DankPyon_StewPot
+
+
+
+
+
+ Vanilla Cooking Expanded
+
+
+
+
+ Defs/RecipeDef[defName="VCE_CookSoupSimple"]/researchPrerequisite
+
+
+ DankPyon_StewPot
+ Electricity
+
+
+
+
+ Defs/RecipeDef[defName="VCE_CookSoupFine"]/researchPrerequisites
+
+
+ DankPyon_StewPot
+ Electricity
+
+
+
+
+ Defs/RecipeDef[defName="VCE_CookSoupLavish"]/researchPrerequisites
+
+
+ DankPyon_StewPot
+ DankPyon_IntermediateCooking
+ Electricity
+
+
+
+
+ Defs/RecipeDef[defName="VCE_CookSoupGourmet"]/researchPrerequisites
+
+
+ DankPyon_StewPot
+ DankPyon_AdvancedCooking
+ Electricity
+
+
+
+
+ Defs/ThingDef[defName="VCE_ElectricPot"]/researchPrerequisites
+
+
+ DankPyon_StewPot
+ Electricity
+
+
+
+
+ Defs/ResearchProjectDef[defName="VCE_SoupCooking"]
+
+
+
+
+
+
+ Vanilla Cooking Expanded - Stews
+
+
+
+
+ Defs/RecipeDef[defName="VCE_CookStewSimple"]/researchPrerequisite
+
+
+ DankPyon_StewPot
+
+
+
+
+ Defs/RecipeDef[defName="VCE_CookStewFine"]/researchPrerequisite
+
+
+ DankPyon_StewPot
+
+
+
+
+ Defs/RecipeDef[defName="VCE_CookStewLavish"]/researchPrerequisite
+
+
+ DankPyon_StewPot
+ DankPyon_IntermediateCooking
+
+
+
+
+ Defs/ThingDef[defName="VCE_StewPot"]/researchPrerequisites
+
+
+ DankPyon_StewPot
+
+
+
+
+ Defs/ResearchProjectDef[defName="VCE_StewCooking"]
+
+
+
+
+
\ No newline at end of file
diff --git a/Mods and Shit/Medieval Overhaul/Patches/medieval overhaul patch.xml b/Mods and Shit/Medieval Overhaul/Patches/medieval overhaul patch.xml
index 0376d69..4772d80 100644
--- a/Mods and Shit/Medieval Overhaul/Patches/medieval overhaul patch.xml
+++ b/Mods and Shit/Medieval Overhaul/Patches/medieval overhaul patch.xml
@@ -53,42 +53,6 @@
basic cooking table
-
-
- Always
- /Defs/ThingDef[defName="DankPyon_StoneOven"]/researchPrerequisites
-
-
-
- /Defs/ThingDef[defName="DankPyon_StoneOven"]/researchPrerequisites
-
-
- DankPyon_IntermediateCooking
-
-
-
-
-
-
-
-
- /Defs/ThingDef[defName="DankPyon_StoneOven"]
-
-
- DankPyon_IntermediateCooking
-
-
-
-
-
-
-
- Always
- Defs/ThingDef[defName="DankPyon_StoneOven"]/label
-
- oven
-
-
@@ -154,51 +118,6 @@
-
- Always
- Defs/ResearchProjectDef[defName="DankPyon_Grill"]/label
-
- searing
-
-
-
- Always
- Defs/ResearchProjectDef[defName="DankPyon_Grill"]/description
-
- Learn how to sear meat over an open flame, creating delicious seared sausages and meats.
-
-
-
- Always
- Defs/ThingDef[defName="DankPyon_Grill"]/label
-
- searing brazier
-
-
-
- /Defs/RecipeDef[contains(defName, "VCE_CookGrillFine")]/researchPrerequisites
-
-
- VCE_Grilling
-
-
-
-
- /Defs/RecipeDef[starts-with(defName, "VCE_CookGrillLavish")]/researchPrerequisites
-
-
- VCE_Grilling
-
-
-
-
- /Defs/RecipeDef[defName="VCE_CookGrillGourmet"]/researchPrerequisites
-
-
- VCE_Grilling
-
-
-
Always
Defs/ThingDef[defName="DankPyon_MealGrilledSausages"]/label
@@ -402,126 +321,7 @@
-
-
-
- Vanilla Factions Expanded - Medieval 2
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Plant_Grape"]/plant/sowResearchPrerequisites
-
-
- VFEM2_Wine
-
-
-
-
- Defs/RecipeDef[defName="DankPyon_MakeMustWine"]/researchPrerequisites
-
-
- VFEM2_Wine
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Wine"]/researchPrerequisites
-
-
- VFEM2_Wine
-
-
-
-
- Defs/ResearchProjectDef[defName="VFEM2_Wine"]
-
-
- Brewing
-
-
-
-
- Defs
-
-
- Ferny_MedievalOverhaul_VFEM2_ProgKitchen
-
-
- VFEM2_Plant_Grape
- DankPyon_Plant_Grape
-
-
- VFEM2_Must
- DankPyon_MustWine
-
-
- VFEM2_Wine
- DankPyon_Wine
-
-
- VFEM2_RawGrapes
- DankPyon_RawGrapes
-
-
- VFEM2_MeadFermentingBarrel
- BarrelProcessor
-
-
- VFEM2_VFEM2_WineBarrel
- BarrelProcessor
-
-
- VFEM2_Mead
- DankPyon_Mead
-
-
-
-
-
-
- Defs/ThingDef[defName="BarrelProcessor"]/comps/li[@Class="ProcessorFramework.CompProperties_Processor"]/processes/li[.="VFEM2_Mead"]
-
-
- Defs/ThingDef[defName="BarrelProcessor"]/comps/li[@Class="ProcessorFramework.CompProperties_Processor"]/processes/li[.="VFEM2_Wine"]
-
-
-
-
-
-
-
- Vanilla Brewing Expanded
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Mead" or defName="DankPyon_Wine"]
-
-
- VBE_DrinksSimpleSpirits
-
-
-
-
- Defs/ThingDef[defName="DankPyon_JuiceApple"]/thingCategories
-
-
- VBE_DrinksNonAlcoholic
-
-
-
-
- Defs/ThingDef[defName="DankPyon_JuiceAppleUnfermented"]/thingCategories
-
-
- VBE_Musts
-
-
-
-
-
-
+
@@ -814,6 +614,31 @@
-
-
+
+
+ Defs/TraderKindDef[defName="Orbital_Exotic"]/stockGenerators
+
+
+ DankPyon_Schematic
+ 1~1
+
+
+
+
+ Defs/TraderKindDef[defName="Caravan_Outlander_Exotic"]/stockGenerators
+
+
+ DankPyon_Schematic
+ 1~1
+
+
+
+
+ Defs/ResearchProjectDef[defName="DankPyon_IntermediateCooking"]
+
+
+ ClassicStart
+
+
+
\ No newline at end of file
diff --git a/Mods and Shit/VFE Classical/Patches/vfe classical patch.xml b/Mods and Shit/VFE Classical/Patches/vfe classical patch.xml
index ed8fe4e..cbc4f3d 100644
--- a/Mods and Shit/VFE Classical/Patches/vfe classical patch.xml
+++ b/Mods and Shit/VFE Classical/Patches/vfe classical patch.xml
@@ -1,46 +1,180 @@
-
+
-
-
- Medieval Overhaul
-
-
+
+
+ Medieval Overhaul
+
+
-
- Always
- Defs/ThingDef[defName="DankPyon_DryingRack_Small"]/researchPrerequisites
-
-
- VFEC_MeatDrying
-
-
-
-
- Always
- Defs/ThingDef[defName="DankPyon_DryingRack_Big"]/researchPrerequisites
-
-
- VFEC_MeatDrying
-
-
-
-
- /Defs
-
-
- MedievalOverhaul_VFEClassicalDryingRack
-
-
- VFEC_MeatDryingRack
- DankPyon_DryingRack_Small
-
-
-
-
-
+
+ Always
+ Defs/ThingDef[defName="DankPyon_DryingRack_Small"]/researchPrerequisites
+
+
+ VFEC_MeatDrying
+
+
+
+
+ Always
+ Defs/ThingDef[defName="DankPyon_DryingRack_Big"]/researchPrerequisites
+
+
+ VFEC_MeatDrying
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_DriedMeat"]/tradeability
+
+
+ /Defs
+
+
+ MedievalOverhaul_VFEClassicalDryingRack
+
+
+ VFEC_MeatDryingRack
+ DankPyon_DryingRack_Small
+ VFEC_Jerky
+ DankPyon_DriedMeat
+
+
+
+
+
+
+ /Defs
+
+
+
+ DankPyon_HayDryingRack_Small
+ hay drying rack (1x2)
+ A wooden rack to dry hay under the sun to dehydrate it into
+ straw.
+ MapMeshAndRealTime
+
+ Things/Building/Production/DryingRack1x2/DryingRack1x2
+ Graphic_Multi
+ CutoutComplex
+ (3,3)
+
+ (0.05,0.1,0.9,0.9)
+
+
+ Light
+ Building
+ false
+ PassThroughOnly
+ 0.5
+ 70
+
+ 500
+ 5
+ 100
+ 1.0
+
+ (2,1)
+
+ DankPyon_RawWood
+
+ 50
+ Building_WorkTable
+
+
+ 100
+ false
+ false
+ true
+ true
+ (0.0, 0.25)
+ (1.0, 1.0)
+ false
+
+ DankPyon_StrawProcess
+
+
+
+
+
+ PlaceWorker_NotUnderRoof
+
+ Rare
+ Production
+
+
+
+
+ /Defs
+
+
+
+ DankPyon_HayDryingRack_Big
+ hay drying rack (2x2)
+ A wooden rack to dry hay under the sun to dehydrate it into
+ straw.
+ MapMeshAndRealTime
+
+ Things/Building/Production/DryingRack2x2/DryingRack
+ Graphic_Multi
+ CutoutComplex
+ (3,3)
+
+ (0.05,0.1,0.9,0.9)
+
+
+ Medium
+ Building
+ false
+ PassThroughOnly
+ 0.5
+ 70
+
+ 500
+ 10
+ 100
+ 1.0
+
+ (2,2)
+
+ DankPyon_RawWood
+
+ 100
+
+
+ 200
+ false
+ false
+ true
+ true
+ (0.0, 0.25)
+ (1.0, 1.0)
+ false
+
+ DankPyon_StrawProcess
+
+
+
+
+
+ PlaceWorker_NotUnderRoof
+
+ Rare
+ Production
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_DryingRack_Small"]/comps/li[@Class="ProcessorFramework.CompProperties_Processor"]/processes/li[.="DankPyon_StrawProcess"]
+
+
+
+ Defs/ThingDef[defName="DankPyon_DryingRack_Big"]/comps/li[@Class="ProcessorFramework.CompProperties_Processor"]/processes/li[.="DankPyon_StrawProcess"]
+
-
-
+
+
\ No newline at end of file