Skip to content

Commit

Permalink
Merge pull request #78 from BobPalmer/DEVELOP
Browse files Browse the repository at this point in the history
2017.05.28 Post-release patches
  • Loading branch information
BobPalmer committed May 28, 2017
2 parents 4902a71 + d350026 commit f5244bc
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 18 deletions.
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.9.0 - KSP 1.3
0.9.1 - KSP 1.3
-------------------
KSP 1.3 Compatibility
Fix infinite loop with "prev loadout" when USILS is not installed
Expand Down
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.dll
Binary file not shown.
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb
Binary file not shown.
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/000_USITools/USITools.version
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"VERSION":{
"MAJOR":0,
"MINOR":9,
"PATCH":0,
"PATCH":1,
"BUILD":0
},
"KSP_VERSION":{
Expand Down
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.7.0 - KSP 1.3
0.7.1 - KSP 1.3
------------------
KSP 1.3 Compatibility
Dependency Updates
Expand Down
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"VERSION":{
"MAJOR":0,
"MINOR":7,
"PATCH":0,
"PATCH":1,
"BUILD":0
},
"KSP_VERSION":{
Expand Down
35 changes: 25 additions & 10 deletions FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,8 @@ RESOURCE_DEFINITION
RESOURCE_DEFINITION
{
name = ArgonGas // Common electric engine propellant
displayName = ArgonGas // Common electric engine propellant
displayName = #LOC_CRP_ArgonGas_DisplayName // Common electric engine propellant
abbreviation = #LOC_CRP_ArgonGas_Abbreviation
density = 0.00000178400
unitCost = 0.0105
flowMode = STAGE_PRIORITY_FLOW
Expand All @@ -556,7 +557,8 @@ RESOURCE_DEFINITION
RESOURCE_DEFINITION
{
name = Boron
displayName = Boron
displayName = #LOC_CRP_Boron_DisplayName
abbreviation = #LOC_CRP_Boron_Abbreviation
density = 0.00246000000
unitCost = 0.851
flowMode = STAGE_PRIORITY_FLOW
Expand All @@ -581,8 +583,9 @@ RESOURCE_DEFINITION

RESOURCE_DEFINITION
{
name = DepletedUranium // Depleted fuel to preserve mass when burned, can be recycled
displayName = DepletedUranium // Depleted fuel to preserve mass when burned, can be recycled
name = DepletedUranium
displayName = #LOC_CRP_DepletedUranium_DisplayName // Depleted fuel to preserve mass when burned, can be recycled
abbreviation = #LOC_CRP_DepletedUranium_Abbreviation // Depleted fuel to preserve mass when burned, can be recycled
unitCost = 0
density = 0.01097000000
flowMode = NO_FLOW
Expand All @@ -595,8 +598,9 @@ RESOURCE_DEFINITION

RESOURCE_DEFINITION
{
name = EnrichedUranium // Nuclear fuel
displayName = EnrichedUranium // Nuclear fuel
name = EnrichedUranium
dispalyName = #LOC_CRP_EnrichedUranium_DisplayName // Nuclear fuel
abbreviation = #LOC_CRP_EnrichedUranium_Abbreviation // Nuclear fuel
density = 0.01097000000
unitCost = 865.0000000
isTweakable = true
Expand All @@ -609,8 +613,9 @@ RESOURCE_DEFINITION

RESOURCE_DEFINITION
{
name = LqdHydrogen // General propellant, used for high thrust electric engines
displayName = LqdHydrogen // General propellant, used for high thrust electric engines
name = LqdHydrogen
displayName = #LOC_CRP_LqdHydrogen_DisplayName // General propellant
abbreviation = #LOC_CRP_LqdHydrogen_Abbreviation // General propellant
density = 0.00007085000
unitCost = 0.0367500
hsp = 9690 // specific heat capacity (kJ/tonne-K as units) at Crygenic Storage temperature
Expand All @@ -625,8 +630,9 @@ RESOURCE_DEFINITION

RESOURCE_DEFINITION
{
name = StoredCharge // Capacitor resource. Translates to Ec
displayName = StoredCharge // Capacitor resource. Translates to Ec
name = StoredCharge
displayName = #LOC_CRP_StoredCharge_DisplayName // Capacitor resource. Translates to Ec
abbreviation = #LOC_CRP_StoredCharge_Abbreviation // Capacitor resource. Translates to Ec
unitCost = 0
density = 0
flowMode = NO_FLOW
Expand Down Expand Up @@ -1353,6 +1359,15 @@ RESOURCE_DEFINITION
ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/ThermalPower
}

RESOURCE_DEFINITION
{
name = Thorium
density = 0.0117
unitCost = 46.8
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
}

RESOURCE_DEFINITION
{
Expand Down
19 changes: 19 additions & 0 deletions FOR_RELEASE/GameData/CommunityResourcePack/Localization/en-us.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Localization
{
en-us
{

#LOC_CRP_ArgonGas_DisplayName = Argon Gas
#LOC_CRP_ArgonGas_Abbreviation = Ar
#LOC_CRP_Boron_DisplayName = Boron
#LOC_CRP_Boron_Abbreviation = Bo
#LOC_CRP_EnrichedUranium_DisplayName = Enriched Uranium
#LOC_CRP_EnrichedUranium_Abbreviation = EnrU
#LOC_CRP_DepletedUranium_DisplayName = Depleted Uranium
#LOC_CRP_DepletedUranium_Abbreviation = DepU
#LOC_CRP_LqdHydrogen_DisplayName = Liquid Hydrogen
#LOC_CRP_LqdHydrogen_Abbreviation = LH2
#LOC_CRP_StoredCharge_DisplayName = Stored Charge
#LOC_CRP_StoredCharge_Abbreviation = SC
}
}
Binary file modified FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll
Binary file not shown.
Binary file removed FOR_RELEASE/GameData/ModuleManager.2.7.6.dll
Binary file not shown.
Binary file added FOR_RELEASE/GameData/ModuleManager.2.8.0.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/UmbraSpaceIndustries/ART/ART.version
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"VERSION":{
"MAJOR":0,
"MINOR":10,
"PATCH":0,
"PATCH":1,
"BUILD":0
},
"KSP_VERSION":{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.10.0 - KSP 1.3
0.10.1 - KSP 1.3
-------------------
KSP 1.3 Compatibility
Dependency updates
Expand Down
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.4.0 - KSP 1.3
0.4.1 - KSP 1.3
-------------------
KSP 1.3 Compatibility
Rock kontainers - config and texture (Thanks JadeOfMaar!)
Expand Down
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"VERSION":{
"MAJOR":0,
"MINOR":4,
"PATCH":0,
"PATCH":1,
"BUILD":0
},
"KSP_VERSION":{
Expand Down

0 comments on commit f5244bc

Please sign in to comment.