Skip to content

Commit 9cee84e

Browse files
authored
Merge pull request #1287 from UmbraSpaceIndustries/DEVELOP
Develop
2 parents f3d69a6 + 2bbc37c commit 9cee84e

File tree

175 files changed

+2649
-3833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+2649
-3833
lines changed

.gitignore

+5-34
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,16 @@ KolonyTools/KolonyTools.v12.suo
22
KolonyTools/KolonyTools/bin
33
KolonyTools/KolonyTools/obj
44
~$MKS_Worksheet.xlsx
5-
Source/KolonyTools/bin/Debug/Assembly-CSharp-firstpass.dll
6-
Source/KolonyTools/bin/Debug/Assembly-CSharp.dll
7-
Source/KolonyTools/bin/Debug/KolonyTools.dll
8-
Source/KolonyTools/bin/Debug/Mono.Security.dll
9-
Source/KolonyTools/bin/Debug/Mono.Cecil.dll
10-
Source/KolonyTools/bin/Debug/UnityEngine.dll
11-
Source/KolonyTools/bin/Debug/KolonyTools.pdb
12-
Source/KolonyTools/bin/Debug/TDx.TDxInput.dll
13-
Source/KolonyTools/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
14-
Source/KolonyTools/obj/Debug/KolonyTools.pdb
15-
Source/KolonyTools/obj/Debug/KolonyTools.csproj.FileListAbsolute.txt
16-
Source/KolonyTools/obj/Debug/DesignTimeResolveAssemblyReferences.cache
17-
Source/KolonyTools/obj/Debug/KolonyTools.dll
18-
Source/KolonyTools/bin/Debug/TacLifeSupport.dll
5+
Source/KolonyTools/obj/
6+
Source/KolonyTools/KolonyTools/obj/
7+
Source/KolonyTools/bin/
8+
Source/KolonyTools/KolonyTools/bin/
199
Models/Kerbitrail_Tube/Temp/UnityLockfile
2010
*.DotSettings
2111
*.user
22-
Source/KolonyTools/obj/x64/Debug/build.force
2312
*.force
2413
*.cache
2514
*.db
2615
*.cache
2716
*.zip
28-
Source/KolonyTools/KolonyTools/obj/Debug/KolonyTools.dll
29-
Source/KolonyTools/KolonyTools/obj/Debug/KolonyTools.csproj.FileListAbsolute.txt
30-
Source/KolonyTools/KolonyTools/obj/Debug/KolonyTools.pdb
31-
Source/KolonyTools/KolonyTools/obj/Release/KolonyTools.csproj.FileListAbsolute.txt
32-
Source/KolonyTools/KolonyTools/obj/Release/KolonyTools.dll
33-
Source/KolonyTools/KolonyTools/bin/Release/KolonyTools.pdb
34-
Source/KolonyTools/KolonyTools/bin/Release/KolonyTools.dll
35-
Source/KolonyTools/KolonyTools/bin/Debug/USI_Converter.dll
36-
Source/KolonyTools/KolonyTools/bin/Debug/USITools.dll
37-
Source/KolonyTools/KolonyTools/bin/Debug/UnityEngine.dll
38-
Source/KolonyTools/KolonyTools/bin/Debug/Toolbar.dll
39-
Source/KolonyTools/KolonyTools/bin/Debug/TDx.TDxInput.dll
40-
Source/KolonyTools/KolonyTools/bin/Debug/Mono.Security.dll
41-
Source/KolonyTools/KolonyTools/bin/Debug/Mono.Cecil.dll
42-
Source/KolonyTools/KolonyTools/bin/Debug/KolonyTools.pdb
43-
Source/KolonyTools/KolonyTools/bin/Debug/KolonyTools.dll
44-
Source/KolonyTools/KolonyTools/bin/Debug/Assembly-CSharp.dll
45-
Source/KolonyTools/KolonyTools/bin/Debug/Assembly-CSharp-firstpass.dll
46-
Source/KolonyTools/KolonyTools.v12.suo
17+
Source/KolonyTools/KolonyTools.v12.suo
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
0.8.17 - 2017.03.17
1+
0.9.0 - KSP 1.3
22
-------------------
3-
Dependency Updates
3+
KSP 1.3 Compatibility
4+
Fix infinite loop with "prev loadout" when USILS is not installed
5+
6+
0.8.18 - 2017.03.17
7+
-------------------
8+
Fixed bugs related to ground tethers and PDU power transfers
49

