Skip to content

Commit

Permalink
Merge pull request #91 from post-kerbin-mining-corporation/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
ChrisAdderley authored Jan 14, 2021
2 parents 423623b + 77706e0 commit c2926e7
Show file tree
Hide file tree
Showing 35 changed files with 66 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .mod_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies: # Configure dependencies
location: github
repository: post-kerbin-mining-corporation/DeployableEngines
CryoTanks:
tag: 1.5.5
tag: 1.5.6
location: github
repository: post-kerbin-mining-corporation/CryoTanks
deploy:
Expand Down
1 change: 1 addition & 0 deletions CKAN/CryoEngines-LFO.netkan
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"x_netkan_epoch": 1,
"name": "Cryogenic Engines - Liquid Fuel/Oxidizer",
"abstract": "Optional patch to make the engines burn KSP's normal liquid fuel and oxidizer mixture instead of the custom liquid hydrogen and oxidizer mixture that they use by default, at the cost of efficiency",
"author" : "Nertea (Chris Adderley)",
"license": "MIT",
"resources": {
"homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/106089-16x-cryogenic-engines-high-isp-chemical-rockets-january-21/",
Expand Down
1 change: 1 addition & 0 deletions CKAN/CryoEngines-NFAero.netkan
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"$vref": "#/ckan/ksp-avc/GameData/CryoEngines/Versioning/CryoEngines.version",
"name": "Cryogenic Engines - Near Future Aeronautics",
"abstract": "Optional patch to convert relevant engines in Near Future Aeronautics to burn Liquid Hydrogen",
"author" : "Nertea (Chris Adderley)",
"license": "MIT",
"resources": {
"homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/106089-16x-cryogenic-engines-high-isp-chemical-rockets-january-21/",
Expand Down
1 change: 1 addition & 0 deletions CKAN/CryoEngines-Restock.netkan
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"x_netkan_epoch": 1,
"name": "Cryogenic Engines - Restock",
"abstract": "Optional patch to convert some engines in Restock and ReStock+ to use cryogenic fuel, improving efficiency. Will affect savegames!",
"author" : "Nertea (Chris Adderley)",
"license": "MIT",
"resources": {
"homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/106089-16x-cryogenic-engines-high-isp-chemical-rockets-january-21/",
Expand Down
1 change: 1 addition & 0 deletions CKAN/CryoEngines.netkan
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"name": "Cryogenic Engines",
"license": "restricted",
"abstract" : "Provides new, very high efficiency engines in 1.25m, 2.5m and 3.75m size classes that burn liquid hydrogen.",
"author" : "Nertea (Chris Adderley)",
"resources": {
"homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/106089-16x-cryogenic-engines-high-isp-chemical-rockets-january-21/",
"repository": "https://github.com/post-kerbin-mining-corporation/CryoEngines"
Expand Down
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-erebus-1.mu
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-etna-1.mu
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-fuji-1.mu
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-hecate-1.mu
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-lower-1-n.dds
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-lower-2-n.dds
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-pavonis-1.mu
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-shrouds-1-n.dds
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-stromboli-1.mu
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-tharsis-1.mu
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-ulysses-1.mu
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-upper-1-n.dds
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-upper-1-s.dds
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-upper-2-n.dds
Binary file not shown.
Binary file modified GameData/CryoEngines/Assets/Engine/cryoengine-vesuvius-1.mu
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PART
{
name = cryoengine-stromboli-1
module = Part
author = Chris Adderley
author = Chris Adderley (Nertea)
MODEL
{
model = CryoEngines/Assets/Engine/cryoengine-stromboli-1
Expand Down Expand Up @@ -193,7 +193,7 @@ PART
MODULE
{
name = ModuleJettison
jettisonName = Shroud0625,ShroudCompact
jettisonName = Shroud0625,ShroudCompact,B_Shrouds
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.1
Expand All @@ -211,7 +211,7 @@ PART
name = 1.25m
title = #LOC_CryoEngines_engine_switcher_mount_variant1
transform = B_Stromboli0625
transform = Shroud0625
transform = Shroud0625Mesh
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_0625_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_0625_detail
primaryColor = #999999
Expand All @@ -231,7 +231,7 @@ PART
{
name = Compact
title = #LOC_CryoEngines_engine_switcher_mount_variant5
transform = ShroudCompact
transform = ShroudCompactMesh
transform = B_StromboliCompact
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_compact_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_compact_detail
Expand Down
8 changes: 4 additions & 4 deletions GameData/CryoEngines/Parts/Engine/125/cryoengine-hecate-1.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PART
{
name = cryoengine-hecate-1
module = Part
author = Chris Adderley
author = Chris Adderley (Nertea)
MODEL
{
model = CryoEngines/Assets/Engine/cryoengine-hecate-1
Expand Down Expand Up @@ -186,7 +186,7 @@ PART
{
name = 1.25m
title = #LOC_CryoEngines_engine_switcher_mount_variant2
transform = Shroud125
transform = Shroud125Mesh
transform = B_Hecate125
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_125_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_125_detail
Expand All @@ -197,7 +197,7 @@ PART
{
name = Compact
title = #LOC_CryoEngines_engine_switcher_mount_variant5
transform = ShroudCompact
transform = ShroudCompactMesh
transform =B_HecateCompact
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_compact_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_compact_detail
Expand Down Expand Up @@ -235,7 +235,7 @@ PART
MODULE
{
name = ModuleJettison
jettisonName = Shroud125,ShroudCompact
jettisonName = Shroud125,ShroudCompact,B_Shrouds
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PART
{
name = cryoengine-vesuvius-1
module = Part
author = Chris Adderley
author = Chris Adderley (Nertea)
MODEL
{
model = CryoEngines/Assets/Engine/cryoengine-vesuvius-1
Expand Down Expand Up @@ -181,7 +181,7 @@ PART
MODULE
{
name = ModuleJettison
jettisonName = Shroud125,ShroudCompact
jettisonName = Shroud125,ShroudCompact,B_Shrouds
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.1
Expand All @@ -198,7 +198,7 @@ PART
{
name = 1.25m
title = #LOC_CryoEngines_engine_switcher_mount_variant2
transform = Shroud125
transform = Shroud125Mesh
transform = B_Vulcain125
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_125_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_125_detail
Expand All @@ -219,7 +219,7 @@ PART
{
name = Compact
title = #LOC_CryoEngines_engine_switcher_mount_variant5
transform = ShroudCompact
transform = ShroudCompactMesh
transform = B_VulcainCompact
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_compact_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_compact_detail
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PART
{
name = cryoengine-erebus-1
module = Part
author = Chris Adderley
author = Chris Adderley (Nertea)
MODEL
{
model = CryoEngines/Assets/Engine/cryoengine-erebus-1
Expand Down Expand Up @@ -181,7 +181,7 @@ PART
MODULE
{
name = ModuleJettison
jettisonName = Shroud1875,ShroudCompact
jettisonName = Shroud1875,ShroudCompact,B_Shrouds
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.1
Expand All @@ -198,7 +198,7 @@ PART
{
name = 1.25m
title = #LOC_CryoEngines_engine_switcher_mount_variant2
transform = Shroud1875
transform = Shroud1875Mesh
transform = B_Erebus_1875
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_1875_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_1875_detail
Expand All @@ -220,7 +220,7 @@ PART
name = Compact
title = #LOC_CryoEngines_engine_switcher_mount_variant5
transform = B_Erebus_Compact
transform = ShroudCompact
transform = ShroudCompactMesh
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_compact_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_compact_detail
primaryColor = #999999
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PART
{
name = cryoengine-pavonis-1
module = Part
author = Chris Adderley
author = Chris Adderley (Nertea)
MODEL
{
model = CryoEngines/Assets/Engine/cryoengine-pavonis-1
Expand Down Expand Up @@ -187,7 +187,7 @@ PART
{
name = 1.875m
title = #LOC_CryoEngines_engine_switcher_mount_variant7
transform = Shroud1875
transform = Shroud1875Mesh
transform = B_Pavonis1875
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_1875_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_1875_detail
Expand All @@ -198,7 +198,7 @@ PART
{
name = Compact
title = #LOC_CryoEngines_engine_switcher_mount_variant5
transform = ShroudCompact
transform = ShroudCompactMesh
transform = B_PavonisCompact
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_compact_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_compact_detail
Expand Down Expand Up @@ -238,7 +238,7 @@ PART
MODULE
{
name = ModuleJettison
jettisonName = Shroud1875,ShroudCompact
jettisonName = Shroud1875,ShroudCompact,B_Shrouds
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.1
Expand Down
8 changes: 4 additions & 4 deletions GameData/CryoEngines/Parts/Engine/25/cryoengine-fuji-1.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PART
{
name = cryoengine-fuji-1
module = Part
author = Chris Adderley
author = Chris Adderley (Nertea)
MODEL
{
model = CryoEngines/Assets/Engine/cryoengine-fuji-1
Expand Down Expand Up @@ -201,7 +201,7 @@ PART
name = 2.5m
title = #LOC_CryoEngines_engine_switcher_mount_variant3
transform = B_Fuji25
transform = Shroud25
transform = Shroud25Mesh
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_25_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_25_detail
primaryColor = #999999
Expand All @@ -222,7 +222,7 @@ PART
name = Compact
title = #LOC_CryoEngines_engine_switcher_mount_variant5
transform = B_FujiCompact
transform = ShroudCompact
transform = ShroudCompactMesh
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_compact_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_compact_detail
primaryColor = #999999
Expand Down Expand Up @@ -256,7 +256,7 @@ PART
MODULE
{
name = ModuleJettison
jettisonName = ShroudCompact,Shroud25
jettisonName = ShroudCompact,Shroud25,B_Shrouds
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.5
Expand Down
8 changes: 4 additions & 4 deletions GameData/CryoEngines/Parts/Engine/25/cryoengine-ulysses-1.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PART
{
name = cryoengine-ulysses-1
module = Part
author = Chris Adderley
author = Chris Adderley (Nertea)
MODEL
{
model = CryoEngines/Assets/Engine/cryoengine-ulysses-1
Expand Down Expand Up @@ -178,7 +178,7 @@ PART
name = 2.5m
title = #LOC_CryoEngines_engine_switcher_mount_variant3
transform =B_J2X25
transform = Shroud25
transform = Shroud25Mesh
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_25_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_25_detail
primaryColor = #999999
Expand All @@ -190,7 +190,7 @@ PART
name = Compact
title = #LOC_CryoEngines_engine_switcher_mount_variant5
transform = B_J2XCompact
transform = ShroudCompact
transform = ShroudCompactMesh
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_compact_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_compact_detail
primaryColor = #999999
Expand Down Expand Up @@ -228,7 +228,7 @@ PART
MODULE
{
name = ModuleJettison
jettisonName = Shroud25,ShroudCompact
jettisonName = Shroud25,ShroudCompact,B_Shrouds
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.5
Expand Down
8 changes: 4 additions & 4 deletions GameData/CryoEngines/Parts/Engine/375/cryoengine-etna-1.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PART
{
name = cryoengine-etna-1
module = Part
author = Chris Adderley
author = Chris Adderley (Nertea)
MODEL
{
model = CryoEngines/Assets/Engine/cryoengine-etna-1
Expand Down Expand Up @@ -282,7 +282,7 @@ PART
{
name = 3.75m
title = #LOC_CryoEngines_engine_switcher_mount_variant4
transform = Shroud375
transform = Shroud375Mesh
transform = B_Etna375
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_375_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_375_detail
Expand All @@ -303,7 +303,7 @@ PART
{
name = Compact
title = #LOC_CryoEngines_engine_switcher_mount_variant5
transform = ShroudCompact
transform = ShroudCompactMesh
transform = B_EtnaCompact
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_compact_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_compact_detail
Expand All @@ -314,7 +314,7 @@ PART
MODULE
{
name = ModuleJettison
jettisonName = ShroudCompact,Shroud375
jettisonName = ShroudCompact,Shroud375,B_Shrouds
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PART
{
name = cryoengine-tharsis-1
module = Part
author = Chris Adderley
author = Chris Adderley (Nertea)
MODEL
{
model = CryoEngines/Assets/Engine/cryoengine-tharsis-1
Expand Down Expand Up @@ -161,7 +161,7 @@ PART
name = 3.75m
title = #LOC_CryoEngines_engine_switcher_mount_variant4
transform = B_Tharsis375
transform = Shroud375
transform = Shroud375Mesh
node = top
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_375_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_375_detail
Expand All @@ -174,7 +174,7 @@ PART
name = Compact
title = #LOC_CryoEngines_engine_switcher_mount_variant5
transform = B_TharsisCompact
transform = ShroudCompact
transform = ShroudCompactMesh
node = top2
descriptionSummary = #LOC_CryoEngines_engine_switcher_mount_compact_summary
descriptionDetail = #LOC_CryoEngines_engine_switcher_mount_compact_detail
Expand Down Expand Up @@ -251,7 +251,7 @@ PART
MODULE
{
name = ModuleJettison
jettisonName = Shroud375,ShroudCompact
jettisonName = Shroud375,ShroudCompact,B_Shrouds
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.5
Expand Down
5 changes: 5 additions & 0 deletions GameData/CryoEngines/Patches/CryoEngines1-10.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// Deletes cargo partmodule in KSP < 1.11
@PART[*]:HAS[#author[Chris?Adderley??Nertea?],@MODULE[ModuleCargoPart]]:NEEDS[!Squad/Parts/Engine/Size2LFB_v2]:FOR[CryoEngines]
{
!MODULE[ModuleCargoPart] {}
}
Loading

0 comments on commit c2926e7

Please sign in to comment.