Commit Graph

65 Commits

Author SHA1 Message Date
Lorolas c428ee52ea Merge branch 'release/5400.0.1.7'
# Conflicts:
#	1.3/Assemblies/RJW_PlasticSurgeries.dll
#	1.4/Assemblies/RJW_PlasticSurgeries.dll
#	About/Manifest.xml
#	Source/RJW_PlasticSurgeries/About/Manifest.xml
#	Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj
#	Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj
#	Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj
#	Source/build.gradle.kts
2024-05-27 21:00:51 +02:00
Lorolas 5f0f4094cd Merge branch 'feature/5400.0.1.7' into develop 2024-05-27 20:54:59 +02:00
Lorolas e57ab54e34 bumped version 2024-05-27 20:54:25 +02:00
Lorolas d998151749 small fix to avoid System.TypeLoadException when Licentia is not present 2024-05-27 20:54:13 +02:00
Lorolas cdf14f0d7a library updates 2024-05-27 20:53:14 +02:00
Lorolas f4a9fb55eb compiled with rjw beta for 1.5 2024-05-07 17:28:52 +02:00
Lorolas 8ea03bf11e removed libraries from release zip 2024-05-07 17:28:33 +02:00
Lorolas f31db7f526 hack around removed traits
721156233a/1.5/Source/DefOf/VanillaTraitDefOf.cs
2024-04-13 19:46:01 +02:00
Lorolas aaa7e8897a 1.5 compatibility by removing incompatible code and libraries 2024-04-13 19:35:01 +02:00
Lorolas a0d21d10d9 Merge tag '5390.0.1.6' into develop
5390.0.1.6 5390.0.1.6
2024-04-08 01:32:13 +02:00
Stardust3D efc6576db1 Merge branch 'release/5390.0.1.6' 2024-04-08 01:32:08 +02:00
Lorolas 100e02a1de Merge branch 'release/5390.0.1.6' 2024-04-08 01:32:08 +02:00
Stardust3D 0a71938fab updated version numbers and prep for version 1.5 2024-04-08 01:30:15 +02:00
Lorolas e42b73304f updated version numbers and prep for version 1.5 2024-04-08 01:30:15 +02:00
Lorolas 25362a6427 testing 2024-01-15 02:29:39 +01:00
Stardust3D 2f891cd7a8 testing 2024-01-15 02:29:39 +01:00
Lorolas 367e4ad56a recompiled for rjw 5.3.7.1 2023-10-07 14:39:19 +02:00
Stardust3D 193db226a1 recompiled for rjw 5.3.7.1 2023-10-07 14:39:19 +02:00
Stardust3D c278a0d634 Merge branch 'feature/dotnet6' into develop 2022-11-19 14:00:12 +01:00
Stardust3D 418f7f42e4 cleaned up folder structure 2022-11-19 13:59:47 +01:00
Stardust3D d252b4d92c migrated to new project format 2022-11-19 03:57:12 +01:00
Stardust3D 22acfe66c1 pre migration 2022-11-19 01:33:08 +01:00
Stardust3D b3df4f7314 testing Licentia stuff 2022-10-19 19:46:54 +02:00
Stardust3D 9f85f3bd33 removed the explicit need for Dyspareunia 2022-10-19 19:07:10 +02:00
Stardust3D 55bcf8ec12 Merge tag '5230.0.1.6' into develop
Tagging version 5230.0.1.6 5230.0.1.6
2022-10-19 18:59:28 +02:00
Stardust3D 9749cd9a0b Merge branch 'release/5230.0.1.6' 2022-10-19 18:59:27 +02:00
Stardust3D 7096e47c63 updated versions 2022-10-19 18:59:06 +02:00
Stardust3D b6a5d1d3b5 Merge branch 'feature/refactoring' into develop 2022-10-19 18:51:26 +02:00
Stardust3D 94711f740a moved most surgery logic into Recipe_Plastic_Surgery.cs 2022-10-19 18:50:30 +02:00
Stardust3D 69d9346ee5 added Dyspareunia check to Penoplasty 2022-10-19 17:51:28 +02:00
Stardust3D 34f3fca011 gradle update 2022-10-19 17:50:51 +02:00
Stardust3D 888ddb8912 4961.0.1.5 2022-07-26 13:57:36 +02:00
Stardust3D 52dcd049a8 Merge tag 'optional_Dyspareunia' into develop
4945.0.1.5 optional_Dyspareunia
2022-02-03 02:26:35 +01:00
Stardust3D e92fbf2cb5 Merge branch 'hotfix/optional_Dyspareunia' 2022-02-03 02:26:34 +01:00
Stardust3D 887659d9d8 incremented the version 2022-02-03 02:26:11 +01:00
Stardust3D 55a71f0397 better checking for Dyspareunia 2022-02-03 02:23:30 +01:00
Stardust3D ede10ab876 checking if Dyspareunia is loaded 2022-02-03 02:01:01 +01:00
Stardust3D bcddb19ea3 removed CI 2022-01-29 20:23:32 +01:00
Stardust3D 3bdd259bec testing CI 2022-01-29 20:23:20 +01:00
Stardust3D 7ddb102dee . 2022-01-29 19:38:31 +01:00
Stardust3D 3542b40a19 . 2022-01-29 17:00:47 +01:00
Stardust3D 9fc6bbc0c5 Update .gitlab-ci.yml file 2022-01-29 16:56:36 +01:00
Stardust3D f4a6d58a5c Merge tag '4943.0.1.5' into develop
4943.0.1.5 4943.0.1.5
2022-01-29 16:12:50 +01:00
Stardust3D 213aa43a04 Merge branch 'release/4943.0.1.5' 2022-01-29 16:12:49 +01:00
Stardust3D 1b6c8af4ea updated binaries 2022-01-29 16:12:21 +01:00
Stardust3D f81c8f3443 updated version 2022-01-29 16:12:06 +01:00
Stardust3D 0772021bae updated AssemblyTitle to the new name 2022-01-29 15:36:04 +01:00
Stardust3D a3f71aee43 added strong name key 2022-01-28 20:32:45 +01:00
Stardust3D ac231467a3 Merge tag '4943.0.1.4' into develop 2022-01-15 23:45:55 +01:00
Stardust3D 3f9cb34532 Merge branch 'release/4943.0.1.4' 2022-01-15 23:45:54 +01:00