From 83d3e2f6c56c173969314f52c3d06332dfc976b0 Mon Sep 17 00:00:00 2001 From: "p.tychinin" Date: Sat, 6 Apr 2024 14:27:54 +0300 Subject: [PATCH] 1.1 --- 1.5/Assemblies/ResearchWhatever.dll | Bin 0 -> 16384 bytes .../firefoxpdm.ResearchableStatUpgrades.xml | 33 +++++++ About/About.xml | 1 + Source/ResearchWhatever15/.gitignore | 3 + .../Patches/ResearchManagerPatch.cs | 38 ++++++++ .../StaticConstructorOnStartupUtilityPatch.cs | 49 ++++++++++ .../Patches/WorkGiver_ResearcherPatch.cs | 86 ++++++++++++++++++ .../Properties/AssemblyInfo.cs | 36 ++++++++ Source/ResearchWhatever15/ResearchWhatever.cs | 17 ++++ .../ResearchWhatever.csproj | 74 +++++++++++++++ .../ResearchWhatever15/ResearchWhatever.sln | 25 +++++ .../ResearchWhateverComp.cs | 76 ++++++++++++++++ .../ResearchWhateverExtansion.cs | 10 ++ .../ResearchWhateverGameComp.cs | 24 +++++ Source/ResearchWhatever15/packages.config | 4 + change.log | 7 +- 16 files changed, 481 insertions(+), 2 deletions(-) create mode 100644 1.5/Assemblies/ResearchWhatever.dll create mode 100644 1.5/Patches/firefoxpdm.ResearchableStatUpgrades.xml create mode 100644 Source/ResearchWhatever15/.gitignore create mode 100644 Source/ResearchWhatever15/Patches/ResearchManagerPatch.cs create mode 100644 Source/ResearchWhatever15/Patches/StaticConstructorOnStartupUtilityPatch.cs create mode 100644 Source/ResearchWhatever15/Patches/WorkGiver_ResearcherPatch.cs create mode 100644 Source/ResearchWhatever15/Properties/AssemblyInfo.cs create mode 100644 Source/ResearchWhatever15/ResearchWhatever.cs create mode 100644 Source/ResearchWhatever15/ResearchWhatever.csproj create mode 100644 Source/ResearchWhatever15/ResearchWhatever.sln create mode 100644 Source/ResearchWhatever15/ResearchWhateverComp.cs create mode 100644 Source/ResearchWhatever15/ResearchWhateverExtansion.cs create mode 100644 Source/ResearchWhatever15/ResearchWhateverGameComp.cs create mode 100644 Source/ResearchWhatever15/packages.config diff --git a/1.5/Assemblies/ResearchWhatever.dll b/1.5/Assemblies/ResearchWhatever.dll new file mode 100644 index 0000000000000000000000000000000000000000..00334d64832001a5f9d93ddbb85a4072995d7963 GIT binary patch literal 16384 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�~_ZG2WHZ$B`;GPwdut zcS1&Hs0T}0GM>zG5F;n?i2+-B)5>n=&45IQhD_aJ`hgf{_#Py#9F8Sefn(_`vfhED zX{4DiZNoHAw40+i?*S`JdLu0{dtTcJPk|1^R(mEB<3q`%#^Ib}O2;!h-W}6is&66E z*#^I+*$0Y{dfFcNATgy)*Kb@kG!%FGaYdnwHGx+x&cisw49SIyk9x?~2Xq_Trsr^i zPuWNz*k#_Kn|OV+gUd;MocnphLwufQgW|ZBNoHfIe7fafnVZOZOk}`4J&TTQ*3pU>|*>9A1{3DRa)}7mvRt}(sy_vnJt{+r`ZbNVOD6N^> z_hP9!VrFhDx??jq6zty%jxmgZM>L9fvZarrMU;BvDA~d>_`J}vw9O7!F75QOJ<%a` z<2beOgq1bc@kJQ-Pf@#sG_(seu4fsxyh2|C+$`v3f-jGe`D`yrV4LJ9gJ+oBK7}g_ zKV3VQzr~TjQJO%{tI;M5YxDRLDE;p8qI2X$@ElpW(`-OWT0=s_u=4~pu?jbV-9Kui zprIcOaRUOW$I76_qWR0hUd11pelM6;YC`!kC73S{O`r4Cgkl0k5z1EzIp}%hg=P*r zp$Qh1uaVm37eH2UzR&FnEecJa3C;&|PZ(m)gz_Jf?Us5VKfe<6auR@kAVTwFkonb% zp#Vtu4CyAv82U{=4C~EY|Vla)d58=Yi`#QD>13@aDRf73Qe{xsf8c|2~_6AFZ;Pq1oFGI)W(IrPcDtO#}w z-$9#xkJVTU>-nVrrq98Dwj#Mu4l_}Na-Kgwyl2;fwl|Nt_`Mju0ss&U_!XGYJgOF) zk6w$IT^@x1uJz@RAsva2fe>;aZQ{an49)=SgKCwcx``g_aLDuZ^!Aj*T>}Tidp-sjanTP1EqI zVZG^^)^)9`+t#jXj;%@H&w=m`wgq30;vZ3;LW`o?x(166$s3)glN<1b>6+*&=smz;dHmxt7O?H+cj zHD+Y?n91>j{5WJ!!QU4>5#ED$5_mVcr{Mj;WBowyWm<+B%`@c7KjyU!7vCiu5p_8LTO3{(sCe9lgyHZALk z{>=4VFjeFkgHP;yqPm#VN!g|u+o^#KGbI&Qvuo=tE46nj@ZDy=3IJq?!FP2?{_G~Ra zkC?c}V4oQcKS*X2XBa*q@^34?S5f2{c~o*?i)3)l%ZNR!JcFN3%+B_w)Af@j?K~^_L)6_ zvm2j_W-P)oKj6s?#?U7HFq_9*Z_M?@TG^)^qvI3yIHD^B>xB{7_Nlwz#ku_;?)UfW UxBq7Nk literal 0 HcmV?d00001 diff --git a/1.5/Patches/firefoxpdm.ResearchableStatUpgrades.xml b/1.5/Patches/firefoxpdm.ResearchableStatUpgrades.xml new file mode 100644 index 0000000..c8b6d1d --- /dev/null +++ b/1.5/Patches/firefoxpdm.ResearchableStatUpgrades.xml @@ -0,0 +1,33 @@ + + + + Always + +
  • Defs/ResearchProjectDef[defName="StackingRepeatable"]/modExtensions
    • +
  • + Defs/ResearchProjectDef[defName="StackingRepeatable"]/modExtensions + +
  • + + true +
    • + + +     +     + + + Always + +
  • Defs/ResearchProjectDef[defName="ProductivityRepeatable"]/modExtensions
    • +
  • + Defs/ResearchProjectDef[defName="ProductivityRepeatable"]/modExtensions + +
  • + true +
    • + + +     +     +     \ No newline at end of file diff --git a/About/About.xml b/About/About.xml index 8b1c550..b3901cf 100644 --- a/About/About.xml +++ b/About/About.xml @@ -5,6 +5,7 @@
  • 1.3
  • 1.4
    • +
  • 1.5
    •  none avilmask.ResearchWhatever diff --git a/Source/ResearchWhatever15/.gitignore b/Source/ResearchWhatever15/.gitignore new file mode 100644 index 0000000..1c6aa8a --- /dev/null +++ b/Source/ResearchWhatever15/.gitignore @@ -0,0 +1,3 @@ +/.vs/ +/obj/ +/packages/ \ No newline at end of file diff --git a/Source/ResearchWhatever15/Patches/ResearchManagerPatch.cs b/Source/ResearchWhatever15/Patches/ResearchManagerPatch.cs new file mode 100644 index 0000000..4ab47cb --- /dev/null +++ b/Source/ResearchWhatever15/Patches/ResearchManagerPatch.cs @@ -0,0 +1,38 @@ +using System.Linq; +using System.Collections.Generic; +using HarmonyLib; +using RimWorld; +using Verse; +using Verse.Sound; + +namespace ResearchWhatever.Patches +{ + [HarmonyPatch(typeof(ResearchManager), "FinishProject")] + public static class ResearchManager_FinishProject_ResearchWhateverPatch + { + public static void Prefix(ResearchManager __instance, ref bool doCompletionDialog) + { + if (doCompletionDialog) + { + var comp = Current.Game.GetComponent(); + if (comp.NotifyMode == ResearchWhateverNotifyMode.rwnDefault) + return; + + doCompletionDialog = false; + + var currentProj = __instance.GetProject(); + switch (comp.NotifyMode) + { + case ResearchWhateverNotifyMode.rwnLetter: + Find.LetterStack.ReceiveLetter("ResearchFinished".Translate(currentProj.LabelCap), currentProj.description, LetterDefOf.PositiveEvent, null, null, null, null, null); + break; + case ResearchWhateverNotifyMode.rwnNotice: + Messages.Message("ResearchFinished".Translate(currentProj.LabelCap).CapitalizeFirst(), MessageTypeDefOf.SilentInput); + break; + default: + break; + } + } + } + } +} diff --git a/Source/ResearchWhatever15/Patches/StaticConstructorOnStartupUtilityPatch.cs b/Source/ResearchWhatever15/Patches/StaticConstructorOnStartupUtilityPatch.cs new file mode 100644 index 0000000..3d175d4 --- /dev/null +++ b/Source/ResearchWhatever15/Patches/StaticConstructorOnStartupUtilityPatch.cs @@ -0,0 +1,49 @@ +using System; +using System.Linq; +using System.Collections.Generic; +using Verse; +using HarmonyLib; +using System.Reflection; +using RimWorld; + + +namespace ResearchWhatever +{ + public static class StaticConstructorOnStartupUtility_Patch + { + //[HarmonyPatch(typeof(StaticConstructorOnStartupUtility), "CallAll")] + [HarmonyPatch] + public static class StaticConstructorOnStartupUtility_CallAll_ResearchWhateverPatch + { + internal static MethodBase TargetMethod() + { + MethodBase LCallAll = AccessTools.Method("BetterLoading.Stage.InitialLoad.StageRunStaticCctors:PreCallAll"); + if (LCallAll == null) + { + LCallAll = AccessTools.Method("Verse.StaticConstructorOnStartupUtility:CallAll"); + if (LCallAll == null) + throw new Exception("Couldn't find StaticConstructorOnStartupUtility.CallAll()"); + } + else + Log.Message("[ResearchWhatever] BetterLoading detected, workaround initiated"); + return LCallAll; + } + // + public static void Postfix() + { + List list = new List( + from x in DefDatabase.AllDefsListForReading + where x.thingClass == typeof(Building_ResearchBench) || x.thingClass != null && x.thingClass.IsSubclassOf(typeof(Building_ResearchBench)) + select x); + + if (list.NullOrEmpty()) + return; + else + foreach (var thing in list) + { + thing?.comps?.Add(new CompProperties(typeof(ResearchWhateverComp))); + } + } + } + } +} diff --git a/Source/ResearchWhatever15/Patches/WorkGiver_ResearcherPatch.cs b/Source/ResearchWhatever15/Patches/WorkGiver_ResearcherPatch.cs new file mode 100644 index 0000000..392ac64 --- /dev/null +++ b/Source/ResearchWhatever15/Patches/WorkGiver_ResearcherPatch.cs @@ -0,0 +1,86 @@ +using System.Linq; +using System.Collections.Generic; +using HarmonyLib; +using RimWorld; +using Verse; +using Verse.Sound; + +namespace ResearchWhatever.Patches +{ + [HarmonyPatch(typeof(WorkGiver_Researcher), "ShouldSkip")] + public static class WorkGiver_Researcher_ShouldSkip_ResearchWhateverPatch + { + public static bool Prefix(ref bool __result) + { + __result = false; + return false; + } + } + + [HarmonyPatch(typeof(WorkGiver_Researcher), "PotentialWorkThingRequest", MethodType.Getter)] + public static class WorkGiver_PotentialWorkThingRequest_ResearchWhateverPatch + { + public static bool Prefix(ref ThingRequest __result) + { + __result = ThingRequest.ForGroup(ThingRequestGroup.ResearchBench); + return false; + } + } + + [HarmonyPatch(typeof(WorkGiver_Researcher), "HasJobOnThing")] + public static class WorkGiver_Researcher_HasJobOnThing_ResearchWhateverPatch + { + private static bool HasFacilities(this Building_ResearchBench bench, List requiredFacilities) + { + if (requiredFacilities.NullOrEmpty()) return true; + CompAffectedByFacilities comp = bench.TryGetComp(); + if (comp == null) return false; + + foreach (var rf in requiredFacilities) + if (comp.LinkedFacilitiesListForReading.FirstOrDefault(x => x.def == rf && comp.IsFacilityActive(x)) == null) + return false; + + return true; + } + + private static bool CanBePicked(this ResearchProjectDef research, Building_ResearchBench bench) + { + return research.baseCost > 0f + && research.CanStartNow + && Find.Storyteller.difficulty.AllowedBy(research.hideWhen) + && (research.requiredResearchBuilding == null || research.requiredResearchBuilding == bench.def && bench.HasFacilities(research.requiredResearchFacilities)) + && research.GetModExtension()?.ignore != true; + } + + internal static void Prefix(Pawn pawn, Thing t, bool forced) + { + ResearchProjectDef currentProj = Find.ResearchManager.GetProject(); + if (currentProj != null) return; + if (!(t is Building_ResearchBench bench)) return; + + ResearchWhateverComp comp = bench.TryGetComp(); + + if (comp == null || !comp.Active) return; + + List projects = new List( + from x in DefDatabase.AllDefsListForReading + where x.CanBePicked(bench) + select x); + + if (projects.NullOrEmpty()) + { + comp.Active = false; + Messages.Message("ResearchWhateverNothingLeftToResearch".Translate(bench.Label).CapitalizeFirst(), new TargetInfo(bench.Position, bench.Map, false), MessageTypeDefOf.NeutralEvent); + return; + } + projects.SortBy(x => x.GetModExtension()?.lowPriority == true ? 100000000f + x.CostApparent : x.CostApparent); + + ResearchProjectDef def = projects.First(); + projects.TryRandomElementByWeight(x => x.CostApparent == def.CostApparent ? 1f : 0f, out def); + SoundDefOf.ResearchStart.PlayOneShotOnCamera(null); + Find.ResearchManager.SetCurrentProject(def); + TutorSystem.Notify_Event("StartResearchProject"); + Messages.Message( "ResearchWhateverNewResearch".Translate(pawn.Name.ToStringFull, def.label).CapitalizeFirst(), new TargetInfo(bench.Position, bench.Map, false), MessageTypeDefOf.SilentInput); + } + } +} diff --git a/Source/ResearchWhatever15/Properties/AssemblyInfo.cs b/Source/ResearchWhatever15/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..0fe3664 --- /dev/null +++ b/Source/ResearchWhatever15/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("ResearchWhatever")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ResearchWhatever")] +[assembly: AssemblyCopyright("Copyright © 2021")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("b08c8baf-9849-4317-b2be-639354820a7d")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Source/ResearchWhatever15/ResearchWhatever.cs b/Source/ResearchWhatever15/ResearchWhatever.cs new file mode 100644 index 0000000..19e1217 --- /dev/null +++ b/Source/ResearchWhatever15/ResearchWhatever.cs @@ -0,0 +1,17 @@ +using HarmonyLib; +using System.Reflection; +using Verse; +using RimWorld; + +namespace ResearchWhatever +{ + [StaticConstructorOnStartup] + public class ResearchWhatever : Mod + { + public ResearchWhatever(ModContentPack content) : base(content) + { + var harmony = new Harmony("net.avilmask.rimworld.mod.ResearchWhatever"); + harmony.PatchAll(Assembly.GetExecutingAssembly()); + } + } +} diff --git a/Source/ResearchWhatever15/ResearchWhatever.csproj b/Source/ResearchWhatever15/ResearchWhatever.csproj new file mode 100644 index 0000000..53856a4 --- /dev/null +++ b/Source/ResearchWhatever15/ResearchWhatever.csproj @@ -0,0 +1,74 @@ + + + + + Debug + AnyCPU + {B08C8BAF-9849-4317-B2BE-639354820A7D} + Library + Properties + ResearchWhatever + ResearchWhatever + v4.7.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\1.5\Assemblies\ + TRACE + prompt + 4 + + + + packages\Lib.Harmony.2.2.2\lib\net472\0Harmony.dll + False + + + E:\Games\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + False + + + + + + + + + + + E:\Games\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.dll + False + + + E:\Games\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + False + + + E:\Games\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll + False + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/ResearchWhatever15/ResearchWhatever.sln b/Source/ResearchWhatever15/ResearchWhatever.sln new file mode 100644 index 0000000..e7f9a55 --- /dev/null +++ b/Source/ResearchWhatever15/ResearchWhatever.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1062 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResearchWhatever", "ResearchWhatever.csproj", "{B08C8BAF-9849-4317-B2BE-639354820A7D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B08C8BAF-9849-4317-B2BE-639354820A7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B08C8BAF-9849-4317-B2BE-639354820A7D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B08C8BAF-9849-4317-B2BE-639354820A7D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B08C8BAF-9849-4317-B2BE-639354820A7D}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0D207634-209F-4992-A31F-77B17C0ED417} + EndGlobalSection +EndGlobal diff --git a/Source/ResearchWhatever15/ResearchWhateverComp.cs b/Source/ResearchWhatever15/ResearchWhateverComp.cs new file mode 100644 index 0000000..edb9423 --- /dev/null +++ b/Source/ResearchWhatever15/ResearchWhateverComp.cs @@ -0,0 +1,76 @@ +using System.Collections.Generic; +using Verse; +using RimWorld; +using UnityEngine; + +namespace ResearchWhatever +{ + public class ResearchWhateverComp : ThingComp + { + public bool Active + { + get { return parent?.Faction == Faction.OfPlayer && active; } + set { if (value == active) return; active = value; } + } + + public override void PostExposeData() + { + Scribe_Values.Look(ref active, "active", true, false); + } + + public override IEnumerable CompGetGizmosExtra() + { + if (parent?.Faction != Faction.OfPlayer) + yield break; + // + Command_Toggle command_Toggle = new Command_Toggle(); + command_Toggle.hotKey = KeyBindingDefOf.Command_TogglePower; + command_Toggle.defaultLabel = "CommandResearchWhateverToggleLabel".Translate(); + command_Toggle.icon = TexCommand.OpenLinkedQuestTex; + command_Toggle.isActive = (() => active); + command_Toggle.toggleAction = delegate () + { + if (Event.current.button == 0) + Active = !Active; + else if (Event.current.button == 1) + { + var comp = Current.Game.GetComponent(); + //var lable = Mute ? "CommandResearchWhateverToggleMute".Translate().CapitalizeFirst() : "CommandResearchWhateverToggleUnmute".Translate().CapitalizeFirst(); + List list = new List(); + list.Add(new FloatMenuOption("CommandResearchWhateverToggleDefault".Translate().CapitalizeFirst(), delegate () + { + comp.NotifyMode = ResearchWhateverNotifyMode.rwnDefault; + })); + list.Add(new FloatMenuOption("CommandResearchWhateverToggleLetter".Translate().CapitalizeFirst(), delegate () + { + comp.NotifyMode = ResearchWhateverNotifyMode.rwnLetter; + })); + list.Add(new FloatMenuOption("CommandResearchWhateverToggleNotice".Translate().CapitalizeFirst(), delegate () + { + comp.NotifyMode = ResearchWhateverNotifyMode.rwnNotice; + })); + list.Add(new FloatMenuOption("CommandResearchWhateverToggleMute".Translate().CapitalizeFirst(), delegate () + { + comp.NotifyMode = ResearchWhateverNotifyMode.rwnMute; + })); + FloatMenu floatMenu = new FloatMenu(list); + floatMenu.vanishIfMouseDistant = true; + Find.WindowStack.Add(floatMenu); + } + }; + if (Active) + { + command_Toggle.defaultDesc = "CommandResearchWhateverToggleDescActive".Translate(); + } + else + { + command_Toggle.defaultDesc = "CommandResearchWhateverToggleDescInactive".Translate(); + } + yield return command_Toggle; + yield break; + } + + private bool active = true; + } + +} diff --git a/Source/ResearchWhatever15/ResearchWhateverExtansion.cs b/Source/ResearchWhatever15/ResearchWhateverExtansion.cs new file mode 100644 index 0000000..5ee13c5 --- /dev/null +++ b/Source/ResearchWhatever15/ResearchWhateverExtansion.cs @@ -0,0 +1,10 @@ +using Verse; + +namespace ResearchWhatever +{ + public class ResearchWhateverExtansion : DefModExtension + { + public bool ignore = false; + public bool lowPriority = false; + } +} diff --git a/Source/ResearchWhatever15/ResearchWhateverGameComp.cs b/Source/ResearchWhatever15/ResearchWhateverGameComp.cs new file mode 100644 index 0000000..dc6a447 --- /dev/null +++ b/Source/ResearchWhatever15/ResearchWhateverGameComp.cs @@ -0,0 +1,24 @@ +using System.Collections.Generic; +using System.Linq; +using Verse; +using RimWorld; + +namespace ResearchWhatever +{ + public enum ResearchWhateverNotifyMode { rwnDefault, rwnLetter, rwnNotice, rwnMute } + public class ResearchWhateverGameComp : GameComponent + { + public ResearchWhateverGameComp() + { + } + public ResearchWhateverGameComp(Game game) + { + } + public override void ExposeData() + { + Scribe_Values.Look(ref notifyMode, "NotifyMode"); + } + private ResearchWhateverNotifyMode notifyMode = ResearchWhateverNotifyMode.rwnDefault; + public ResearchWhateverNotifyMode NotifyMode { get { return notifyMode; } set { notifyMode = value; } } + } +} diff --git a/Source/ResearchWhatever15/packages.config b/Source/ResearchWhatever15/packages.config new file mode 100644 index 0000000..c5bef78 --- /dev/null +++ b/Source/ResearchWhatever15/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/change.log b/change.log index f90b1c3..6e3b4dd 100644 --- a/change.log +++ b/change.log @@ -1,5 +1,8 @@ -1.0.7 -- made a minor change that probably should improve cases when mods add their own requirements for research. +1.1.0 +- 1.5 be like; + +1.0.7 +- made a minor change that probably should improve cases when mods add their own requirements for research (thanks @Taranchuk); other - little hint to put this mod before "research re-invenred" mod.