Skip to content

Commit aa26ea5

Browse files
BobPalmerBobPalmer
authored
Merge pull request #1442 from UmbraSpaceIndustries/DEVELOP
Develop
2 parents 1f2debb + b570b28 commit aa26ea5

File tree

189 files changed

+7920
-5559
lines changed

Some content is hidden

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

189 files changed

+7920
-5559
lines changed

‎FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
{
88
"MAJOR":1,
99
"MINOR":6,
10-
"PATCH":0,
10+
"PATCH":2,
1111
"BUILD":0
1212
},
1313
"KSP_VERSION_MIN":
1414
{
1515
"MAJOR":1,
1616
"MINOR":4,
17-
"PATCH":3
17+
"PATCH":5
1818
},
1919
"KSP_VERSION_MAX":
2020
{
2121
"MAJOR":1,
2222
"MINOR":4,
23-
"PATCH":3
23+
"PATCH":5
2424
}
2525
}

‎FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll

7 KB
Binary file not shown.

‎FOR_RELEASE/GameData/000_AT_Utils/Plugins/002_MultiAnimators.dll

0 Bytes
Binary file not shown.

‎FOR_RELEASE/GameData/000_AT_Utils/Plugins/PluginData/000_AT_Utils/000_AT_Utils.glob

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MeshesToSkip = flagtransform canopy
2-
BadParts = RadialDrill
2+
BadParts = RadialDrill MKS.Drill.02 MKS.Drill.03
33

44
StylesConfig
55
{
@@ -12,4 +12,4 @@ StylesConfig
1212
CloseButtonColor = red
1313
DangerButtonColor = red
1414
}
15-
15+
//:mode=c#:

‎FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[ModuleCommand]]
1+
@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[ModuleCommand|KerbalSeat]]
22
{
33
MODULE
44
{
55
name = ModuleLogisticsConsumer
66
}
77
}
8-
9-
@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[KerbalSeat]]
10-
{
11-
MODULE
12-
{
13-
name = ModuleLogisticsConsumer
14-
}
15-
}
16-

‎FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
AGENT
22
{
33
name = Umbra Space Industries
4+
title = Umbra Space Industries
45

56
description = A world leader in corrugated paper products, Umbra Space Industries is now applying their formidable boxing and packaging skills into a a series of products for colonization, exploration, and resource exploitation!
67

‎FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
1.1.0 - 2019.02.05
2+
------------------
3+
KSP 1.6.x Compatibility
4+
5+
1.0.0 - 2018.11.20
6+
------------------
7+
KSP 1.5.0 Compatibility
8+
9+
0.13.0 - 2018.06.22
10+
------------------
11+
KSP 1.4.4 Compatibility
12+
113
0.12.0 - 2018.03.13
214
------------------
315
KSP 1.4.1 Compatibility

‎FOR_RELEASE/GameData/000_USITools/Logistics.cfg

+9-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,12 @@ RESOURCE_DEFINITION //Hidden resource used to manage mass
1616
isTweakable = false
1717
isVisible = false
1818
volume = 1
19-
}
19+
}
20+
21+
@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],RESOURCE[Machinery|EnrichedUranium|DepletedFuel|Recyclables]]:FOR[USITools]
22+
{
23+
MODULE
24+
{
25+
name = USI_ModuleFieldRepair
26+
}
27+
}

‎FOR_RELEASE/GameData/000_USITools/USITools.dll

1.5 KB
Binary file not shown.

‎FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb

44 Bytes
Binary file not shown.

‎FOR_RELEASE/GameData/000_USITools/USITools.pdb

0 Bytes
Binary file not shown.

