Merge pull request #3969 from ZB333ZB/master

Fix merge conflicts in ZB333ZB Patches mod
skyarkhangel · Nov 15, 2024 · c1f09b0 · c1f09b0
2 parents 4716001 + d8c0321
commit c1f09b0
Show file tree

Hide file tree

Showing 120 changed files with 80 additions and 6,045 deletions.
diff --git a/Mods/ZB333ZB's Patches/Core/ModSettings/Assemblies/0Harmony.dll b/Mods/ZB333ZB's Patches/Core/ModSettings/Assemblies/0Harmony.dll
diff --git a/Mods/ZB333ZB's Patches/Core/ModSettings/Assemblies/ModSettings.dll b/Mods/ZB333ZB's Patches/Core/ModSettings/Assemblies/ModSettings.dll
diff --git a/...SK/AutoRebuildTerrainOnSeismicActivity/Assemblies/AutoRebuildTerrainOnSeismicActivity.dll b/...SK/AutoRebuildTerrainOnSeismicActivity/Assemblies/AutoRebuildTerrainOnSeismicActivity.dll
diff --git a/...333ZB's Patches/ModPatches/Core SK/EnhancedDefSelector/Assemblies/EnhancedDefSelector.dll b/...333ZB's Patches/ModPatches/Core SK/EnhancedDefSelector/Assemblies/EnhancedDefSelector.dll
diff --git a/.../ZB333ZB's Patches/ModPatches/Deep Storage/StorageSelector/Assemblies/StorageSelector.dll b/.../ZB333ZB's Patches/ModPatches/Deep Storage/StorageSelector/Assemblies/StorageSelector.dll
diff --git a/...atches/ModPatches/Dubs Bad Hygiene/ToggleDBHGridsPatch/Assemblies/ToggleDBHGridsPatch.dll b/...atches/ModPatches/Dubs Bad Hygiene/ToggleDBHGridsPatch/Assemblies/ToggleDBHGridsPatch.dll
diff --git a/...ZB's Patches/ModPatches/Dubs Bad Hygiene/ToggleDBHGridsPatch/Defs/ToggleDBHGridsPatch.xml b/...ZB's Patches/ModPatches/Dubs Bad Hygiene/ToggleDBHGridsPatch/Defs/ToggleDBHGridsPatch.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
-  <ToggleDBHGridsPatch.ModSettings>
-    <defName>ToggleDBHGridsPatchSettings</defName>
-    <deepWaterResearchDefName>Hygiene_2A</deepWaterResearchDefName>
-  </ToggleDBHGridsPatch.ModSettings>
+    <ToggleDBHGridsPatch.ToggleDBHGridsPatchDef>
+        <defName>ToggleDBHGridsPatch</defName>
+        <deepWaterResearchDefName>Hygiene_2A</deepWaterResearchDefName>
+    </ToggleDBHGridsPatch.ToggleDBHGridsPatchDef>
 </Defs>
diff --git a/...odPatches/Dubs Bad Hygiene/ToggleDBHGridsPatch/Textures/DBH/UI/ShowDBHGrids.png b/...odPatches/Dubs Bad Hygiene/ToggleDBHGridsPatch/Textures/DBH/UI/ShowDBHGrids.png
diff --git a/...333ZB's Patches/ModPatches/Locks/ApplyToAllDoorsPatch/Assemblies/ApplyToAllDoorsPatch.dll b/...333ZB's Patches/ModPatches/Locks/ApplyToAllDoorsPatch/Assemblies/ApplyToAllDoorsPatch.dll
diff --git a/...odPatches/Rimefeller/ToggleRimefellerGridsPatch/Assemblies/ToggleRimefellerGridsPatch.dll b/...odPatches/Rimefeller/ToggleRimefellerGridsPatch/Assemblies/ToggleRimefellerGridsPatch.dll
diff --git a/...ches/ModPatches/Rimefeller/ToggleRimefellerGridsPatch/Defs/ToggleRimefellerGridsPatch.xml b/...ches/ModPatches/Rimefeller/ToggleRimefellerGridsPatch/Defs/ToggleRimefellerGridsPatch.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
-  <ToggleRimefellerGridsPatch.ModSettings>
-    <defName>ToggleRimefellerGridsPatchSettings</defName>
-    <oilResearchDefName>Oil_Industry_C1</oilResearchDefName>
-    <deepOilResearchDefName>Oil_Industry_C7</deepOilResearchDefName>
-  </ToggleRimefellerGridsPatch.ModSettings>
+    <ToggleRimefellerGridsPatch.ToggleRimefellerGridsPatchDef>
+        <defName>ToggleRimefellerGridsPatch</defName>
+        <oilResearchDefName>Oil_Industry_C1</oilResearchDefName>
+        <deepOilResearchDefName>Oil_Industry_C7</deepOilResearchDefName>
+    </ToggleRimefellerGridsPatch.ToggleRimefellerGridsPatchDef>
 </Defs>
diff --git a/...eller/ToggleRimefellerGridsPatch/Textures/Rimefeller/UI/ShowRimefellerGrids.png b/...eller/ToggleRimefellerGridsPatch/Textures/Rimefeller/UI/ShowRimefellerGrids.png
diff --git a/Mods/ZB333ZB's Patches/Source/.gitignore b/Mods/ZB333ZB's Patches/Source/.gitignore
@@ -0,0 +1,2 @@
+obj/
+bin/
diff --git a/Mods/ZB333ZB's Patches/Source/ApplyToAllDoorsPatch/ApplyToAllDoorsPatch.cs b/Mods/ZB333ZB's Patches/Source/ApplyToAllDoorsPatch/ApplyToAllDoorsPatch.cs
@@ -1,4 +1,4 @@
-using HarmonyLib;
+using HarmonyLib;
 using Verse;
 using RimWorld;
 using System.Linq;

diff --git a/Mods/ZB333ZB's Patches/Source/ApplyToAllDoorsPatch/ApplyToAllDoorsPatch.csproj b/Mods/ZB333ZB's Patches/Source/ApplyToAllDoorsPatch/ApplyToAllDoorsPatch.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>

diff --git a/...B's Patches/Source/ApplyToAllDoorsPatch/obj/ApplyToAllDoorsPatch.csproj.nuget.dgspec.json b/...B's Patches/Source/ApplyToAllDoorsPatch/obj/ApplyToAllDoorsPatch.csproj.nuget.dgspec.json
diff --git a/...333ZB's Patches/Source/ApplyToAllDoorsPatch/obj/ApplyToAllDoorsPatch.csproj.nuget.g.props b/...333ZB's Patches/Source/ApplyToAllDoorsPatch/obj/ApplyToAllDoorsPatch.csproj.nuget.g.props
diff --git a/...3ZB's Patches/Source/ApplyToAllDoorsPatch/obj/ApplyToAllDoorsPatch.csproj.nuget.g.targets b/...3ZB's Patches/Source/ApplyToAllDoorsPatch/obj/ApplyToAllDoorsPatch.csproj.nuget.g.targets
diff --git a/.../Source/ApplyToAllDoorsPatch/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs b/.../Source/ApplyToAllDoorsPatch/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
diff --git a/...33ZB's Patches/Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.AssemblyInfo.cs b/...33ZB's Patches/Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.AssemblyInfo.cs
diff --git a/...tches/Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.AssemblyInfoInputs.cache b/...tches/Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.AssemblyInfoInputs.cache
diff --git a/...yToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.GeneratedMSBuildEditorConfig.editorconfig b/...yToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.GeneratedMSBuildEditorConfig.editorconfig
diff --git a/...ZB333ZB's Patches/Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.assets.cache b/...ZB333ZB's Patches/Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.assets.cache
diff --git a/...Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.csproj.AssemblyReference.cache b/...Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.csproj.AssemblyReference.cache
diff --git a/...Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.csproj.CoreCompileInputs.cache b/...Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.csproj.CoreCompileInputs.cache
diff --git a/...es/Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.csproj.FileListAbsolute.txt b/...es/Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.csproj.FileListAbsolute.txt
diff --git a/Mods/ZB333ZB's Patches/Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.dll b/Mods/ZB333ZB's Patches/Source/ApplyToAllDoorsPatch/obj/Debug/ApplyToAllDoorsPatch.dll