diff --git a/1.3/Assemblies/0JecsTools.dll b/1.3/Assemblies/0JecsTools.dll index 1d1e9ad6..2c6d6b44 100644 Binary files a/1.3/Assemblies/0JecsTools.dll and b/1.3/Assemblies/0JecsTools.dll differ diff --git a/1.3/Assemblies/AbilityUser.dll b/1.3/Assemblies/AbilityUser.dll index ae8a9723..ba1080ca 100644 Binary files a/1.3/Assemblies/AbilityUser.dll and b/1.3/Assemblies/AbilityUser.dll differ diff --git a/1.3/Assemblies/AbilityUserAI.dll b/1.3/Assemblies/AbilityUserAI.dll index 256cd3d0..5d925ce5 100644 Binary files a/1.3/Assemblies/AbilityUserAI.dll and b/1.3/Assemblies/AbilityUserAI.dll differ diff --git a/1.3/Assemblies/CompActivatableEffect.dll b/1.3/Assemblies/CompActivatableEffect.dll index 54173842..971422e8 100644 Binary files a/1.3/Assemblies/CompActivatableEffect.dll and b/1.3/Assemblies/CompActivatableEffect.dll differ diff --git a/1.3/Assemblies/CompAnimated.dll b/1.3/Assemblies/CompAnimated.dll index 7591c0fc..cef92b7e 100644 Binary files a/1.3/Assemblies/CompAnimated.dll and b/1.3/Assemblies/CompAnimated.dll differ diff --git a/1.3/Assemblies/CompBalloon.dll b/1.3/Assemblies/CompBalloon.dll index 807b2514..2aa33200 100644 Binary files a/1.3/Assemblies/CompBalloon.dll and b/1.3/Assemblies/CompBalloon.dll differ diff --git a/1.3/Assemblies/CompBigBox.dll b/1.3/Assemblies/CompBigBox.dll index 8b4202c6..efc102ca 100644 Binary files a/1.3/Assemblies/CompBigBox.dll and b/1.3/Assemblies/CompBigBox.dll differ diff --git a/1.3/Assemblies/CompDeflector.dll b/1.3/Assemblies/CompDeflector.dll index e40d2a23..17323f6e 100644 Binary files a/1.3/Assemblies/CompDeflector.dll and b/1.3/Assemblies/CompDeflector.dll differ diff --git a/1.3/Assemblies/CompDelayedSpawner.dll b/1.3/Assemblies/CompDelayedSpawner.dll index 5dcd00aa..91cbd6fd 100644 Binary files a/1.3/Assemblies/CompDelayedSpawner.dll and b/1.3/Assemblies/CompDelayedSpawner.dll differ diff --git a/1.3/Assemblies/CompExtraSounds.dll b/1.3/Assemblies/CompExtraSounds.dll index 537abfbb..40eb43c6 100644 Binary files a/1.3/Assemblies/CompExtraSounds.dll and b/1.3/Assemblies/CompExtraSounds.dll differ diff --git a/1.3/Assemblies/CompInstalledPart.dll b/1.3/Assemblies/CompInstalledPart.dll index 4683b0ce..7669e7ea 100644 Binary files a/1.3/Assemblies/CompInstalledPart.dll and b/1.3/Assemblies/CompInstalledPart.dll differ diff --git a/1.3/Assemblies/CompLumbering.dll b/1.3/Assemblies/CompLumbering.dll index 53b96929..3cce4e10 100644 Binary files a/1.3/Assemblies/CompLumbering.dll and b/1.3/Assemblies/CompLumbering.dll differ diff --git a/1.3/Assemblies/CompOverlays.dll b/1.3/Assemblies/CompOverlays.dll index 6df32bef..5bbe179e 100644 Binary files a/1.3/Assemblies/CompOverlays.dll and b/1.3/Assemblies/CompOverlays.dll differ diff --git a/1.3/Assemblies/CompOversizedWeapon.dll b/1.3/Assemblies/CompOversizedWeapon.dll index 26406693..b60001cc 100644 Binary files a/1.3/Assemblies/CompOversizedWeapon.dll and b/1.3/Assemblies/CompOversizedWeapon.dll differ diff --git a/1.3/Assemblies/CompSlotLoadable.dll b/1.3/Assemblies/CompSlotLoadable.dll index 52bb0dc8..c79f2a40 100644 Binary files a/1.3/Assemblies/CompSlotLoadable.dll and b/1.3/Assemblies/CompSlotLoadable.dll differ diff --git a/1.3/Assemblies/CompToggleDef.dll b/1.3/Assemblies/CompToggleDef.dll index f457f552..9f3ae1ab 100644 Binary files a/1.3/Assemblies/CompToggleDef.dll and b/1.3/Assemblies/CompToggleDef.dll differ diff --git a/1.3/Assemblies/PawnShields.dll b/1.3/Assemblies/PawnShields.dll index 5fe855f8..31000d82 100644 Binary files a/1.3/Assemblies/PawnShields.dll and b/1.3/Assemblies/PawnShields.dll differ diff --git a/1.3/Assemblies/ThinkNodes.dll b/1.3/Assemblies/ThinkNodes.dll index f7e15d17..bf2d6284 100644 Binary files a/1.3/Assemblies/ThinkNodes.dll and b/1.3/Assemblies/ThinkNodes.dll differ diff --git a/About/About.xml b/About/About.xml index 1548d1fc..6ff77b02 100644 --- a/About/About.xml +++ b/About/About.xml @@ -18,7 +18,7 @@ https://github.com/pardeike/HarmonyRimWorld/releases/latest - 1.3.0.2 (07-29-2021) + 1.3.0.3 (07-30-2021) Adds modding components to RimWorld: vehicles, spell casting, weapon slots, oversized weapons, and more! @@ -75,6 +75,10 @@ Michael Cailler, Jigsawjohn , Daniel Schott, Penelope Charli Whitman, Jerome Gon ======================== Changelog ======================== +1.3.0.3 (07-30-2021) +======================== +Due to comptability issues, the patch for Enable Oversized Weapons will require additional work. Reverting back to the previous version. + 1.3.0.2 (07-29-2021) ======================== Carny Senpai's Enable Oversized Weapons is now supported and JecsTools CompOversizedWeapon will yield for it. diff --git a/About/Changelog.txt b/About/Changelog.txt index c43da8cd..57300b81 100644 --- a/About/Changelog.txt +++ b/About/Changelog.txt @@ -1,3 +1,7 @@ +1.3.0.3 (07-30-2021) +======================== +Due to comptability issues, the patch for Enable Oversized Weapons will require additional work. Reverting back to the previous version. + 1.3.0.2 (07-29-2021) ======================== Carny Senpai's Enable Oversized Weapons is now supported and JecsTools CompOversizedWeapon will yield for it. diff --git a/About/Manifest.xml b/About/Manifest.xml index 711bfc29..f5634ba0 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@  JecsTools - 1.3.0.2 + 1.3.0.3 https://raw.githubusercontent.com/jecrell/JecsTools/master/About/Manifest.xml diff --git a/About/Version.txt b/About/Version.txt index 0b9546c1..6b21cce5 100644 --- a/About/Version.txt +++ b/About/Version.txt @@ -1 +1 @@ -1.3.0.2 +1.3.0.3 diff --git a/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs b/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs index 8ed2ca9f..a0b91d84 100644 --- a/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs +++ b/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs @@ -13,14 +13,14 @@ static HarmonyCompOversizedWeapon() { var harmony = new Harmony("jecstools.jecrell.comps.oversized"); var type = typeof(HarmonyCompOversizedWeapon); - var CarnySenpaiEnableOversizedWeaponsModLoaded = ModsConfig.IsActive("CarnySenpai.EnableOversizedWeapons"); + //var CarnySenpaiEnableOversizedWeaponsModLoaded = ModsConfig.IsActive("CarnySenpai.EnableOversizedWeapons"); - if (CarnySenpaiEnableOversizedWeaponsModLoaded) - { - Log.Message("JecsTools:: Using Carny Senpai's Enable Oversized Weapons instead of CompOversizedWeapon"); - return; - } - Log.Warning("JecsTools CompOversizedWeapon Loaded:: This component is no longer recommended for performance. Please see Carny Senpai's Enable Oversized Weapons mod. Once the Carny Senpai's mod is loaded, it will be used instead of CompOversizedWeapon"); + // if (CarnySenpaiEnableOversizedWeaponsModLoaded) + // { + // Log.Message("JecsTools:: Using Carny Senpai's Enable Oversized Weapons instead of CompOversizedWeapon"); + // return; + //} + //Log.Warning("JecsTools CompOversizedWeapon Loaded:: This component is no longer recommended for performance. Please see Carny Senpai's Enable Oversized Weapons mod. Once the Carny Senpai's mod is loaded, it will be used instead of CompOversizedWeapon"); harmony.Patch(AccessTools.Method(typeof(PawnRenderer), nameof(PawnRenderer.DrawEquipmentAiming)), prefix: new HarmonyMethod(type, nameof(DrawEquipmentAimingPreFix)));