510
0.8.16 - 2017.02.24
611
-------------------
Binary file not shown.
Binary file not shown.
Binary file not shown.

FOR_RELEASE/GameData/000_USITools/USITools.version

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99
},
1010
"VERSION":{
1111
"MAJOR":0,
12-
"MINOR":8,
13-
"PATCH":17,
12+
"MINOR":9,
13+
"PATCH":0,
1414
"BUILD":0
1515
},
1616
"KSP_VERSION":{
1717
"MAJOR":1,
18-
"MINOR":2,
19-
"PATCH":2
18+
"MINOR":3,
19+
"PATCH":0
2020
},
2121
"KSP_VERSION_MIN":{
2222
"MAJOR":1,
2323
"MINOR":2,
24-
"PATCH":0
24+
"PATCH":9
2525
},
2626
"KSP_VERSION_MAX":{
2727
"MAJOR":1,
28-
"MINOR":2,
29-
"PATCH":2
28+
"MINOR":3,
29+
"PATCH":9
3030
}
3131
}
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
2+
"NAME": "Community Category Kit",
3+
"URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version",
4+
"VERSION": {
5+
"BUILD": 0,
6+
"MAJOR": 2,
7+
"MINOR": 0,
8+
"PATCH": 0
9+
},
210
"DOWNLOAD": "https://github.com/BobPalmer/CommunityCategoryKit/releases",
311
"GITHUB": {
412
"ALLOW_PRE_RELEASE": false,
513
"REPOSITORY": "CommunityCategoryKit",
614
"USERNAME": "BobPalmer"
715
},
8-
"KSP_VERSION": {
9-
"MAJOR": 1,
10-
"MINOR": 2,
11-
"PATCH": 2
12-
},
13-
"KSP_VERSION_MAX": {
14-
"MAJOR": 1,
15-
"MINOR": 2,
16-
"PATCH": 2
17-
},
18-
"KSP_VERSION_MIN": {
19-
"MAJOR": 1,
20-
"MINOR": 2,
21-
"PATCH": 0
22-
},
23-
"NAME": "Community Category Kit",
24-
"URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version",
25-
"VERSION": {
26-
"BUILD": 0,
27-
"MAJOR": 1,
28-
"MINOR": 2,
29-
"PATCH": 2
30-
}
16+
"KSP_VERSION":{
17+
"MAJOR":1,
18+
"MINOR":3,
19+
"PATCH":0
20+
},
21+
"KSP_VERSION_MIN":{
22+
"MAJOR":1,
23+
"MINOR":2,
24+
"PATCH":9
25+
},
26+
"KSP_VERSION_MAX":{
27+
"MAJOR":1,
28+
"MINOR":3,
29+
"PATCH":9
30+
}
3131
}

FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
1.2.2 - 2016.02.04
1+
2.0.0 - KSP 1.3
22
------------------
3+
KSP 1.3 Compatibility
34
Added Rovers as a new standard category
45

56
1.2.1 - 2016.12.12

FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0.7.0 - KSP 1.3
2+
------------------
3+
KSP 1.3 Compatibility
4+
Dependency Updates
5+
16
0.6.6 - 2017.02.04
27
------------------
38
Added common resource Sodium a potential high efficient electric propellant

FOR_RELEASE/GameData/CommunityResourcePack/CRP.version

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99
},
1010
"VERSION":{
1111
"MAJOR":0,
12-
"MINOR":6,
13-
"PATCH":6,
12+
"MINOR":7,
13+
"PATCH":0,
1414
"BUILD":0
1515
},
1616
"KSP_VERSION":{
1717
"MAJOR":1,
18-
"MINOR":2,
19-
"PATCH":2
18+
"MINOR":3,
19+
"PATCH":0
2020
},
2121
"KSP_VERSION_MIN":{
2222
"MAJOR":1,
23-
"MINOR":1,
24-
"PATCH":0
23+
"MINOR":2,
24+
"PATCH":9
2525
},
2626
"KSP_VERSION_MAX":{
2727
"MAJOR":1,
28-
"MINOR":2,
29-
"PATCH":2
28+
"MINOR":3,
29+
"PATCH":9
3030
}
3131
}

0 commit comments

Comments
 (0)