‎FOR_RELEASE/GameData/000_USITools/USITools.version

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
"ALLOW_PRE_RELEASE":false
99
},
1010
"VERSION":{
11-
"MAJOR":0,
12-
"MINOR":12,
11+
"MAJOR":1,
12+
"MINOR":1,
1313
"PATCH":0,
1414
"BUILD":0
1515
},
1616
"KSP_VERSION":{
1717
"MAJOR":1,
18-
"MINOR":4,
19-
"PATCH":1
18+
"MINOR":6,
19+
"PATCH":0
2020
},
2121
"KSP_VERSION_MIN":{
2222
"MAJOR":1,
23-
"MINOR":4,
23+
"MINOR":6,
2424
"PATCH":0
2525
},
2626
"KSP_VERSION_MAX":{
2727
"MAJOR":1,
28-
"MINOR":4,
28+
"MINOR":6,
2929
"PATCH":9
3030
}
3131
}

‎FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll

0 Bytes
Binary file not shown.

‎FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
},
88
"KSP_VERSION":{
99
"MAJOR":1,
10-
"MINOR":4,
11-
"PATCH":1
10+
"MINOR":6,
11+
"PATCH":0
1212
},
1313
"KSP_VERSION_MIN":{
1414
"MAJOR":1,
15-
"MINOR":4,
15+
"MINOR":6,
1616
"PATCH":0
1717
},
1818
"KSP_VERSION_MAX":{
1919
"MAJOR":1,
20-
"MINOR":4,
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": {
26-
"BUILD": 0,
27-
"MAJOR": 3,
28-
"MINOR": 0,
29-
"PATCH": 0
30-
}
26+
"MAJOR": 4,
27+
"MINOR": 1,
28+
"PATCH": 0,
29+
"BUILD": 0
30+
}
3131
}

‎FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
4.1.0 - 2019.02.05
2+
------------------
3+
KSP 1.6.x Compatibility
4+
5+
4.0.0 - 2018.11.20
6+
------------------
7+
KSP 1.5.0 Compatibility
8+
9+
3.2.0 - 2018.06.22
10+
------------------
11+
KSP 1.4.4 Compatibility
12+
113
3.1.0 - 2018.03.13
214
-----------------
315
KSP 1.4.1 Compatibility

‎FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
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+
9+
1.0.0 - 2018.10.20
10+
------------------
11+
KSP 1.5.0 Compatibility
12+
Normalized atmospheric resource harvesting values.
13+
14+
0.11.0 - 2018.06.22
15+
------------------
16+
KSP 1.4.4 Compatibility
17+
118
0.10.0 - 2018.03.13
219
-----------------
320
KSP 1.4.1 Compatibility

‎FOR_RELEASE/GameData/CommunityResourcePack/CRP.version

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
"ALLOW_PRE_RELEASE":false
99
},
1010
"VERSION":{
11-
"MAJOR":0,
12-
"MINOR":10,
11+
"MAJOR":1,
12+
"MINOR":1,
1313
"PATCH":0,
1414
"BUILD":0
1515
},
1616
"KSP_VERSION":{
1717
"MAJOR":1,
18-
"MINOR":4,
19-
"PATCH":1
18+
"MINOR":6,
19+
"PATCH":0
2020
},
2121
"KSP_VERSION_MIN":{
2222
"MAJOR":1,
23-
"MINOR":4,
23+
"MINOR":6,
2424
"PATCH":0
2525
},
2626
"KSP_VERSION_MAX":{
2727
"MAJOR":1,
28-
"MINOR":4,
28+
"MINOR":6,
2929
"PATCH":9
3030
}
3131
}

‎FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -855,9 +855,9 @@ RESOURCE_DEFINITION
855855
{
856856
name = CompressedAir
857857
abbreviation = #LOC_CRP_CompressedAir_Abbreviation
858-
displayName = #LOC_CompressedAir_DisplayName
858+
displayName = #LOC_CRP_CompressedAir_DisplayName
859859
density = 0.000001283
860-
unitCost = 0.00015
860+
unitCost = 0.00004
861861
hsp = 2175
862862
flowMode = STAGE_PRIORITY_FLOW
863863
transfer = PUMP

0 commit comments

Comments
 (0)