Skip to content

Commit

Permalink
Merge pull request #161 from post-kerbin-mining-corporation/dev
Browse files Browse the repository at this point in the history 
Release 1.1.0
  • Loading branch information
@ChrisAdderley
ChrisAdderley authored Feb 26, 2021
2 parents e7a17e7 + 7ce22f2 commit c054c80
Show file tree
Hide file tree
Showing 32 changed files with 163 additions and 112 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ Network Trash Folder
Temporary Items
.apdisk
Source/FarFutureTechnologies/bin/Release
GameData/FarFutureTechnologies/Parts/@thumbs
6 changes: 3 additions & 3 deletions .mod_data.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ dependencies: # Configure dependencies
location: github
repository: post-kerbin-mining-corporation/DynamicBatteryStorage
DeployableEngines:
tag: 1.2.3
tag: 1.3.0
location: github
repository: post-kerbin-mining-corporation/DeployableEngines
CryoTanks:
tag: 1.5.5
tag: 1.6.0
location: github
repository: post-kerbin-mining-corporation/CryoTanks
Waterfall:
tag: 0.4.1
location: github
repository: post-kerbin-mining-corporation/Waterfall
SystemHeat:
tag: 0.3.4
tag: 0.3.7
location: github
repository: post-kerbin-mining-corporation/SystemHeat
SpaceDust:
Expand Down
42 changes: 21 additions & 21 deletions GameData/FarFutureTechnologies/Localization/en-us.cfg
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions GameData/FarFutureTechnologies/Parts/Engines/Antimatter/fft-antimatter-beam-1.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ PART
radiatorMax = 0.3

heatConductivity = 0.005
bulkheadProfiles = size5
bulkheadProfiles = size4
tags = #LOC_FFT_fft-antimatter-beam-1_tags

MODULE
{
name = ModuleEnginesFX
Expand Down Expand Up @@ -120,7 +120,7 @@ PART
key = 12 0.001
}
}

MODULE
{
name = ModuleSystemHeat
Expand Down Expand Up @@ -150,9 +150,9 @@ PART
key = 2000 0.0
}
}





MODULE
{
name = ModuleGimbal
Expand Down
12 changes: 6 additions & 6 deletions GameData/FarFutureTechnologies/Parts/Engines/Antimatter/fft-antimatter-microfission-1.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ PART
radiatorMax = 0.3

heatConductivity = 0.005
bulkheadProfiles = size5
bulkheadProfiles = size4
tags = #LOC_FFT_fft-antimatter-microfission-1_tags
RESOURCE
{
name = Ablator
amount = 17000
maxAmount = 17000
}

MODULE
{
name = ModuleEnginesFX
Expand Down Expand Up @@ -132,7 +132,7 @@ PART
key = 12 0.001
}
}

MODULE
{
name = ModuleSystemHeat
Expand Down Expand Up @@ -162,7 +162,7 @@ PART
key = 2000 0.0
}
}

MODULE
{
name = ModuleChargeableEngine
Expand Down Expand Up @@ -257,7 +257,7 @@ PART
}
}
}

MODULE
{
name = ModuleGimbal
Expand Down Expand Up @@ -570,7 +570,7 @@ PART
key = 1 1 0 0
}
}

MODULE
{
name = ModuleWaterfallFX
Expand Down
6 changes: 3 additions & 3 deletions GameData/FarFutureTechnologies/Parts/Engines/Antimatter/fft-antimatter-microfusion-1.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ PART
PROPELLANT
{
name = LqdDeuterium
ratio = 2
ratio = 1
resourceFlowMode = STAGE_PRIORITY_FLOW
DrawGauge = False
}
PROPELLANT
{
name = LqdHe3
ratio = 3
ratio = 4
resourceFlowMode = STAGE_PRIORITY_FLOW
DrawGauge = False
}
Expand Down Expand Up @@ -239,7 +239,7 @@ key = 0 0 0 0
INPUT_RESOURCE
{
ResourceName = LqdHe3
Ratio = 0.00654
Ratio = 0.00218
FlowMode = STAGE_PRIORITY_FLOW
}
INPUT_RESOURCE
Expand Down
14 changes: 7 additions & 7 deletions GameData/FarFutureTechnologies/Parts/Engines/Fission/fft-fission-zpinch-1.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ PART
radiatorMax = 0.3

heatConductivity = 0.005
bulkheadProfiles = size5
bulkheadProfiles = size4
tags = #LOC_FFT_fft-fission-zpinch-1_tags


MODULE
{
name = ModuleEnginesFX
Expand All @@ -114,7 +114,7 @@ PART
key = 12 0.001
}
}

MODULE
{
name = ModuleSystemHeat
Expand Down Expand Up @@ -144,7 +144,7 @@ PART
key = 2000 0.0
}
}

MODULE
{
name = ModuleChargeableEngine
Expand Down Expand Up @@ -225,7 +225,7 @@ PART

LaserAnimations = false
}

MODULE
{
name = ModuleGimbal
Expand Down Expand Up @@ -440,7 +440,7 @@ PART
key = 1 200 0 0
}
}

