Skip to content

Partial Fix for 1.5 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
penguin0616 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Partial Fix for 1.5 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ output/PrepareLanding/1.3/Assemblies/*.mdb
output/PrepareLanding/1.4/Assemblies/*.dll
output/PrepareLanding/1.4/Assemblies/*.pdb
output/PrepareLanding/1.4/Assemblies/*.mdb
output/PrepareLanding/1.5/Assemblies/*.dll
output/PrepareLanding/1.5/Assemblies/*.pdb
output/PrepareLanding/1.5/Assemblies/*.mdb

# Ignore specific tools (pdb2mdb)

Expand Down
26 changes: 13 additions & 13 deletions PrepareLanding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,51 +26,51 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>output\PrepareLanding\1.4\Assemblies\</OutputPath>
<OutputPath>output\PrepareLanding\1.5\Assemblies\</OutputPath>
<DefineConstants>TRACE;WORLD_DATA</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>packages\Lib.Harmony.2.2.2\lib\net472\0Harmony.dll</HintPath>
<Reference Include="0Harmony, Version=2.3.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Lib.Harmony.2.3.3\lib\net472\0Harmony.dll</HintPath>
</Reference>
<Reference Include="HugsLib">
<HintPath>packages\UnlimitedHugs.Rimworld.HugsLib.10.0.1\lib\net472\HugsLib.dll</HintPath>
<Reference Include="HugsLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\UnlimitedHugs.Rimworld.HugsLib.11.0.3\lib\net472\HugsLib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="Assembly-CSharp">
<HintPath>libs\1.4\Assembly-CSharp.dll</HintPath>
<HintPath>libs\1.5\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>libs\1.4\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>libs\1.5\Assembly-CSharp-firstpass.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine">
<HintPath>libs\1.4\UnityEngine.dll</HintPath>
<HintPath>libs\1.5\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>libs\1.4\UnityEngine.CoreModule.dll</HintPath>
<HintPath>libs\1.5\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule">
<HintPath>libs\1.4\UnityEngine.IMGUIModule.dll</HintPath>
<HintPath>libs\1.5\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.InputLegacyModule">
<HintPath>libs\1.4\UnityEngine.InputLegacyModule.dll</HintPath>
<HintPath>libs\1.5\UnityEngine.InputLegacyModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.TextRenderingModule">
<HintPath>libs\1.4\UnityEngine.TextRenderingModule.dll</HintPath>
<HintPath>libs\1.5\UnityEngine.TextRenderingModule.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
Expand Down Expand Up @@ -157,7 +157,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>if $(ConfigurationName) == Debug python $(ProjectDir)tools\pdb2mdb.py $(TargetPath)
if $(ConfigurationName) == Debug python $(ProjectDir)tools\copy_to_rimworld.py $(TargetDir) K:\rimworld_debug\RimWorld_14 1.4 --output_dir $(ProjectDir)output\$(TargetName) --pdb --mdb</PostBuildEvent>
if $(ConfigurationName) == Debug python $(ProjectDir)tools\copy_to_rimworld.py $(TargetDir) D:\Steam\steamapps\common\RimWorld 1.5 --output_dir $(ProjectDir)output\$(TargetName) --pdb --mdb</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
6 changes: 3 additions & 3 deletions Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("PrepareLanding")]
[assembly: AssemblyDescription("A RimWorld 1.4 mod")]
[assembly: AssemblyDescription("A RimWorld 1.5 mod")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("neitsa")]
[assembly: AssemblyProduct("PrepareLanding")]
Expand All @@ -31,5 +31,5 @@
// 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("1.4.0.0")]
[assembly: AssemblyFileVersion("1.4.0.0")]
[assembly: AssemblyVersion("1.5.0.0")]
[assembly: AssemblyFileVersion("1.5.0.0")]
5 changes: 3 additions & 2 deletions output/PrepareLanding/About/About.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
<li>1.1</li>
<li>1.2</li>
<li>1.3</li>
<li>1.4</li>
<li>1.4</li>
<li>1.5</li>
</supportedVersions>
<packageId>neitsa.PrepareLanding</packageId>
<description>Prepare your landing by picking the right tile on the world map!
You can also change tile characteristics to your liking.

[Version 1.4.0]
[Version 1.5.0]
</description>
<modDependencies>
<li>
Expand Down
2 changes: 1 addition & 1 deletion output/PrepareLanding/About/Manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>PrepareLanding</identifier>
<version>1.4.0</version>
<version>1.5.0</version>
<manifestUri>https://raw.githubusercontent.com/neitsa/PrepareLanding/develop/output/PrepareLanding/About/Manifest.xml</manifestUri>
<downloadUri>https://github.com/neitsa/PrepareLanding/releases/latest</downloadUri>
</Manifest>
2 changes: 1 addition & 1 deletion output/PrepareLanding/About/Version.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<VersionData>
<overrideVersion>1.4.0</overrideVersion>
<overrideVersion>1.5.0</overrideVersion>
<gitHubRepository>neitsa/PrepareLanding</gitHubRepository>
</VersionData>
4 changes: 2 additions & 2 deletions packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Lib.Harmony" version="2.2.2" targetFramework="net472" />
<package id="UnlimitedHugs.Rimworld.HugsLib" version="10.0.1" targetFramework="net472" />
<package id="Lib.Harmony" version="2.3.3" targetFramework="net472" />
<package id="UnlimitedHugs.Rimworld.HugsLib" version="11.0.3" targetFramework="net472" />
</packages>
4 changes: 2 additions & 2 deletions src/TabLoadSave.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ private void DrawLoadPresetInfo(Rect inRect)

ListingStandard.Label("PLMWLODSAV_PresetDescription".Translate());
var descriptionRect = ListingStandard.GetRect(80f);
Widgets.TextAreaScrollable(descriptionRect, preset.PresetInfo.Description,
LudeonTK.DevGUI.TextAreaScrollable(descriptionRect, preset.PresetInfo.Description,
ref _scrollPosPresetLoadDescription);

ListingStandard.Label("PLMWLODSAV_PresetFilters".Translate());
Expand Down Expand Up @@ -537,7 +537,7 @@ private void DrawSaveFileName(Rect inRect)
DrawEntryHeader(string.Format("PLMWLODSAV_DescriptionString".Translate(), MaxDescriptionLength));

var descriptionRect = ListingStandard.GetRect(80f);
_presetDescriptionSave = Widgets.TextAreaScrollable(descriptionRect, _presetDescriptionSave,
_presetDescriptionSave = LudeonTK.DevGUI.TextAreaScrollable(descriptionRect, _presetDescriptionSave,
ref _scrollPosPresetDescription);
if (_presetDescriptionSave.Length >= MaxDescriptionLength)
_presetDescriptionSave = _presetDescriptionSave.Substring(0, MaxDescriptionLength);
Expand Down