About/Manifest.xml

@@ -2,5 +2,5 @@
 
 <Manifest>
     <identifier>RJW PlasticSurgeries</identifier>
-    <version>5390.0.1.6</version>
+    <version>5371.0.1.6</version>
 </Manifest>

Source/RJW_PlasticSurgeries.sln

@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_PlasticSurgeries_1.3",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_PlasticSurgeries_1.4", "RJW_PlasticSurgeries\RJW_PlasticSurgeries_1.4.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB72}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_PlasticSurgeries_1.5", "RJW_PlasticSurgeries\RJW_PlasticSurgeries_1.5.csproj", "{02AA6D85-913F-44B8-9C32-6E8024261824}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
 		{F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02AA6D85-913F-44B8-9C32-6E8024261824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02AA6D85-913F-44B8-9C32-6E8024261824}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02AA6D85-913F-44B8-9C32-6E8024261824}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02AA6D85-913F-44B8-9C32-6E8024261824}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Source/RJW_PlasticSurgeries/About/Manifest.xml

@@ -2,5 +2,5 @@
 
 <Manifest>
     <identifier>RJW PlasticSurgeries</identifier>
-    <version>5390.0.1.6</version>
+    <version>5371.0.1.6</version>
 </Manifest>

Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj

@@ -13,10 +13,10 @@
         <TargetFrameworkProfile>
         </TargetFrameworkProfile>
         <LangVersion>11</LangVersion>
-        <Copyright>©2024 Stardust3D</Copyright>
+        <Copyright>©2023 Stardust3D</Copyright>
         <Company>Stardust3D</Company>
-        <AssemblyVersion>5390.0.1.6</AssemblyVersion>
+        <AssemblyVersion>5371.0.1.6</AssemblyVersion>
-        <FileVersion>5390.0.1.6</FileVersion>
+        <FileVersion>5371.0.1.6</FileVersion>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
         <Description>Surgically alter pawn's genitals.</Description>
@@ -27,13 +27,12 @@
     <ItemGroup>
         <None Include="RJW_PlasticSurgeries.snk" />
         <None Remove="1.4\**" />
-        <None Remove="1.5\**" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Lib.Harmony" Version="2.3.3" />
+        <PackageReference Include="Lib.Harmony" Version="2.2.2" />
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
         <PackageReference Include="Krafs.Rimworld.Ref" Version="1.3.3389" />
-        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
+        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="10.0.1" />
     </ItemGroup>
     <ItemGroup>
         <Reference Include="Dyspareunia">
@@ -47,11 +46,9 @@
         </Reference>
     </ItemGroup>
     <ItemGroup>
-        <Compile Remove="1.4\**" />
+      <Compile Remove="1.4\**" />
-        <Compile Remove="1.5\**" />
     </ItemGroup>
     <ItemGroup>
-        <EmbeddedResource Remove="1.4\**" />
+      <EmbeddedResource Remove="1.4\**" />
-        <EmbeddedResource Remove="1.5\**" />
     </ItemGroup>
 </Project>

Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj

@@ -13,10 +13,10 @@
         <TargetFrameworkProfile>
         </TargetFrameworkProfile>
         <LangVersion>11</LangVersion>
-        <Copyright>©2024 Stardust3D</Copyright>
+        <Copyright>©2023 Stardust3D</Copyright>
         <Company>Stardust3D</Company>
-        <AssemblyVersion>5390.0.1.6</AssemblyVersion>
+        <AssemblyVersion>5371.0.1.6</AssemblyVersion>
-        <FileVersion>5390.0.1.6</FileVersion>
+        <FileVersion>5371.0.1.6</FileVersion>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
         <Description>Surgically alter pawn's genitals.</Description>
@@ -27,13 +27,12 @@
     <ItemGroup>
         <None Include="RJW_PlasticSurgeries.snk" />
         <None Remove="1.3\**" />
-        <None Remove="1.5\**" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Lib.Harmony" Version="2.3.3" />
+        <PackageReference Include="Lib.Harmony" Version="2.2.2" />
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3901" />
+        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704" />
-        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
+        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="10.0.1" />
     </ItemGroup>
     <ItemGroup>
         <Reference Include="Dyspareunia">
@@ -47,12 +46,10 @@
         </Reference>
     </ItemGroup>
     <ItemGroup>
-        <Compile Remove="1.3\**" />
+      <Compile Remove="1.3\**" />
-        <Compile Remove="1.5\**" />
     </ItemGroup>
     <ItemGroup>
-        <EmbeddedResource Remove="1.3\**" />
+      <EmbeddedResource Remove="1.3\**" />
-        <EmbeddedResource Remove="1.5\**" />
     </ItemGroup>
 
 </Project>

Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj

