diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt index 84cd8b5..dcdd8f2 100644 --- a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt @@ -1,3 +1,7 @@ +0.8.1 - 2016.10.15 +------------------ +Fixed an issue that was causing swappable converters to shut down + 0.8.0 - (KSP 1.2) ------------------ Fixed issue with version file diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll index 9abfc4b..84f6748 100644 Binary files a/FOR_RELEASE/GameData/000_USITools/USITools.dll and b/FOR_RELEASE/GameData/000_USITools/USITools.dll differ diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb b/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb index b47d094..da69548 100644 Binary files a/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb and b/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb differ diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.pdb b/FOR_RELEASE/GameData/000_USITools/USITools.pdb index b29cd92..e0c779d 100644 Binary files a/FOR_RELEASE/GameData/000_USITools/USITools.pdb and b/FOR_RELEASE/GameData/000_USITools/USITools.pdb differ diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version index 6099a9f..0a1a3ed 100644 --- a/FOR_RELEASE/GameData/000_USITools/USITools.version +++ b/FOR_RELEASE/GameData/000_USITools/USITools.version @@ -10,7 +10,7 @@ "VERSION":{ "MAJOR":0, "MINOR":8, - "PATCH":0, + "PATCH":1, "BUILD":0 }, "KSP_VERSION":{ diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt index 7715915..af99212 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt @@ -1,3 +1,7 @@ +0.6.1 - 2016.10.15 +------------------ +Resorted KSPI resources alphabeticly, added abbreviation and Added LqdArgon, LqdFluorine, LqdNitrogen15, LqdOxygen18 + 0.6.0 - (KSP 1.2) ------------------- Added ARP icon data for RealFuels diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version index efe09f8..c1edfbe 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version @@ -10,7 +10,7 @@ "VERSION":{ "MAJOR":0, "MINOR":6, - "PATCH":0, + "PATCH":1, "BUILD":0 }, "KSP_VERSION":{ diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg index aef80e1..6df14cd 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg @@ -585,32 +585,35 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { + abbreviation = Act name = Actinides density = 0.01097 flowMode = NO_FLOW transfer = NONE isTweakable = false - isVisible = true + isVisible = true unitCost = 0 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Actinides + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Actinides } RESOURCE_DEFINITION { + abbreviation = Al name = Aluminium density = 0.00277 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP isTweakable = true - isVisible = true + isVisible = true unitCost = 1.5 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Aluminium + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Aluminium } RESOURCE_DEFINITION { + abbreviation = Aia name = Alumina density = 0.00398 flowMode = STAGE_PRIORITY_FLOW @@ -619,11 +622,12 @@ RESOURCE_DEFINITION isVisible = true unitCost = 0.5 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Alumina + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Alumina } RESOURCE_DEFINITION { + abbreviation = AM name = Antimatter density = 0.000000001 flowMode = STAGE_PRIORITY_FLOW @@ -632,11 +636,27 @@ RESOURCE_DEFINITION isVisible = true unitCost = 100 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/AntiMatter + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/AntiMatter } RESOURCE_DEFINITION { + abbreviation = Ar + name = LqdArgon + density = 0.0013954 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + unitCost = 1.4 + isTweakable = true + isVisible = true + hsp = 1078 + volume = 1 +} + +RESOURCE_DEFINITION +{ + abbreviation = B name = Borate density = 0.000173 flowMode = ALL_VESSEL @@ -649,17 +669,33 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { - name = Carbon - density = 0.0021 - unitCost = 0.0 - hsp = 710 - flowMode = NO_FLOW - transfer = NONE - isTweakable = false + abbreviation = C + name = Carbon + density = 0.0021 + unitCost = 0.0 + hsp = 710 + flowMode = NO_FLOW + transfer = NONE + isTweakable = false + volume = 1 +} + +RESOURCE_DEFINITION +{ + abbreviation = CP + name = ChargedParticles + density = 0 + flowMode = ALL_VESSEL + transfer = NONE + isTweakable = false + isVisible = true + unitCost = 0 + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/ChargedParticles } RESOURCE_DEFINITION { + abbreviation = D name = Deuterium density = 0.000000180 flowMode = STAGE_PRIORITY_FLOW @@ -673,31 +709,34 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { - name = ChargedParticles - density = 0 - flowMode = ALL_VESSEL - transfer = NONE - isTweakable = false + abbreviation = D + name = LqdDeuterium + density = 0.0001624 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true isVisible = true - unitCost = 0 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/ChargedParticles + unitCost = 0.256 + volume = 1 } RESOURCE_DEFINITION { + abbreviation = DepF name = DepletedFuel density = 0.01097 flowMode = NO_FLOW transfer = NONE isTweakable = false - isVisible = true + isVisible = true unitCost = 0 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/DepletedFuel + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/DepletedFuel } RESOURCE_DEFINITION { + abbreviation = ExM name = ExoticMatter density = 0 flowMode = ALL_VESSEL @@ -711,6 +750,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { + abbreviation = F name = Fluorine density = 0.000001696 flowMode = STAGE_PRIORITY_FLOW @@ -723,6 +763,21 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { + abbreviation = F + name = LqdFluorine + density = 0.01696 + flowMode = STACK_PRIORITY_SEARCH + transfer = PUMP + isTweakable = true + isVisible = true + unitCost = 1 + hsp = 824 // specific heat capacity (kJ/tonne-K as units) gas + volume = 1 +} + +RESOURCE_DEFINITION +{ + abbreviation = D2O name = HeavyWater density = 0.001107 hsp = 4183 @@ -737,6 +792,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { + abbreviation = IntA name = IntakeAtm density = 0.005 flowMode = ALL_VESSEL @@ -745,11 +801,12 @@ RESOURCE_DEFINITION isVisible = true unitCost = 0 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/IntakeAtm + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/IntakeAtm } RESOURCE_DEFINITION { + abbreviation = Kr name = KryptonGas density = 0.000003749 flowMode = STAGE_PRIORITY_FLOW @@ -762,6 +819,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { + abbreviation = Ne name = NeonGas density = 0.0000009002 flowMode = STAGE_PRIORITY_FLOW @@ -774,6 +832,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { + abbreviation = Li7 name = Lithium density = 0.000534 flowMode = STAGE_PRIORITY_FLOW @@ -782,11 +841,12 @@ RESOURCE_DEFINITION isVisible = true unitCost = 0.27 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Lithium + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Lithium } RESOURCE_DEFINITION { + abbreviation = Li6 name = Lithium6 density = 0.000458 flowMode = STAGE_PRIORITY_FLOW @@ -799,6 +859,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { + abbreviation = NH3 name = LqdAmmonia density = 0.0007021 flowMode = STACK_PRIORITY_SEARCH @@ -808,23 +869,14 @@ RESOURCE_DEFINITION unitCost = 0.00006785 hsp= 5170 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/LqdAmmonia + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/LqdAmmonia } -RESOURCE_DEFINITION -{ - name = LqdDeuterium - density = 0.0001624 - flowMode = STAGE_PRIORITY_FLOW - transfer = PUMP - isTweakable = true - isVisible = true - unitCost = 0.256 - volume = 1 -} + RESOURCE_DEFINITION { + abbreviation = He3 name = Helium3 density = 0.000000125 flowMode = ALL_VESSEL @@ -834,37 +886,40 @@ RESOURCE_DEFINITION unitCost = 0.11127 hsp = 4560 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Helium-3 + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Helium-3 } RESOURCE_DEFINITION { - name = Helium4 - density = 0.0000001786 - flowMode = ALL_VESSEL + abbreviation = He3 + name = LqdHe3 + density = 0.000059 + flowMode = STAGE_PRIORITY_FLOW transfer = PUMP isTweakable = true isVisible = true - unitCost = 0.0000133 - hsp = 5188 - volume = 1 + unitCost = 52.52 + hsp = 4560 + volume = 1 } RESOURCE_DEFINITION { - name = LqdHe3 - density = 0.000059 - flowMode = STAGE_PRIORITY_FLOW + abbreviation = He4 + name = Helium4 + density = 0.0000001786 + flowMode = ALL_VESSEL transfer = PUMP isTweakable = true isVisible = true - unitCost = 52.52 - hsp = 4560 - volume = 1 + unitCost = 0.0000133 + hsp = 5188 + volume = 1 } RESOURCE_DEFINITION { + abbreviation = He4 name = LqdHelium density = 0.0001786 flowMode = STAGE_PRIORITY_FLOW @@ -874,37 +929,40 @@ RESOURCE_DEFINITION unitCost = 0.0133 hsp = 4560 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/LqdHelium + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/LqdHelium } RESOURCE_DEFINITION { - name = LqdTritium - density = 0.000320 - flowMode = STAGE_PRIORITY_FLOW + abbreviation = N14 + name = LqdNitrogen + density = 0.000824907 + flowMode = STACK_PRIORITY_SEARCH transfer = PUMP isTweakable = true isVisible = true - unitCost = 18.8 - hsp = 9690 + unitCost = 0.0008240 + hsp = 2040 volume = 1 } RESOURCE_DEFINITION { - name = LqdNitrogen - density = 0.000824907 + abbreviation = N15 + name = LqdNitrogen15 + density = 0.008838 flowMode = STACK_PRIORITY_SEARCH transfer = PUMP isTweakable = true isVisible = true - unitCost = 0.0008240 + unitCost = 0.08240 // About 100 times cost LqdNitrogen hsp = 2040 volume = 1 } RESOURCE_DEFINITION { + abbreviation = MegJ name = Megajoules density = 0 flowMode = ALL_VESSEL @@ -913,11 +971,12 @@ RESOURCE_DEFINITION isVisible = true unitCost = 0 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Megajoules + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Megajoules } RESOURCE_DEFINITION { + abbreviation = Monz name = Monazite density = 0.005 flowMode = ALL_VESSEL @@ -929,9 +988,24 @@ RESOURCE_DEFINITION volume = 1 } +RESOURCE_DEFINITION +{ + abbreviation = O18 + name = LqdOxygen18 + density = 0.001284 + unitCost = 0.6 // about 13 times cost of LqdOxygen + hsp = 918 // specific heat capacity (kJ/tonne-K as units) // recalc, mols are for O2 on wiki + vsp = 213000 // heat of vapourization (KJ/tonne as units) + flowMode = STACK_PRIORITY_SEARCH + transfer = PUMP + isTweakable = true + isVisible = true + volume = 1 +} RESOURCE_DEFINITION { + abbreviation = Pu238 name = Plutonium-238 density = 0.019816 flowMode = NO_FLOW @@ -940,11 +1014,12 @@ RESOURCE_DEFINITION isVisible = true unitCost = 4000 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Plutonium-238 + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Plutonium-238 } RESOURCE_DEFINITION { + abbreviation = UF4 name = UF4 density = 0.005 flowMode = ALL_VESSEL @@ -953,24 +1028,12 @@ RESOURCE_DEFINITION isVisible = true unitCost = 72 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/UF4 -} - -RESOURCE_DEFINITION -{ - name = ThF4 - density = 0.0042 - flowMode = ALL_VESSEL - transfer = NONE - isTweakable = true - isVisible = true - unitCost = 18 - volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/ThF4 + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/UF4 } RESOURCE_DEFINITION { + abbreviation = Silica name = Silicates density = 0.00025 flowMode = ALL_VESSEL @@ -983,6 +1046,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { + abbreviation = Si name = Silicon density = 0.0002329 flowMode = ALL_VESSEL @@ -995,6 +1059,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { + abbreviation = ThP name = ThermalPower density = 0 unitCost = 0 @@ -1002,11 +1067,41 @@ RESOURCE_DEFINITION transfer = NONE isTweakable = false isVisible = true - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/ThermalPower + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/ThermalPower +} + + +RESOURCE_DEFINITION +{ + abbreviation = ThF4 + name = ThF4 + density = 0.0042 + flowMode = ALL_VESSEL + transfer = NONE + isTweakable = true + isVisible = true + unitCost = 18 + volume = 1 + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/ThF4 +} + +RESOURCE_DEFINITION +{ + abbreviation = T + name = LqdTritium + density = 0.000320 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + isVisible = true + unitCost = 18.8 + hsp = 9690 + volume = 1 } RESOURCE_DEFINITION { + abbreviation = UN name = UraniumNitride density = 0.0113 flowMode = STAGE_PRIORITY_FLOW @@ -1015,11 +1110,12 @@ RESOURCE_DEFINITION isVisible = true unitCost = 3718 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/UraniumNitride + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/UraniumNitride } RESOURCE_DEFINITION { + abbreviation = VP name = VacuumPlasma density = 0.005 flowMode = ALL_VESSEL @@ -1028,12 +1124,13 @@ RESOURCE_DEFINITION isVisible = true unitCost = 0 volume = 1 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/VacuumPlasma + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/VacuumPlasma } RESOURCE_DEFINITION { + abbreviation = WH name = WasteHeat density = 0 flowMode = ALL_VESSEL @@ -1041,7 +1138,7 @@ RESOURCE_DEFINITION isTweakable = false isVisible = true unitCost = 0 - ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/WasteHeat + ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/WasteHeat } //****************************** diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt index a9b6a22..c06a2f2 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt @@ -1,3 +1,7 @@ +0.3.1 - 2016.10.15 +------------------ +Fixes texture switch missing parameters (Thanks goldenpsp!) + 0.3.0 - (KSP 1.2) ------------------ All Kontainers moved to the Logistics division (to support new category icons) diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Assets/NUKES.png b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Assets/NUKES.png deleted file mode 100644 index d6814f8..0000000 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Assets/NUKES.png and /dev/null differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version index 0c6040e..c7335ae 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version @@ -10,7 +10,7 @@ "VERSION":{ "MAJOR":0, "MINOR":3, - "PATCH":0, + "PATCH":1, "BUILD":0 }, "KSP_VERSION":{