Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #264

Merged
merged 3 commits into from
Mar 20, 2018
Merged

Develop #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
879288d
Merge pull request #262 from BobPalmer/master
BobPalmer Mar 10, 2018
b8578d5
KSP 1.4.1
BobPalmer Mar 20, 2018
99b21b8
USI Core Update
BobPalmer Mar 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
0.12.0 - 2018.03.13
------------------
KSP 1.4.1 Compatibility

0.11.1 - 2018.03.11
-----------------
SwapConverter Fixes

0.11.0 - 2018.03.07
------------------
KSP 1.4.0 Compatibility
Expand Down
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.dll
View file
Open in desktop
Binary file not shown.
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb
View file
Open in desktop
Binary file not shown.
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.pdb
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/000_USITools/USITools.version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
},
"VERSION":{
"MAJOR":0,
"MINOR":11,
"MINOR":12,
"PATCH":0,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":4,
"PATCH":0
"PATCH":1
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand Down
4 changes: 4 additions & 0 deletions FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
0.10.0 - 2018.03.13
-----------------
KSP 1.4.1 Compatibility

0.9.0 - 2018.03.07
------------------
KSP 1.4.0 Compatibility
Expand Down
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
},
"VERSION":{
"MAJOR":0,
"MINOR":9,
"MINOR":10,
"PATCH":0,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":4,
"PATCH":0
"PATCH":1
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand Down
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/Firespitter/Firespitter.version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version",
"VERSION": {
"MAJOR": 7,
"MINOR": 8,
"MINOR": 9,
"PATCH": 0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":4,
"PATCH":0
"PATCH":1
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand Down
Binary file modified FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll
View file
Open in desktop
Binary file not shown.
Binary file modified FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
0.7.0 - 2018.03.13
-----------------
KSP 1.4.1 Compatibility
Added Maintenance Supply loadouts to the KIS Kontainers (Thanks Voicey99!)
Added CCK category for KIS Kontainers (Thanks Voicey99!)

0.6.0 - 2018.03.07
------------------
KSP 1.4.0 Compatibility
Expand Down
5 changes: 5 additions & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
0.12.0 - 2018.03.13
-----------------
KSP 1.4.1 Compatibility
Fixed duplicate configs, balance on the LiquidFuel engines (Thanks AccidentalDisassembly!)

0.11.0 - 2018.03.07
------------------
KSP 1.4.0 Compatibility
Expand Down
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/Karbonite.version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
},
"VERSION":{
"MAJOR":0,
"MINOR":11,
"MINOR":12,
"PATCH":0,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":4,
"PATCH":0
"PATCH":1
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand Down
7 changes: 7 additions & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainers_CCK.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Add the appropriate CCK tag to all USI KIS Kontainers
// made by LEGIONBOSS

@PART[C3_Kontainer_KIS_*]:NEEDS[CommunityCategoryKit]
{
tags = cck-containers
}
18 changes: 9 additions & 9 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableSupPak.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ PART:NEEDS[KIS]
MODULE
{
name = FStextureSwitch2
textureNames = UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack
textureNames = UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack;UmbraSpaceIndustries/Kontainers/Assets/MountableSupPack
objectNames =
textureDisplayNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;Commodities;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock
textureDisplayNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;Commodities;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock;MaintenanceSupplies
useFuelSwitchModule = true
fuelTankSetups = 0;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23
fuelTankSetups = 0;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23;24
repaintableEVA = true
nextButtonText = Next Cargo
prevButtonText = Previous Cargo
Expand All @@ -53,12 +53,12 @@ PART:NEEDS[KIS]
MODULE
{
name = FSfuelSwitch
resourceNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies,Mulch;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock
resourceAmounts = 1000;1000;1000;1000;1000;500,500;1000;1000;1000;960,40;200;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000
initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0,0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
tankCost = 1760;700;300;800;320;150000;2000;14240;8000;2400;4;15800;7000;32000;2000;500;10;300;10;20;250000;15000;500;0.01
resourceNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies,Mulch;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock;MaterialKits,SpecializedParts
resourceAmounts = 1000;1000;1000;1000;1000;500,500;1000;1000;1000;960,40;200;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;850,170
initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0,0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0,0
tankCost = 1760;700;300;800;320;150000;2000;14240;8000;2400;4;15800;7000;32000;2000;500;10;300;10;20;250000;15000;500;0.01;7140
basePartMass = 0.1
tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
hasGUI = false
}

Expand All @@ -77,7 +77,7 @@ PART:NEEDS[KIS]
name = ModuleWeightDistributableCargo
}

MODULE
MODULE:NEEDS[KIS]
{
name = ModuleKISItemEvaTweaker
volumeOverride = 1100
Expand Down
18 changes: 9 additions & 9 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialSupPak.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ PART
MODULE
{
name = FStextureSwitch2
textureNames = UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04
textureNames = UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04;UmbraSpaceIndustries/MKS/Assets/MKV_Tex_04
objectNames =
textureDisplayNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;Commodities;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock
textureDisplayNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;Commodities;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock;MaintenanceSupplies
useFuelSwitchModule = true
fuelTankSetups = 0;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23
fuelTankSetups = 0;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23;24
repaintableEVA = true
nextButtonText = Next Cargo
prevButtonText = Previous Cargo
Expand All @@ -79,12 +79,12 @@ PART
MODULE
{
name = FSfuelSwitch
resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies,Mulch;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock
resourceAmounts = 1250;1250;1250;1250;1250;625,625;1250;1250;1250;1200,50;250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250
initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0,0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
tankCost = 2200;875;375;1000;400;187500;2500;17800;10000;3000;5;19750;8750;40000;2500;625;12.5;375;12.5;25;312500;18750;625;0.0125
basePartMass = 0.15625
tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies,Mulch;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock;MaterialKits,SpecializedParts
resourceAmounts = 1250;1250;1250;1250;1250;625,625;1250;1250;1250;1200,50;250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1050,210
initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0,0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0,0
tankCost = 2200;875;375;1000;400;187500;2500;17800;10000;3000;5;19750;8750;40000;2500;625;12.5;375;12.5;25;312500;18750;625;0.0125;8820
basePartMass = 0.15625
tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
hasGUI = false
}

Expand Down
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
},
"VERSION":{
"MAJOR":0,
"MINOR":6,
"MINOR":7,
"PATCH":0,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":4,
"PATCH":0
"PATCH":1
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand Down