MODULE
{
name = ModuleWaterfallFX
Expand Down
8 changes: 4 additions & 4 deletions GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-axial-zpinch-1.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ PART
PROPELLANT
{
name = LqdDeuterium // 0.000000001
ratio = 2
ratio = 1
}
PROPELLANT
{
name = LqdHe3 // 0.000000001
ratio = 3
ratio = 4
}
atmosphereCurve
{
Expand All @@ -143,12 +143,12 @@ PART
PROPELLANT
{
name = LqdDeuterium // 0.000000001
ratio = 2
ratio = 1
}
PROPELLANT
{
name = LqdHe3 // 0.000000001
ratio = 3
ratio = 4
}
PROPELLANT
{
Expand Down
8 changes: 4 additions & 4 deletions GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-inertial-laser-1.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ PART
radiatorMax = 0.3

heatConductivity = 0.005
bulkheadProfiles = size5
bulkheadProfiles = size4
tags = #LOC_FFT_fft-fusion-inertial-laser-1_tags
MODULE
{
Expand All @@ -110,14 +110,14 @@ PART
PROPELLANT
{
name = LqdDeuterium
ratio = 2
ratio = 1
resourceFlowMode = STAGE_PRIORITY_FLOW
DrawGauge = False
}
PROPELLANT
{
name = LqdHe3
ratio = 3
ratio = 4
resourceFlowMode = STAGE_PRIORITY_FLOW
DrawGauge = False
}
Expand Down Expand Up @@ -149,7 +149,7 @@ PART
PROPELLANT
{
name = LqdHe3
ratio = 3
ratio = 4
resourceFlowMode = STAGE_PRIORITY_FLOW
DrawGauge = False
}
Expand Down
6 changes: 3 additions & 3 deletions GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-inertial-magnetic-1.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ PART
radiatorMax = 0.3

heatConductivity = 0.005
bulkheadProfiles = size3
bulkheadProfiles = size2
tags = #LOC_FFT_fft-fusion-magnetic-inertial-1_tags
MODULE
{
Expand Down Expand Up @@ -159,14 +159,14 @@ PART
PROPELLANT
{
name = LqdDeuterium
ratio = 2
ratio = 1
resourceFlowMode = STAGE_PRIORITY_FLOW
DrawGauge = False
}
PROPELLANT
{
name = LqdHe3
ratio = 3
ratio = 4
resourceFlowMode = STAGE_PRIORITY_FLOW
DrawGauge = False
}
Expand Down
12 changes: 6 additions & 6 deletions GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-mirror-1.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ PART
PROPELLANT
{
name = LqdDeuterium // 0.000000001
ratio = 2
ratio = 1
}
PROPELLANT
{
name = LqdHe3 // 0.000000001
ratio = 3
ratio = 4
}
atmosphereCurve
{
Expand All @@ -145,12 +145,12 @@ PART
PROPELLANT
{
name = LqdDeuterium // 0.000000001
ratio = 2
ratio = 1
}
PROPELLANT
{
name = LqdHe3 // 0.000000001
ratio = 3
ratio = 4
}
PROPELLANT
{
Expand Down Expand Up @@ -204,7 +204,7 @@ PART

SystemPower = 500
// The shutdown temperature of the part
ShutdownTemperature = 1600
ShutdownTemperature = 1900
// The temperature the system contributes to loops
SystemOutletTemperature = 1600
FUSIONMODE
Expand All @@ -222,7 +222,7 @@ PART
INPUT_RESOURCE
{
ResourceName = LqdHe3
Ratio = 0.0008175
Ratio = 0.00218
FlowMode = STAGE_PRIORITY_FLOW
}
}
Expand Down
10 changes: 5 additions & 5 deletions GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-tokamak-1.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ PART
PROPELLANT
{
name = LqdDeuterium // 0.000000001
ratio = 2
ratio = 1
}
PROPELLANT
{
name = LqdHe3 // 0.000000001
ratio = 3
ratio = 4
}
PROPELLANT
{
Expand Down Expand Up @@ -151,12 +151,12 @@ PART
PROPELLANT
{
name = LqdDeuterium // 0.000000001
ratio = 2
ratio = 1
}
PROPELLANT
{
name = LqdHe3 // 0.000000001
ratio = 3
ratio = 4
}
PROPELLANT
{
Expand Down Expand Up @@ -278,7 +278,7 @@ PART
INPUT_RESOURCE
{
ResourceName = LqdHe3
Ratio = 0.0008175
Ratio = 0.00218
FlowMode = STAGE_PRIORITY_FLOW
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...ta/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-tokamak-aerospike-1.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,14 @@ PART
PROPELLANT
{
name = LqdDeuterium
ratio = 2
ratio = 1
resourceFlowMode = STAGE_PRIORITY_FLOW
DrawGauge = False
}
PROPELLANT
{
name = LqdHe3
ratio = 3
ratio = 4
resourceFlowMode = STAGE_PRIORITY_FLOW
DrawGauge = False
}
Expand Down Expand Up @@ -219,7 +219,7 @@ PART
INPUT_RESOURCE
{
ResourceName = LqdHe3
Ratio = 0.00654
Ratio = 0.01744
FlowMode = STAGE_PRIORITY_FLOW
}
}
Expand Down
Loading

0 comments on commit c054c80

Please sign in to comment.