diff --git a/1.5/Assemblies/C0ffee's RJW Ideology Addons.dll b/1.5/Assemblies/C0ffee's RJW Ideology Addons.dll deleted file mode 100644 index 53c84fd..0000000 Binary files a/1.5/Assemblies/C0ffee's RJW Ideology Addons.dll and /dev/null differ diff --git a/About/About.xml b/About/About.xml index ff94367..4f04051 100644 --- a/About/About.xml +++ b/About/About.xml @@ -3,11 +3,10 @@ C0ffeeRIA C0ffee - https://gitgud.io/c0ffeeeeeeee/coffees-rjw-ideology-addons + https://gitgud.io/c0ffeeeeeeee/rimworld-animations
  • 1.3
  • 1.4
  • -
  • 1.5
  • c0ffee.rjw.IdeologyAddons diff --git a/C0ffee's RJW Ideology Addons.csproj b/C0ffee's RJW Ideology Addons.csproj index 9054e30..888608e 100644 --- a/C0ffee's RJW Ideology Addons.csproj +++ b/C0ffee's RJW Ideology Addons.csproj @@ -18,7 +18,7 @@ false none false - 1.5\Assemblies\ + 1.4\Assemblies\ DEBUG;TRACE prompt 4 @@ -27,7 +27,7 @@ pdbonly true - 1.5\Assemblies\ + 1.4\Assemblies\ TRACE prompt 4 @@ -46,7 +46,7 @@ False - ..\rjw\1.5\Assemblies\RJW.dll + ..\rjw\1.4\Assemblies\RJW.dll False diff --git a/CRIALactation/1.5/Assemblies/CRIALactation.dll b/CRIALactation/1.5/Assemblies/CRIALactation.dll deleted file mode 100644 index 3ce99f3..0000000 Binary files a/CRIALactation/1.5/Assemblies/CRIALactation.dll and /dev/null differ diff --git a/CRIALactation/CRIALactation.csproj b/CRIALactation/CRIALactation.csproj index 5d930b0..b29ee35 100644 --- a/CRIALactation/CRIALactation.csproj +++ b/CRIALactation/CRIALactation.csproj @@ -18,7 +18,7 @@ false none false - 1.5\Assemblies\ + 1.4\Assemblies\ DEBUG;TRACE prompt 4 @@ -26,14 +26,14 @@ pdbonly true - 1.5\Assemblies\ + 1.4\Assemblies\ TRACE prompt 4 - $(STEAMC)\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll + ..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll False @@ -41,15 +41,15 @@ False - $(STEAMC)\workshop\content\294100\818773962\v1.4\Assemblies\HugsLib.dll + ..\..\..\..\..\workshop\content\294100\818773962\v1.4\Assemblies\HugsLib.dll False - ..\..\rjw-mc\1.5\Assemblies\Milk.dll + ..\..\rjw-mc\1.4\Assemblies\Milk.dll False - ..\..\rjw\1.5\Assemblies\RJW.dll + ..\..\rjw\1.4\Assemblies\RJW.dll False diff --git a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs index abfe4d5..def819c 100644 --- a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs +++ b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs @@ -13,7 +13,7 @@ namespace CRIALactation public class PreceptComp_Lactation : PreceptComp { - public override void Notify_MemberGenerated(Pawn pawn, Precept precept, bool newborn, bool ignoreApparel = false) + public override void Notify_MemberGenerated(Pawn pawn, Precept precept, bool newborn) { if (newborn) return; @@ -30,5 +30,7 @@ namespace CRIALactation } } } + + } } diff --git a/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs b/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs index 106abc0..d7e2f89 100644 --- a/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs +++ b/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs @@ -21,7 +21,7 @@ namespace CRIALactation public override bool ShouldSkip(Pawn pawn, bool forced = false) { - IReadOnlyList list = pawn.Map.mapPawns.AllPawnsSpawned; + List list = pawn.Map.mapPawns.AllPawnsSpawned; for(int i = 0; i < list.Count; i++) { if(LactationUtility.isMassageable(list[i])) diff --git a/CRIAOrgy/1.5/Assemblies/CRIAOrgy.dll b/CRIAOrgy/1.5/Assemblies/CRIAOrgy.dll deleted file mode 100644 index 6a7d109..0000000 Binary files a/CRIAOrgy/1.5/Assemblies/CRIAOrgy.dll and /dev/null differ diff --git a/CRIAOrgy/CRIAOrgy.csproj b/CRIAOrgy/CRIAOrgy.csproj index bb2a020..0589e04 100644 --- a/CRIAOrgy/CRIAOrgy.csproj +++ b/CRIAOrgy/CRIAOrgy.csproj @@ -18,7 +18,7 @@ false none false - 1.5\Assemblies\ + 1.4\Assemblies\ DEBUG;TRACE prompt 4 @@ -27,14 +27,14 @@ pdbonly true - 1.5\Assemblies\ + 1.4\Assemblies\ TRACE prompt 4 - ..\..\..\..\..\workshop\content\294100\839005762\Current\Assemblies\0Harmony.dll + ..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll False @@ -42,11 +42,11 @@ False - ..\..\rjw-mc\1.5\Assemblies\Milk.dll + ..\..\rjw-mc\1.3\Assemblies\Milk.dll False - ..\..\rjw\1.5\Assemblies\RJW.dll + ..\..\rjw\1.4\Assemblies\RJW.dll False diff --git a/CRIAOrgy/Source/RitualOutcomeEffectWorkers/RitualOutcomeEffectWorker_Orgy.cs b/CRIAOrgy/Source/RitualOutcomeEffectWorkers/RitualOutcomeEffectWorker_Orgy.cs index 2fcf913..044cfb8 100644 --- a/CRIAOrgy/Source/RitualOutcomeEffectWorkers/RitualOutcomeEffectWorker_Orgy.cs +++ b/CRIAOrgy/Source/RitualOutcomeEffectWorkers/RitualOutcomeEffectWorker_Orgy.cs @@ -31,7 +31,7 @@ namespace CRIAOrgy GlobalTextureAtlasManager.TryMarkPawnFrameSetDirty(participant); if (xxx.is_human(participant)) - participant.Drawer.renderer.renderTree.SetDirty(); + participant.Drawer.renderer.graphics.ResolveAllGraphics(); } base.Apply(progress, totalPresence, jobRitual); diff --git a/LoadFolders.xml b/LoadFolders.xml index 1c882ab..f003119 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -18,13 +18,4 @@
  • CRIAOrgy
  • CRIAOrgy/1.4
  • - -
  • /
  • -
  • 1.5
  • -
  • CRIALactation
  • -
  • CRIALactation/1.5
  • - -
  • CRIAOrgy
  • -
  • CRIAOrgy/1.5
  • -