Skip to content

Commit a87a3be

Browse files
authored
Merge pull request #121 from KSP-RO/Develop
Develop to Master for KSP 1.6.x
2 parents 49eba6b + 6d210fc commit a87a3be

File tree

7 files changed

+18
-11
lines changed

7 files changed

+18
-11
lines changed

GameData/ModuleManager.3.1.0.dll

-103 KB
Binary file not shown.
Binary file not shown.

GameData/ThunderAerospace/ChangeLog.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
V0.13.12
2+
Re-compile for KSP 1.6.x
3+
Added support for Near Future fission Generator in Unloaded Resource processing.
4+
Added support for TacGenericConvertor in Unloaded Resource processing. - NB: does not factor in crew bonuses in resource calcs for unloaded vessels.
5+
Added support for ModuleResourceConverter's that produce ElectricCharge ONLY (eg: FuelCell) in Unloaded Resource processing. - NB: does not factor in crew bonuses in resource calcs for unloaded vessels.
6+
Fix ModuleTestSubject configuration for the revamped pod parts.
7+
18
V0.13.11
29
Add test subject to Making History parts.
310
Fix LS resources not appearing for Female Kerbals on EVA without Making History installed.

GameData/ThunderAerospace/TacLifeSupport/MM_CrewablePartTests.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Add the test subject module for all stock crewable parts. This will make the contract system generate part tests for them.
2-
@PART[Mark1-2Pod|Mark1-3Pod|cupola|Mark1Cockpit|Mark2Cockpit|landerCabinSmall|mk2Cockpit_Inline|mk1pod_v2|mk2LanderCabin|mk2Cockpit_Standard|mk3Cockpit_Shuttle|crewCabin|]:HAS[!MODULE[ModuleTestSubject]]:FOR[TacLifeSupport]
2+
@PART[Mark1-2Pod|Mark1-3Pod|cupola|Mark1Cockpit|Mark2Cockpit|landerCabinSmall|mk2Cockpit_Inline|mk1pod|mk1pod_v2|mk2LanderCabin|mk2LanderCabin_v2|mk2Cockpit_Standard|mk3Cockpit_Shuttle|crewCabin|]:HAS[!MODULE[ModuleTestSubject]]:FOR[TacLifeSupport]
33
{
44
MODULE
55
{

GameData/ThunderAerospace/TacLifeSupport/TacLifeSupport.version

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"URL": "http://ksp-avc.cybutek.net/version.php?id=9",
44
"DOWNLOAD": "https://github.com/KSP-RO/TacLifeSupport/releases",
55
"CHANGE_LOG_URL": "https://github.com/KSP-RO/TacLifeSupport/wiki/Changes",
6-
"VERSION": "0.13.11.0",
6+
"VERSION": "0.13.12.0",
77
"KSP_VERSION": {
88
"MAJOR": 1,
9-
"MINOR": 5,
9+
"MINOR": 6,
1010
"PATCH": 1
1111
},
1212
"KSP_VERSION_MIN": {
1313
"MAJOR": 1,
14-
"MINOR": 5,
14+
"MINOR": 6,
1515
"PATCH": 0
1616
},
1717
"KSP_VERSION_MAX": {
1818
"MAJOR": 1,
19-
"MINOR": 5,
19+
"MINOR": 6,
2020
"PATCH": 99
2121
}
2222
}

Source/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.13.10")]
36-
[assembly: AssemblyFileVersion("0.13.10")]
35+
[assembly: AssemblyVersion("0.13.12")]
36+
[assembly: AssemblyFileVersion("0.13.12")]

Source/TacLifeSupport.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<PropertyGroup>
113113
<AssemblyMajorVersion>0</AssemblyMajorVersion>
114114
<AssemblyMinorVersion>13</AssemblyMinorVersion>
115-
<AssemblyBuildNumber>11</AssemblyBuildNumber>
115+
<AssemblyBuildNumber>12</AssemblyBuildNumber>
116116
<AssemblyFileMajorVersion>$(AssemblyMajorVersion)</AssemblyFileMajorVersion>
117117
<AssemblyFileMinorVersion>$(AssemblyMinorVersion)</AssemblyFileMinorVersion>
118118
<AssemblyFileBuildNumber>$(AssemblyBuildNumber)</AssemblyFileBuildNumber>
@@ -130,13 +130,13 @@
130130
<DownloadUrl>https://github.com/KSP-RO/TacLifeSupport/releases</DownloadUrl>
131131
<ChangelogUrl>https://github.com/KSP-RO/TacLifeSupport/wiki/Changes</ChangelogUrl>
132132
<KspVersionMajor>1</KspVersionMajor>
133-
<KspVersionMinor>5</KspVersionMinor>
133+
<KspVersionMinor>6</KspVersionMinor>
134134
<KspVersionPatch>1</KspVersionPatch>
135135
<KspMinVersionMajor>1</KspMinVersionMajor>
136-
<KspMinVersionMinor>5</KspMinVersionMinor>
136+
<KspMinVersionMinor>6</KspMinVersionMinor>
137137
<KspMinVersionPatch>0</KspMinVersionPatch>
138138
<KspMaxVersionMajor>1</KspMaxVersionMajor>
139-
<KspMaxVersionMinor>5</KspMaxVersionMinor>
139+
<KspMaxVersionMinor>6</KspMaxVersionMinor>
140140
<KspMaxVersionPatch>99</KspMaxVersionPatch>
141141
</PropertyGroup>
142142
<Target Name="GitInfo">

0 commit comments

Comments
 (0)