Merge pull request #29 from jecrell/master

Merge master into dev
jecrell · Oct 28, 2022 · 6d5abeb · 6d5abeb
2 parents 589724d + 57dbd4f
commit 6d5abeb
Show file tree

Hide file tree

Showing 328 changed files with 446 additions and 22,216 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,36 +1,61 @@
-# Windows image file caches
+#About/PublishedFileId.txt # shouldn't be ignored; needed to ensure same Steam workshop item is updated (and is ignored outside of Steam anyway)
+Source/DiscordWebhookToken.txt
+updateinfo
+RimworldModReleaseTool.exe
+
+# Ensure RimWorld/Unity assemblies are ignored
+Assemblies/Assembly-CSharp*.dll
+Assemblies/UnityEngine.*dll*
+Assemblies/Unity.*dll
+Assemblies/Mono.*dll
+Assemblies/mscorlib.dll
+Assemblies/System.*dll
+Assemblies/TextMeshPro-*.dll
+Assemblies/ISharpZipLib.dll
+Assemblies/NAudio.dll
+Assemblies/NVorbis.dll
+
+
+## Ignore Windows temporary/cache files
+## Get latest from https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
+
+# Windows thumbnail cache files
 Thumbs.db
+Thumbs.db:encryptable
 ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
 
 # Folder config file
-Desktop.ini
+[Dd]esktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 
-#folders we don't need
-[Oo]bj/
-
 # Windows Installer files
 *.cab
 *.msi
+*.msix
 *.msm
 *.msp
 
 # Windows shortcuts
 *.lnk
 
-# =========================
-# Operating System Files
-# =========================
 
-# OSX
-# =========================
+## Ignore macOS temporary/cache files
+## Get latest from https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
 
+# General
 .DS_Store
 .AppleDouble
 .LSOverride
 
+# Icon must end with two \r
+Icon
+
 # Thumbnails
 ._*
 
@@ -41,6 +66,7 @@ $RECYCLE.BIN/
 .TemporaryItems
 .Trashes
 .VolumeIcon.icns
+.com.apple.timemachine.donotpresent
 
 # Directories potentially created on remote AFP share
 .AppleDB
