Skip to content

Commit

Permalink
Merge pull request #71 from edbmods/mod-corruption-fix
Browse files Browse the repository at this point in the history
Attempted fix for reported mod corruption issue
  • Loading branch information
edbmods authored Sep 8, 2016
2 parents 07406da + 4668321 commit 48205b1
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 6 deletions.
3 changes: 2 additions & 1 deletion EdBPrepareCarefully.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>EdB.PrepareCarefully</RootNamespace>
<AssemblyName>EdBPrepareCarefully</AssemblyName>
<ReleaseVersion>0.15.1.2</ReleaseVersion>
<ReleaseVersion>0.15.1.3</ReleaseVersion>
<UseMSBuildEngine>False</UseMSBuildEngine>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
Expand Down Expand Up @@ -127,6 +127,7 @@
<None Include="README.md" />
<None Include="Libraries\README.md" />
<None Include="Resources\Defs\Scenarios\ScenParts_Fixed.xml" />
<None Include="Resources\Defs\ThingDefs\EdBPrepareCarefully.xml" />
</ItemGroup>
<ItemGroup>
<Folder Include="Libraries\" />
Expand Down
6 changes: 3 additions & 3 deletions EdBPrepareCarefully.sln
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Global
$2.FileWidth = 120
$2.TabsToSpaces = False
$2.EolMarker = Unix
$2.inheritsSet = null
$2.inheritsSet = VisualStudio
$2.inheritsScope = text/plain
$2.scope = application/xml
$2.scope = text/plain
$0.CSharpFormattingPolicy = $3
$3.IndentSwitchBody = True
$3.ElseNewLinePlacement = NewLine
Expand Down Expand Up @@ -195,6 +195,6 @@ Global
$29.IncludeStaticEntities = True
$0.VersionControlPolicy = $31
$31.inheritsSet = Mono
version = 0.15.1.2
version = 0.15.1.3
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("0.15.1.2")]
[assembly: AssemblyVersion("0.15.1.3")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
2 changes: 1 addition & 1 deletion Resources/About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

If you get a set of starting colonists that you like, save them as a preset so that you can start your game the same way next time.

[Version 0.15.1.2]
[Version 0.15.1.3]
</description>
</ModMetaData>
7 changes: 7 additions & 0 deletions Resources/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
_____________________________________________________________________________

Version 0.15.1.3
_____________________________________________________________________________

- Attempt to fix mod corruption issues.

_____________________________________________________________________________

Version 0.15.1.2
Expand Down
10 changes: 10 additions & 0 deletions Resources/Defs/ThingDefs/EdBPrepareCarefully.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<ThingDefs>
<!-- This file is no longer used, but since the workshop doesn't seem to consistently
delete files on mod updates, we're leaving it here to avoid mod corruption errors.
We leave a placeholder pawn relation def since that should leave no side-effects.
-->
<EdB.PrepareCarefully.CarefullyPawnRelationDef>
<defName>EdBPrepareCarefullyDummyDefinition</defName>
</EdB.PrepareCarefully.CarefullyPawnRelationDef>
</ThingDefs>

0 comments on commit 48205b1

Please sign in to comment.