@@ -1,58 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-    <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{02aa6d85-913f-44b8-9c32-6e8024261824}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>RJW_PlasticSurgeries</RootNamespace>
-        <AssemblyName>RJW_PlasticSurgeries</AssemblyName>
-        <TargetFramework>net48</TargetFramework>
-        <FileAlignment>512</FileAlignment>
-        <TargetFrameworkProfile>
-        </TargetFrameworkProfile>
-        <LangVersion>11</LangVersion>
-        <Copyright>©2024 Stardust3D</Copyright>
-        <Company>Stardust3D</Company>
-        <AssemblyVersion>5390.0.1.6</AssemblyVersion>
-        <FileVersion>5390.0.1.6</FileVersion>
-        <SignAssembly>true</SignAssembly>
-        <AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
-        <Description>Surgically alter pawn's genitals.</Description>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <OutputPath>bin\Release\1.4\</OutputPath>
-    </PropertyGroup>
-    <ItemGroup>
-        <None Include="RJW_PlasticSurgeries.snk" />
-        <None Remove="1.3\**" />
-        <None Remove="1.4\**" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Lib.Harmony" Version="2.3.3" />
-        <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4055-beta" />
-        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
-    </ItemGroup>
-    <ItemGroup>
-        <Reference Include="Dyspareunia">
-            <HintPath>..\..\..\dyspareunia\1.5\Assemblies\Dyspareunia.dll</HintPath>
-        </Reference>
-        <Reference Include="LicentiaLabs">
-            <HintPath>..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll</HintPath>
-        </Reference>
-        <Reference Include="RJW">
-            <HintPath>..\..\..\rjw-base\1.5\Assemblies\RJW.dll</HintPath>
-        </Reference>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Remove="1.3\**" />
-        <Compile Remove="1.4\**" />
-    </ItemGroup>
-    <ItemGroup>
-        <EmbeddedResource Remove="1.3\**" />
-        <EmbeddedResource Remove="1.4\**" />
-    </ItemGroup>
-
-</Project>

Source/build.gradle.kts

@@ -7,11 +7,10 @@
  */
 
 plugins {
-    alias(libs.plugins.msbuild)    
+    id("com.ullink.msbuild") version "3.15"
-    alias(libs.plugins.versions)
 }
 
-version = "5390.0.1.6"
+version = "5371.0.1.6"
 val friendlyName = "rjw-plasticsurgeries"
 
 tasks.register<com.ullink.Msbuild>("buildC#_1.3") {
@@ -38,18 +37,6 @@ tasks.register<com.ullink.Msbuild>("buildC#_1.4") {
     // destinationDir = "build/msbuild/bin"
 }
 
-tasks.register<com.ullink.Msbuild>("buildC#_1.5") {
-    // either a solution file
-    // solutionFile = "${rootProject.name}.sln"
-    // or a project file (.csproj or .vbproj)
-    projectFile = file("${rootProject.name}/${rootProject.name}_1.5.csproj")
-
-    targets = listOf("Clean", "Rebuild")
-    configuration = "Release"
-
-    // destinationDir = "build/msbuild/bin"
-}
-
 tasks.register<Exec>("sign_1.3") {
     dependsOn("buildC#_1.3")
     workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48")
@@ -86,24 +73,6 @@ tasks.register<Exec>("sign_1.4") {
     )
 }
 
-tasks.register<Exec>("sign_1.5") {
-    dependsOn("buildC#_1.5")
-    workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48")
-    executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
-    args = listOf(
-        "sign",
-        "/seal",
-        "/t",
-        "http://timestamp.digicert.com",
-        "/a",
-        "/n",
-        "Stardust3D",
-        "/fd",
-        "certHash",
-        "${rootProject.name}.dll"
-    )
-}
-
 tasks.register("copy") {
     dependsOn("copy_1.3", "copy_1.4", "copy_about")
 }
@@ -125,12 +94,6 @@ tasks.register<Copy>("copy_1.4") {
     into(project.projectDir.parentFile.resolve("1.4"))
 }
 
-tasks.register<Copy>("copy_1.5") {
-    dependsOn("copyDll_1.5")
-    from(project.projectDir.resolve("${rootProject.name}/1.5"))
-    into(project.projectDir.parentFile.resolve("1.5"))
-}
-
 tasks.register<Copy>("copyDll_1.3") {
     dependsOn("sign_1.3")
     from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48/${rootProject.name}.dll"))
@@ -143,12 +106,6 @@ tasks.register<Copy>("copyDll_1.4") {
     into(project.projectDir.parentFile.resolve("1.4/Assemblies"))
 }
 
-tasks.register<Copy>("copyDll_1.5") {
-    dependsOn("sign_1.5")
-    from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48/${rootProject.name}.dll"))
-    into(project.projectDir.parentFile.resolve("1.5/Assemblies"))
-}
-
 tasks.register<Zip>("buildZip") {
     dependsOn("clean", ":copy")
     into("$friendlyName/1.3") {
@@ -157,9 +114,6 @@ tasks.register<Zip>("buildZip") {
     into("$friendlyName/1.4") {
         from(project.projectDir.parentFile.resolve("1.4"))
     }
-    into("$friendlyName/1.5") {
-        from(project.projectDir.parentFile.resolve("1.5"))
-    }
     into("$friendlyName/About") {
         from(project.projectDir.parentFile.resolve("About"))
     }
@@ -175,7 +129,6 @@ tasks.register<Zip>("buildZip") {
 tasks.clean {
     delete.add(project.projectDir.parentFile.resolve("1.3"))
     delete.add(project.projectDir.parentFile.resolve("1.4"))
-    delete.add(project.projectDir.parentFile.resolve("1.5"))
     delete.add(project.projectDir.parentFile.resolve("About"))
 }
 

Source/gradle/libs.versions.toml

@@ -1,11 +0,0 @@
-[versions]
-versions = "0.51.0"
-msbuild = "4.6"
-
-[libraries]
-
-[bundles]
-
-[plugins]
-versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
-msbuild = { id = "com.ullink.msbuild", version.ref = "msbuild" }

Source/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Source/gradlew

@@ -83,8 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -131,13 +130,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -145,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +198,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command:
+# Collect all arguments for the java command;
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     and any embedded shellness will be escaped.
+#     shell script including quotes and variable substitutions, so put them in
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     double quotes to make sure that they get re-expanded; and
-#     treated as '${Hostname}' itself on the command line.
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

Source/gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail