Skip to content

Commit 7bbed9c

Browse files
JPLRepoJPLRepo
authored
Merge pull request #125 from KSP-RO/Develop
Develop
2 parents a87a3be + 9e7571c commit 7bbed9c

File tree

13 files changed

+48
-30
lines changed

13 files changed

+48
-30
lines changed

‎GameData/CommunityCategoryKit/CCK.version‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@
77
},
88
"KSP_VERSION":{
99
"MAJOR":1,
10-
"MINOR":5,
10+
"MINOR":6,
1111
"PATCH":0
1212
},
1313
"KSP_VERSION_MIN":{
1414
"MAJOR":1,
15-
"MINOR":5,
15+
"MINOR":6,
1616
"PATCH":0
1717
},
1818
"KSP_VERSION_MAX":{
1919
"MAJOR":1,
20-
"MINOR":5,
20+
"MINOR":6,
2121
"PATCH":9
2222
},
2323
"NAME": "Community Category Kit",
2424
"URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version",
2525
"VERSION": {
2626
"MAJOR": 4,
27-
"MINOR": 0,
27+
"MINOR": 1,
2828
"PATCH": 0,
2929
"BUILD": 0
3030
}

‎GameData/CommunityCategoryKit/CHANGELOG.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
4.0.0 - 2018.10.20
1+
4.1.0 - 2019.02.05
2+
------------------
3+
KSP 1.6.x Compatibility
4+
5+
4.0.0 - 2018.11.20
26
------------------
37
KSP 1.5.0 Compatibility
48

‎GameData/CommunityResourcePack/CHANGELOG.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
1.1.0 - 2019.02.05
2+
------------------
3+
KSP 1.6.x Compatibility
4+
5+
1.0.1 - 2018.11.20
6+
------------------
7+
Fixed antimatter config name
8+
19
1.0.0 - 2018.10.20
210
------------------
311
KSP 1.5.0 Compatibility

‎GameData/CommunityResourcePack/CRP.version‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99
},
1010
"VERSION":{
1111
"MAJOR":1,
12-
"MINOR":0,
12+
"MINOR":1,
1313
"PATCH":0,
1414
"BUILD":0
1515
},
1616
"KSP_VERSION":{
1717
"MAJOR":1,
18-
"MINOR":5,
18+
"MINOR":6,
1919
"PATCH":0
2020
},
2121
"KSP_VERSION_MIN":{
2222
"MAJOR":1,
23-
"MINOR":5,
23+
"MINOR":6,
2424
"PATCH":0
2525
},
2626
"KSP_VERSION_MAX":{
2727
"MAJOR":1,
28-
"MINOR":5,
28+
"MINOR":6,
2929
"PATCH":9
3030
}
3131
}

‎GameData/REPOSoftTech/BackgroundResources/BackgroundResources.dll‎

21.5 KB
Binary file not shown.

‎GameData/ThunderAerospace/ChangeLog.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
V0.13.13
2+
Re-compile for KSP 1.7.x
3+
Reduce Log Spam when scenes change (no longer logs all save data).
4+
Support for Kromoneter and other mods that replace KSPUtil.dateTimeFormatter.
5+
Add missing buildhead profile to 1.25m waste container.
16
V0.13.12
27
Re-compile for KSP 1.6.x
38
Added support for Near Future fission Generator in Unloaded Resource processing.

‎GameData/ThunderAerospace/TacLifeSupport/TacLifeSupport.version‎

Lines changed: 5 additions & 5 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.12.0",
6+
"VERSION": "0.13.13.0",
77
"KSP_VERSION": {
88
"MAJOR": 1,
9-
"MINOR": 6,
10-
"PATCH": 1
9+
"MINOR": 7,
10+
"PATCH": 2
1111
},
1212
"KSP_VERSION_MIN": {
1313
"MAJOR": 1,
14-
"MINOR": 6,
14+
"MINOR": 7,
1515
"PATCH": 0
1616
},
1717
"KSP_VERSION_MAX": {
1818
"MAJOR": 1,
19-
"MINOR": 6,
19+
"MINOR": 7,
2020
"PATCH": 99
2121
}
2222
}

‎GameData/ThunderAerospace/TacLifeSupportContainers/Waste.cfg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ PART
3131
cost = 300
3232
category = Utility
3333
subcategory = 0
34+
bulkheadProfiles = size1
3435
title = #autoLOC_TACLS_00127 //Life Support Waste Container, 1.25m
3536
manufacturer = #autoLOC_TACLS_00153 //Thunder Aerospace Corporation
3637
description = #autoLOC_TACLS_00128 //A 1.25-meter container for holding Life Support waste products.

‎Source/AddLifeSupport.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private void EvaAddLifeSupport(AvailablePart part)
9595
this.Log("Part " + part.name + " has no partPrefab");
9696
return;
9797
}
98-
this.Log("Adding resources to " + part.name + "/" + prefabPart.partInfo.title);
98+
//this.Log("Adding resources to " + part.name + "/" + prefabPart.partInfo.title);
9999

100100
EvaAddPartModule(prefabPart);
101101
if (HighLogic.CurrentGame == null) return;
@@ -110,10 +110,10 @@ private void EvaAddLifeSupport(AvailablePart part)
110110
EvaAddResource(prefabPart, HighLogic.CurrentGame.Parameters.CustomParams<TAC_SettingsParms_Sec2>().CO2ProductionRate, globalSettings.CO2, false);
111111
EvaAddResource(prefabPart, HighLogic.CurrentGame.Parameters.CustomParams<TAC_SettingsParms_Sec2>().WasteProductionRate, globalSettings.Waste, false);
112112
EvaAddResource(prefabPart, HighLogic.CurrentGame.Parameters.CustomParams<TAC_SettingsParms_Sec2>().WasteWaterProductionRate, globalSettings.WasteWater, false);
113-
for (int i = 0; i < prefabPart.Resources.Count; i++)
114-
{
115-
this.Log("Resource " + prefabPart.Resources[i].resourceName);
116-
}
113+
//for (int i = 0; i < prefabPart.Resources.Count; i++)
114+
//{
115+
// this.Log("Resource " + prefabPart.Resources[i].resourceName);
116+
//}
117117

118118
}
119119

‎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.12")]
36-
[assembly: AssemblyFileVersion("0.13.12")]
35+
[assembly: AssemblyVersion("0.13.13")]
36+
[assembly: AssemblyFileVersion("0.13.13")]

0 commit comments

Comments
 (0)