@@ -49,23 +75,6 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-[Oo]bj/
-About/PublishedFileId.txt
-Assemblies/Assembly-CSharp.dll
-Assemblies/UnityEngine.dll
-Assemblies/Assembly-CSharp-firstpass.dll
-Assemblies/UnityEngine.UI.dll
-Assemblies/TextMeshPro-1.0.55.56.0b11.dll
-Assemblies/NAudio.dll
-Assemblies/NVorbis.dll
-Source/Dependencies
-Source/DiscordWebhookToken.txt
-updateinfo
-
-
-# Prevents node or other packages.
-
-packages/
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
@@ -82,17 +91,24 @@ packages/
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Mono auto generated files
+mono_crash.*
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
 x64/
 x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+[Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -106,9 +122,10 @@ Generated\ Files/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUNIT
+# NUnit
 *.VisualState.xml
 TestResult.xml
+nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -123,6 +140,9 @@ project.lock.json
 project.fragment.lock.json
 artifacts/
 
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
 # StyleCop
 StyleCopReport.xml
 
@@ -189,9 +209,6 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding add-in
-.JustCode
-
 # TeamCity is a build add-in
 _TeamCity*
 
@@ -202,6 +219,9 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*[.json, .xml, .info]
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -249,6 +269,8 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
+# NuGet Symbol Packages
+*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -273,12 +295,14 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
+*.appxbundle
+*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!?*.[Cc]ache/
 
 # Others
 ClientBin/
@@ -322,6 +346,9 @@ ServiceFabricBackup/
 *.bim.layout
 *.bim_*.settings
 *.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -357,10 +384,6 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
-# JetBrains Rider
-.idea/
-*.sln.iml
-
 # CodeRush personal settings
 .cr/personal
 
@@ -401,11 +424,33 @@ ASALocalRun/
 
 # Local History for Visual Studio
 .localhistory/
-*.ide-shm
-*.ide-wal
-Source/.vs/JecsTools/v15/.suo
-Source/.vs/JecsTools/v15/.suo
-Source/.vs/JecsTools/v15/Server/sqlite3/storage.ide-shm
-Source/.vs/JecsTools/v15/.suo
-Source/DiscordWebhookToken.txt
-updateinfo
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+
+## Ignore Visual Studio Code workspace and settings
+## Get latest from https://github.com/github/gitignore/blob/master/Global/VisualStudioCode.gitignore
+
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/1.3/Assemblies/AbilityUserAI.dll b/1.3/Assemblies/AbilityUserAI.dll
diff --git a/1.3/Assemblies/CompActivatableEffect.dll b/1.3/Assemblies/CompActivatableEffect.dll
diff --git a/1.3/Assemblies/CompAnimated.dll b/1.3/Assemblies/CompAnimated.dll
diff --git a/1.3/Assemblies/CompBalloon.dll b/1.3/Assemblies/CompBalloon.dll
diff --git a/1.3/Assemblies/CompBigBox.dll b/1.3/Assemblies/CompBigBox.dll
diff --git a/1.3/Assemblies/CompDeflector.dll b/1.3/Assemblies/CompDeflector.dll
diff --git a/1.3/Assemblies/CompDelayedSpawner.dll b/1.3/Assemblies/CompDelayedSpawner.dll
diff --git a/1.3/Assemblies/CompExtraSounds.dll b/1.3/Assemblies/CompExtraSounds.dll
diff --git a/1.3/Assemblies/CompInstalledPart.dll b/1.3/Assemblies/CompInstalledPart.dll
diff --git a/1.3/Assemblies/CompLumbering.dll b/1.3/Assemblies/CompLumbering.dll
diff --git a/1.3/Assemblies/CompOverlays.dll b/1.3/Assemblies/CompOverlays.dll
diff --git a/1.3/Assemblies/CompOversizedWeapon.dll b/1.3/Assemblies/CompOversizedWeapon.dll
diff --git a/1.3/Assemblies/CompSlotLoadable.dll b/1.3/Assemblies/CompSlotLoadable.dll
diff --git a/1.3/Assemblies/CompToggleDef.dll b/1.3/Assemblies/CompToggleDef.dll
diff --git a/1.3/Assemblies/PawnShields.dll b/1.3/Assemblies/PawnShields.dll
diff --git a/1.3/Assemblies/ThinkNodes.dll b/1.3/Assemblies/ThinkNodes.dll
diff --git a/1.3/Languages/Japanese/Keyed/Grapple.xml b/1.3/Languages/Japanese/Keyed/Grapple.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LanguageData>
-
-  <JTGrapple_Success>捕縛に成功</JTGrapple_Success>
-  <JTGrapple_Failed>捕縛に失敗</JTGrapple_Failed>
-  <JTGrapple_DownedGrapple>倒れている相手：捕縛に成功</JTGrapple_DownedGrapple>
-  <JTGrapple_SneakGrapple>奇襲攻撃の相手：捕縛に成功</JTGrapple_SneakGrapple>
-  <JTGrapple_PrisonerGrapple>拘束中の相手：捕縛に成功</JTGrapple_PrisonerGrapple>
-  <JTGrapple_SleepingGrapple>睡眠中の相手：捕縛に成功</JTGrapple_SleepingGrapple>
-
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <JTGrapple_Success>捕縛に成功</JTGrapple_Success>
+  <JTGrapple_Failed>捕縛に失敗</JTGrapple_Failed>
+  <JTGrapple_DownedGrapple>倒れている相手：捕縛に成功</JTGrapple_DownedGrapple>
+  <JTGrapple_SneakGrapple>奇襲攻撃の相手：捕縛に成功</JTGrapple_SneakGrapple>
+  <JTGrapple_PrisonerGrapple>拘束中の相手：捕縛に成功</JTGrapple_PrisonerGrapple>
+  <JTGrapple_SleepingGrapple>睡眠中の相手：捕縛に成功</JTGrapple_SleepingGrapple>
+  <JTGrapple_PetGrapple>屠畜中の動物：捕縛に成功</JTGrapple_PetGrapple>
+
 </LanguageData>
diff --git a/1.4/Assemblies/0JecsTools.dll b/1.4/Assemblies/0JecsTools.dll
diff --git a/1.4/Assemblies/AbilityUser.dll b/1.4/Assemblies/AbilityUser.dll
diff --git a/1.4/Assemblies/AbilityUserAI.dll b/1.4/Assemblies/AbilityUserAI.dll
diff --git a/1.4/Assemblies/CompActivatableEffect.dll b/1.4/Assemblies/CompActivatableEffect.dll
diff --git a/1.4/Assemblies/CompAnimated.dll b/1.4/Assemblies/CompAnimated.dll
diff --git a/1.4/Assemblies/CompBalloon.dll b/1.4/Assemblies/CompBalloon.dll
diff --git a/1.4/Assemblies/CompBigBox.dll b/1.4/Assemblies/CompBigBox.dll
diff --git a/1.4/Assemblies/CompDeflector.dll b/1.4/Assemblies/CompDeflector.dll
diff --git a/1.4/Assemblies/CompDelayedSpawner.dll b/1.4/Assemblies/CompDelayedSpawner.dll
diff --git a/1.4/Assemblies/CompExtraSounds.dll b/1.4/Assemblies/CompExtraSounds.dll
diff --git a/1.4/Assemblies/CompInstalledPart.dll b/1.4/Assemblies/CompInstalledPart.dll
diff --git a/1.4/Assemblies/CompLumbering.dll b/1.4/Assemblies/CompLumbering.dll
diff --git a/1.4/Assemblies/CompOverlays.dll b/1.4/Assemblies/CompOverlays.dll
diff --git a/1.4/Assemblies/CompOversizedWeapon.dll b/1.4/Assemblies/CompOversizedWeapon.dll
diff --git a/1.4/Assemblies/CompSlotLoadable.dll b/1.4/Assemblies/CompSlotLoadable.dll
diff --git a/1.4/Assemblies/CompToggleDef.dll b/1.4/Assemblies/CompToggleDef.dll
diff --git a/1.4/Assemblies/PawnShields.dll b/1.4/Assemblies/PawnShields.dll
diff --git a/1.4/Assemblies/ThinkNodes.dll b/1.4/Assemblies/ThinkNodes.dll
diff --git a/1.4/Languages/Japanese/Keyed/Grapple.xml b/1.4/Languages/Japanese/Keyed/Grapple.xml
@@ -7,5 +7,6 @@
   <JTGrapple_SneakGrapple>奇襲攻撃の相手：捕縛に成功</JTGrapple_SneakGrapple>
   <JTGrapple_PrisonerGrapple>拘束中の相手：捕縛に成功</JTGrapple_PrisonerGrapple>
   <JTGrapple_SleepingGrapple>睡眠中の相手：捕縛に成功</JTGrapple_SleepingGrapple>
+  <JTGrapple_PetGrapple>屠畜中の動物：捕縛に成功</JTGrapple_PetGrapple>
 
 </LanguageData>
diff --git a/About/About.xml b/About/About.xml
@@ -19,7 +19,7 @@
       <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
     </li>
   </modDependencies>
-  <description>1.3.0.5 (10-09-2022)
+  <description>1.4.0.0 (10-21-2022)
 
 Adds modding components to RimWorld: vehicles, spell casting, weapon slots, oversized weapons, and more!
 
@@ -76,13 +76,26 @@ Michael Fisher, Storm D Bain, Luke Salinas, WonkyWoo WeebHoo, Daniel Schott, Rai
 ========================
 Changelog
 ========================
+1.4.0.0 (10-21-2022)
+========================
+Initial update for RimWorld 1.4 of JecsTools
+
+1.3.0.5 (10-09-2022)
+========================
+Updated assemblies for RimWorld 1.4 unstable support.
+- JecsTools BackstoryDef now inherits new RimWorld BackstoryDef setup. Once again based on erdelf's work.
+
 1.3.0.4 (08-08-2022)
 ========================
 damageTypesToExclude was not working correctly and has been fixed. Grappling a pet will always succeed which should prevent some fustration. Credit for this update goes to Gefallener from our RoM Discord.
 
+1.3.0.3b (07-31-2021)
+====================
+Workaround for mod lists that contain other mods with an outdated copy of CompOversizedWeapon that's loaded before ours
+
 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.
+Due to compatibility issues, the patch for Enable Oversized Weapons will require additional work. Reverting back to the previous version.
 
 1.3.0.2 (07-29-2021)
 ========================

diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,3 +1,7 @@
+1.4.0.0 (10-21-2022)
+========================
+Initial update for RimWorld 1.4 of JecsTools
+
 1.3.0.5 (10-09-2022)
 ========================
 Updated assemblies for RimWorld 1.4 unstable support.
@@ -7,9 +11,13 @@ Updated assemblies for RimWorld 1.4 unstable support.
 ========================
 damageTypesToExclude was not working correctly and has been fixed. Grappling a pet will always succeed which should prevent some fustration. Credit for this update goes to Gefallener from our RoM Discord.
 
+1.3.0.3b (07-31-2021)
+====================
+Workaround for mod lists that contain other mods with an outdated copy of CompOversizedWeapon that's loaded before ours
+
 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.
+Due to compatibility issues, the patch for Enable Oversized Weapons will require additional work. Reverting back to the previous version.
 
 1.3.0.2 (07-29-2021)
 ========================

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>JecsTools</identifier>
-  <version>1.3.0.5</version>
+  <version>1.4.0.0</version>
   <dependencies />
   <incompatibleWith />
   <manifestUri>https://raw.githubusercontent.com/jecrell/JecsTools/master/About/Manifest.xml</manifestUri>

diff --git a/About/PatreonURL.txt b/About/PatreonURL.txt
@@ -1 +1 @@
-https://www.patreon.com/posts/54071148
+https://www.patreon.com/posts/73617775
diff --git a/About/Version.txt b/About/Version.txt
@@ -1 +1 @@
-1.3.0.5
+1.4.0.0
diff --git a/Assemblies/0Harmony.dll b/Assemblies/0Harmony.dll
diff --git a/Assemblies/0JecsTools.dll b/Assemblies/0JecsTools.dll
diff --git a/Assemblies/AbilityUser.dll b/Assemblies/AbilityUser.dll
diff --git a/Assemblies/AbilityUserAI.dll b/Assemblies/AbilityUserAI.dll
diff --git a/Assemblies/CompActivatableEffect.dll b/Assemblies/CompActivatableEffect.dll
diff --git a/Assemblies/CompAnimated.dll b/Assemblies/CompAnimated.dll
diff --git a/Assemblies/CompBalloon.dll b/Assemblies/CompBalloon.dll
diff --git a/Assemblies/CompBigBox.dll b/Assemblies/CompBigBox.dll
diff --git a/Assemblies/CompDeflector.dll b/Assemblies/CompDeflector.dll
diff --git a/Assemblies/CompDelayedSpawner.dll b/Assemblies/CompDelayedSpawner.dll
diff --git a/Assemblies/CompExtraSounds.dll b/Assemblies/CompExtraSounds.dll
diff --git a/Assemblies/CompInstalledPart.dll b/Assemblies/CompInstalledPart.dll
diff --git a/Assemblies/CompLumbering.dll b/Assemblies/CompLumbering.dll
diff --git a/Assemblies/CompOverlays.dll b/Assemblies/CompOverlays.dll
diff --git a/Assemblies/CompOversizedWeapon.dll b/Assemblies/CompOversizedWeapon.dll
diff --git a/Assemblies/CompSlotLoadable.dll b/Assemblies/CompSlotLoadable.dll
diff --git a/Assemblies/CompToggleDef.dll b/Assemblies/CompToggleDef.dll
diff --git a/Assemblies/CompVehicle.dll b/Assemblies/CompVehicle.dll
diff --git a/Assemblies/PawnShields.dll b/Assemblies/PawnShields.dll
diff --git a/Assemblies/ThinkNodes.dll b/Assemblies/ThinkNodes.dll
diff --git a/Defs/AbilityDefs/Abilities_Base.xml b/Defs/AbilityDefs/Abilities_Base.xml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://www.patreon.com/posts/54071148
		https://www.patreon.com/posts/73617775