Skip to content

Commit

Permalink
Merge pull request #199 from post-kerbin-mining-corporation/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
ChrisAdderley authored Oct 13, 2024
2 parents 5db2edd + 5d2e95e commit bb1766e
Show file tree
Hide file tree
Showing 8 changed files with 724 additions and 435 deletions.
2 changes: 1 addition & 1 deletion .mod_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies: # Configure dependencies
location: github
repository: post-kerbin-mining-corporation/CryoTanks
Waterfall:
tag: 0.10.2
tag: 0.10.3
location: github
repository: post-kerbin-mining-corporation/Waterfall
SystemHeat:
Expand Down
8 changes: 4 additions & 4 deletions GameData/FarFutureTechnologies/Localization/en-us.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -420,12 +420,12 @@ Localization
// -----------------

#LOC_FFT_fft-rcs-arcjet-large-1_title = ARC-L Electrothermal RCS
#LOC_FFT_fft-rcs-arcjet-large-1_description =
#LOC_FFT_fft-rcs-arcjet-large-1_tags =
#LOC_FFT_fft-rcs-arcjet-large-1_description = High power electrical RCS block using Lithium or Hydrogen for propellant. Uses an exorbitant amount of power to compete with chemical RCS at much higher impulses.
#LOC_FFT_fft-rcs-arcjet-large-1_tags = farfuture arc electro thermal ion plasma rcs control jet block

#LOC_FFT_fft-rcs-arcjet-1_title = ARC-μ Electrothermal RCS
#LOC_FFT_fft-rcs-arcjet-1_description =
#LOC_FFT_fft-rcs-arcjet-1_tags =
#LOC_FFT_fft-rcs-arcjet-1_description = High power electrical RCS block using Lithium or Hydrogen for propellant. Uses a large amount of power to compete with chemical RCS at much higher impulses.
#LOC_FFT_fft-rcs-arcjet-1_tags = farfuture arc electro thermal ion plasma rcs control jet block

// Resources
// ====================
Expand Down
10 changes: 9 additions & 1 deletion GameData/FarFutureTechnologies/Localization/zh-cn.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,15 @@ Localization
#LOC_FFT_ModuleFusionEngine_ModuleName = 聚变发动机 // Fusion Engine
#LOC_FFT_ModuleFusionEngine_Message_ReactorNotReady = [<<1>>]: 反应堆必须为激活状态! // [<<1>>]: reactor must be active!

// ModuleMultiRatioEngine
// OTHER
// ======
// Subcategories

#LOC_FFT_Subcategory_fusionEngines = 聚变引擎
#LOC_FFT_Subcategory_antimatterEngines = 反物质引擎
#LOC_FFT_Subcategory_antimatterFuel = 反物质燃料
#LOC_FFT_Subcategory_lithiumFuel = 锂燃料
#LOC_FFT_Subcategory_fusionFuel = 聚变燃料

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ PART
name = ModuleRCSFX
stagingEnabled = False
thrusterTransformName = thrustVector
thrusterPower = 10
thrusterPower = 1
resourceName = Lithium
resourceFlowMode = STAGE_PRIORITY_FLOW
runningEffectName = running
Expand All @@ -97,7 +97,7 @@ PART
atmosphereCurve
{
key = 0 1000
key = 1 150
key = 1 100
key = 4 0.001
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ PART
}
atmosphereCurve
{
key = 0 2000
key = 1 150
key = 0 1200
key = 1 100
key = 4 0.001
}
}
Expand Down
Loading

0 comments on commit bb1766e

Please sign in to comment.