diff --git a/1.3/Assemblies/RJW_PlasticSurgeries.dll b/1.3/Assemblies/RJW_PlasticSurgeries.dll
index 42556d0..11c6633 100644
Binary files a/1.3/Assemblies/RJW_PlasticSurgeries.dll and b/1.3/Assemblies/RJW_PlasticSurgeries.dll differ
diff --git a/About/Manifest.xml b/About/Manifest.xml
index 2deb0e6..2348be7 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -2,5 +2,5 @@
RJW PlasticSurgeries
- 4942.0.1.2
+ 4943.0.1.2
\ No newline at end of file
diff --git a/Assemblies/RJW_PlasticSurgeries.dll b/Assemblies/RJW_PlasticSurgeries.dll
index 42556d0..11c6633 100644
Binary files a/Assemblies/RJW_PlasticSurgeries.dll and b/Assemblies/RJW_PlasticSurgeries.dll differ
diff --git a/Assemblies/RJW_PlasticSurgeries.xml b/Assemblies/RJW_PlasticSurgeries.xml
deleted file mode 100644
index 7ccfe20..0000000
--- a/Assemblies/RJW_PlasticSurgeries.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- RJW_PlasticSurgeries
-
-
-
-
-
-
-
-
-
-
diff --git a/Source/.gitattributes b/Source/.gitattributes
new file mode 100644
index 0000000..00a51af
--- /dev/null
+++ b/Source/.gitattributes
@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat text eol=crlf
+
diff --git a/Source/.gitignore b/Source/.gitignore
new file mode 100644
index 0000000..1b6985c
--- /dev/null
+++ b/Source/.gitignore
@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
diff --git a/Source/RJW_PlasticSurgeries.sln b/Source/RJW_PlasticSurgeries.sln
index fbf9f79..d2c09ea 100644
--- a/Source/RJW_PlasticSurgeries.sln
+++ b/Source/RJW_PlasticSurgeries.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31911.196
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW PlasticSurgeries", "RJW_PlasticSurgeries\RJW PlasticSurgeries.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_PlasticSurgeries", "RJW_PlasticSurgeries\RJW_PlasticSurgeries.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Source/RJW_PlasticSurgeries/Properties/AssemblyInfo.cs b/Source/RJW_PlasticSurgeries/Properties/AssemblyInfo.cs
index 648cfd5..f31cc2c 100644
--- a/Source/RJW_PlasticSurgeries/Properties/AssemblyInfo.cs
+++ b/Source/RJW_PlasticSurgeries/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("RJW_PlasticSurgeries")]
-[assembly: AssemblyCopyright("©2021 Stardust3D")]
+[assembly: AssemblyCopyright("©2022 Stardust3D")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// 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("4942.0.1.2")]
-[assembly: AssemblyFileVersion("4942.0.1.2")]
\ No newline at end of file
+[assembly: AssemblyVersion("4943.0.1.2")]
+[assembly: AssemblyFileVersion("4943.0.1.2")]
\ No newline at end of file
diff --git a/Source/RJW_PlasticSurgeries/RJW PlasticSurgeries.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries.csproj
similarity index 97%
rename from Source/RJW_PlasticSurgeries/RJW PlasticSurgeries.csproj
rename to Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries.csproj
index a715a16..bee43d6 100644
--- a/Source/RJW_PlasticSurgeries/RJW PlasticSurgeries.csproj
+++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries.csproj
@@ -47,6 +47,10 @@
false
+
+
+
+
..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll
@@ -88,6 +92,5 @@
Defs\Recipe_Surgery\Recipes_Surgery_Vaginoplasty.xml
-
\ No newline at end of file
diff --git a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs
index 1881bd2..6457c07 100644
--- a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs
+++ b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs
@@ -2,7 +2,6 @@
using RimWorld;
using rjw;
using System.Collections.Generic;
-using System.Linq;
using Dyspareunia;
using Verse;
diff --git a/Source/build.gradle.kts b/Source/build.gradle.kts
new file mode 100644
index 0000000..e91c32c
--- /dev/null
+++ b/Source/build.gradle.kts
@@ -0,0 +1,77 @@
+/*
+ * This file was generated by the Gradle "init" task.
+ *
+ * This is a general purpose Gradle build.
+ * Learn more about Gradle by exploring our samples at https://docs.gradle.org/7.3/samples
+ * This project uses @Incubating APIs which are subject to change.
+ */
+
+plugins {
+ id("com.ullink.msbuild") version "3.15"
+ //id("com.ullink.nunit") version "1.12"
+}
+
+version = "4943.0.1.3"
+val friendlyName = "rjw-plasticsurgeries"
+
+tasks.register("buildC#") {
+ // either a solution file
+ // solutionFile = "${rootProject.name}.sln"
+ // or a project file (.csproj or .vbproj)
+ projectFile = file("${rootProject.name}/${rootProject.name}.csproj")
+
+ targets = listOf("Clean", "Rebuild")
+ configuration = "Release"
+
+ // destinationDir = "build/msbuild/bin"
+}
+
+tasks.register("sign") {
+ dependsOn("buildC#")
+ workingDir = project.projectDir.resolve("${rootProject.name}/obj/Release")
+ executable = "H:\\Windows Kits\\10\\bin\\10.0.22000.0\\x64\\signtool.exe"
+ args = listOf("sign", "/seal", "/t", "http://timestamp.digicert.com", "/a", "/n", "Stardust3D", "/fd", "certHash", "${rootProject.name}.dll")
+}
+
+tasks.register("copyDll") {
+ dependsOn("sign", "copyDll_Assemblies", "copyDll_1.3")
+}
+
+tasks.register("copyDll_Assemblies") {
+ dependsOn("buildC#", "clean_Assemblies")
+ from(project.projectDir.resolve("${rootProject.name}/obj/Release/${rootProject.name}.dll"))
+ into(project.projectDir.parentFile.resolve("Assemblies"))
+}
+
+tasks.register("copyDll_1.3") {
+ dependsOn("buildC#", "clean_1.3")
+ from(project.projectDir.resolve("${rootProject.name}/obj/Release/${rootProject.name}.dll"))
+ into(project.projectDir.parentFile.resolve("1.3/Assemblies"))
+}
+
+tasks.register("clean_Assemblies") {
+ delete.add(project.projectDir.parentFile.resolve("Assemblies"))
+}
+tasks.register("clean_1.3") {
+ delete.add(project.projectDir.parentFile.resolve("1.3/Assemblies"))
+}
+
+tasks.register("buildZip") {
+ dependsOn(":copyDll")
+ into("$friendlyName/1.3") {
+ from(project.projectDir.parentFile.resolve("1.3"))
+ }
+ into("$friendlyName/About") {
+ from(project.projectDir.parentFile.resolve("About"))
+ }
+ into("$friendlyName/Assemblies") {
+ from(project.projectDir.parentFile.resolve("Assemblies"))
+ }
+ into("$friendlyName/Defs") {
+ from(project.projectDir.parentFile.resolve("Defs"))
+ }
+ into("$friendlyName/Source/${rootProject.name}") {
+ from(project.projectDir.parentFile.resolve("Source/${rootProject.name}"))
+ excludes.add("**/obj/**")
+ }
+}
diff --git a/Source/gradle/wrapper/gradle-wrapper.jar b/Source/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..7454180
Binary files /dev/null and b/Source/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Source/gradle/wrapper/gradle-wrapper.properties b/Source/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..e750102
--- /dev/null
+++ b/Source/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/Source/gradlew b/Source/gradlew
new file mode 100644
index 0000000..c53aefa
--- /dev/null
+++ b/Source/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# 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"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ which java >/dev/null 2>&1 || 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
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/Source/gradlew.bat b/Source/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/Source/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/Source/settings.gradle.kts b/Source/settings.gradle.kts
new file mode 100644
index 0000000..dc7ff96
--- /dev/null
+++ b/Source/settings.gradle.kts
@@ -0,0 +1,11 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user manual at https://docs.gradle.org/7.3/userguide/multi_project_builds.html
+ * This project uses @Incubating APIs which are subject to change.
+ */
+
+rootProject.name = "RJW_PlasticSurgeries"