diff --git a/.gitattributes b/.gitattributes index 7892406..1ca91da 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,4 +2,6 @@ .vs* export-ignore Source/ export-ignore -Textures/Things/Items/Unfinished/Blueprint.psd export-ignore \ No newline at end of file +Textures/Things/Items/Unfinished/Blueprint.psd export-ignore +v1.1/Assemblies/0Harmony.dll export-ignore +Unity/ export-ignore \ No newline at end of file diff --git a/.gitignore b/.gitignore index 711afd0..ad72f16 100644 --- a/.gitignore +++ b/.gitignore @@ -305,3 +305,4 @@ __pycache__/ # should be stored in the .pubxml.user file. # End of https://www.gitignore.io/api/visualstudio,visualstudiocode +v1.1/Assemblies/0Harmony.dll diff --git a/About/About.xml b/About/About.xml index 1954080..e664069 100644 --- a/About/About.xml +++ b/About/About.xml @@ -3,11 +3,26 @@ Omni Core Drill DoctorVanGogh, TheUbie & pointcache https://github.com/DoctorVanGogh/MiningShaft - 1.0.0 + DoctorVanGogh.MiningShaft + +
  • 1.0
  • +
  • 1.1
  • +
    + +
  • + brrainz.harmony + Harmony + https://github.com/pardeike/HarmonyRimWorld/releases/latest + steam://url/CommunityFilePage/2009463077 +
  • +
    + +
  • brrainz.harmony
  • +
    \ No newline at end of file diff --git a/LoadFolders.xml b/LoadFolders.xml new file mode 100644 index 0000000..3d1d7f3 --- /dev/null +++ b/LoadFolders.xml @@ -0,0 +1,6 @@ + + +
  • /
  • +
  • v1.1
  • +
    +
    \ No newline at end of file diff --git a/Readme.md b/Readme.md index 778333e..0b7f69f 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,7 @@ # Omni Core Drill [![RimWorld 1.0](https://img.shields.io/badge/RimWorld-1.0-green.svg?style=popout-square)](http://rimworldgame.com/) +[![RimWorld 1.1](https://img.shields.io/badge/RimWorld-1.0-green.svg?style=popout-square)](http://rimworldgame.com/) [![License: CC BY-NC-SA 4.0](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-lightgrey.svg?style=popout-square)](https://creativecommons.org/licenses/by-nc-sa/4.0/) ![Github Total Downloads](https://img.shields.io/github/downloads-pre/doctorvangogh/MiningShaft/total.svg?style=popout-square) [![GitHub Latest Release Version](https://img.shields.io/github/release/doctorvangogh/MiningShaft.svg?style=popout-square)](../../releases/latest) [![GitHub Latest Pre-Release Version](https://img.shields.io/github/release/doctorvangogh/MiningShaft/all.svg?style=popout-square)](../../releases) diff --git a/Source/OmniCoreDrill/OmniCoreDrill.cs b/Source/OmniCoreDrill/OmniCoreDrill.cs index 5730c33..3d6df52 100644 --- a/Source/OmniCoreDrill/OmniCoreDrill.cs +++ b/Source/OmniCoreDrill/OmniCoreDrill.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Reflection; using DoctorVanGogh.OmniCoreDrill.Patches; -using Harmony; +using HarmonyLib; using RimWorld; using UnityEngine; @@ -29,7 +29,7 @@ class OmniCoreDrillMod : Mod { public OmniCoreDrillMod(ModContentPack content) : base(content) { _settings = GetSettings(); - var harmonyInstance = HarmonyInstance.Create("DoctorVanGogh.OmniCoreDrill"); + var harmonyInstance = new Harmony("DoctorVanGogh.OmniCoreDrill"); harmonyInstance.PatchAll(Assembly.GetExecutingAssembly()); Log.Message("Initialized OmniCoreDrill patches"); diff --git a/Source/OmniCoreDrill/OmniCoreDrill.csproj b/Source/OmniCoreDrill/OmniCoreDrill.csproj index a71098d..fb61e01 100644 --- a/Source/OmniCoreDrill/OmniCoreDrill.csproj +++ b/Source/OmniCoreDrill/OmniCoreDrill.csproj @@ -10,9 +10,8 @@ Properties DoctorVanGogh.OmniCoreDrill OmniCoreDrill - v3.5 + v4.7.2 512 - Unity Full v3.5 @@ -20,7 +19,7 @@ false none true - ..\..\Assemblies\ + ..\..\v1.1\Assemblies\ DEBUG;TRACE prompt 4 @@ -28,26 +27,33 @@ none true - ..\..\Assemblies\ + ..\..\v1.1\Assemblies\ prompt 4 - - False - ..\..\Assemblies\0Harmony.dll - False - - $(RimworldManagedDir)\Assembly-CSharp.dll + $(RimworldManagedDir11)\Assembly-CSharp.dll False - $(RimworldManagedDir)\UnityEngine.dll + $(RimworldManagedDir11)\UnityEngine.dll + False + + + $(RimworldManagedDir11)\UnityEngine.CoreModule.dll + False + + + $(RimworldManagedDir11)\UnityEngine.TextRenderingModule.dll + False + + + $(RimworldManagedDir11)\UnityEngine.IMGUIModule.dll False @@ -76,6 +82,7 @@ + TextTemplatingFileGenerator Defs.cs @@ -90,7 +97,16 @@ - + + + + 2.0.0.8 + + + 1.5.0.235 + runtime; build; native; contentfiles; analyzers + all +