Resolve changelog conflicts

# Conflicts:
#	Distribution/Restock/changelog.txt
#	Distribution/RestockPlus/changelog.txt
pull/850/head
Chris Adderley 4 years ago
commit f1d01c3a60

@ -51,6 +51,9 @@ v1.1.0
- Fixed the centering of the Rovemate probe core
- Fixed some smoothing groups on the white variant of the Rockomax X-32 Fuel Tank
- Fixed an issue where radiators would freak out when destroyed.
- Fixed localization tag for Skiff's Tankbutt variant
- Added compatibility patch for Modular Launch Pads to allow for RS & RS+ 1.875m Engine Plate Boattail variant to align with MLP's Titan II Launch Pad base.
v1.0.3
-----

@ -53,7 +53,7 @@ Localization
#LOC_RestockPlus_restock-engine-ursa_tags = fueltank ?lfo liquid oxidizer propellant rocket (ursa restock
#LOC_RestockPlus_restock-engine-caravel_title = UR-2 'Caravel' Liquid Fuel Engine
#LOC_RestockPlus_restock-engine-caravel_description = The caravel easily sails into the winds of interplanetary space with average efficiency and thrust.
#LOC_RestockPlus_restock-engine-caravel_description = The Caravel easily sails into the winds of interplanetary space with average efficiency and thrust.
#LOC_RestockPlus_restock-engine-caravel_tags = fueltank ?lfo liquid oxidizer propellant rocket (caravel paperclip restock
#LOC_RestockPlus_restock-engine-schnauzer_title = UR-137 'Schnauzer' Liquid Fuel Engine
@ -234,23 +234,23 @@ Localization
// 5m
#LOC_RestockPlus_restock-fuel-tank-5-1_title = Kerbodyne SIV-512K Liquid Fuel Tank
#LOC_RestockPlus_restock-fuel-tank-5-1_description =
#LOC_RestockPlus_restock-fuel-tank-5-1_description = The initial run of SIV Liquid Fuel Tanks were manufactured when the Lead Engineer sent the schematics to fabrication at a mis-labeled scale. The results came back much bigger than the KSC employees expected and thus a new range of super-sized rockets was born. One of Kerbodyne's biggest ever tanks, its a monster.
#LOC_RestockPlus_restock-fuel-tank-5-1_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank
#LOC_RestockPlus_restock-fuel-tank-5-2_title = Kerbodyne SIV-256K Liquid Fuel Tank
#LOC_RestockPlus_restock-fuel-tank-5-2_description =
#LOC_RestockPlus_restock-fuel-tank-5-2_description = The initial run of SIV Liquid Fuel Tanks were manufactured when the Lead Engineer sent the schematics to fabrication at a mis-labeled scale. The results came back much bigger than the KSC employees expected and thus a new range of super-sized rockets was born. This large sized tank will keep you running for a long while.
#LOC_RestockPlus_restock-fuel-tank-5-2_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank
#LOC_RestockPlus_restock-fuel-tank-5-3_title = Kerbodyne SIV-128K Liquid Fuel Tank
#LOC_RestockPlus_restock-fuel-tank-5-3_description =
#LOC_RestockPlus_restock-fuel-tank-5-3_description = The initial run of SIV Liquid Fuel Tanks were manufactured when the Lead Engineer sent the schematics to fabrication at a mis-labeled scale. The results came back much bigger than the KSC employees expected and thus a new range of super-sized rockets was born. This medium sized tank can get you places.
#LOC_RestockPlus_restock-fuel-tank-5-3_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank
#LOC_RestockPlus_restock-fuel-tank-5-4_title = Kerbodyne SIV-64K Liquid Fuel Tank
#LOC_RestockPlus_restock-fuel-tank-5-4_description =
#LOC_RestockPlus_restock-fuel-tank-5-4_description = The initial run of SIV Liquid Fuel Tanks were manufactured when the Lead Engineer sent the schematics to fabrication at a mis-labeled scale. The results came back much bigger than the KSC employees expected and thus a new range of super-sized rockets was born. This smaller tank still holds a lot of juice.
#LOC_RestockPlus_restock-fuel-tank-5-4_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank
#LOC_RestockPlus_restock-fuel-tank-adapter-375-5-1_title = Kerbodyne SAIV Liquid Fuel Tank Adapter
#LOC_RestockPlus_restock-fuel-tank-adapter-375-5-1_description =
#LOC_RestockPlus_restock-fuel-tank-adapter-375-5-1_description = Following Kerbodyne's effort to manufacture enormously sized tanks an adapter was required to retrofit them back to a more commonly utilized size.
#LOC_RestockPlus_restock-fuel-tank-adapter-375-5-1_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank adapter
#LOC_RestockPlus_restock-fuel-tank-saturn-engine-1_title = Kerbodyne SIV Fuelled Engine Adapter
#LOC_RestockPlus_restock-fuel-tank-saturn-engine-1_description =
#LOC_RestockPlus_restock-fuel-tank-saturn-engine-1_description = A Kerbodyne Design Engineer recently heard of the word 'Quincunx' and upon looking up its definition realized that it would be the perfect shape to house five engines underneath the huge SIV range of Liquid Fuel Tanks.
#LOC_RestockPlus_restock-fuel-tank-saturn-engine-1_tags = restock rocket fuel liquid oxidizer propellant fueltank ?lfo tank saturn enormous massive gigantic giant cross feed 5.0
// THERMAL
@ -329,12 +329,12 @@ Localization
#LOC_RestockPlus_restock-engineplate-375-1_tags = restock engine plate shroud boattail explo break decouple seperat split pancake 375 3.75 Zenit
// 5m
#LOC_RestockPlus_restock-decoupler-5-1_title = TD-500 Decoupler
#LOC_RestockPlus_restock-decoupler-5-1_description =
#LOC_RestockPlus_restock-decoupler-5-1_title = TD-50 Decoupler
#LOC_RestockPlus_restock-decoupler-5-1_description = An enormous decoupler that acts as a specialized tool for ripping your rocket stack apart.
#LOC_RestockPlus_restock-decoupler-5-1_tags = restock break decouple explo separat split
#LOC_RestockPlus_restock-separator-5-1_title = TS-500 Separator
#LOC_RestockPlus_restock-separator-5-1_description = This stack separator is a medium sized separator, much like the other separators. Unlike Decouplers, Separators will eject anything connected to themselves. This is good, as it removes the need to worry about which side needs to be pointed away from face. Try to not look at it too much though.
#LOC_RestockPlus_restock-separator-5-1_title = TS-50 Separator
#LOC_RestockPlus_restock-separator-5-1_description = This stack separator is an enormous separator that has enough ejection power to inject a decent amount of impulse into objects being disconnected on either side with great gusto. Do not be near on EVA whilst staging!
#LOC_RestockPlus_restock-separator-5-1_tags = restock break decouple separat split stag
#LOC_RestockPlus_restock-engineplate-5-1_title = EP-50 Engine Plate

@ -474,7 +474,7 @@ PART
name = Short
mass = -0.02
cost = 0
displayName = #autoLOC_8005067 //#autoLOC_8005067 = Short
displayName = #LOC_Restock_variant-tube-length-short // Short
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -509,7 +509,7 @@ PART
name = Medium-Short
mass = -0.015
cost = 0
displayName = #autoLOC_8005063 //#autoLOC_8005063 = Medium-Short
displayName = #LOC_Restock_variant-tube-length-med-short // Medium-Short
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -544,7 +544,7 @@ PART
name = Medium
mass = -0.01
cost = 0
displayName = #autoLOC_8005064 //#autoLOC_8005064 = Medium
displayName = #LOC_Restock_variant-tube-length-med // Medium
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -579,7 +579,7 @@ PART
name = Medium-Long
mass = -0.005
cost = 0
displayName = #autoLOC_8005065 //#autoLOC_8005065 = Medium-Long
displayName = #LOC_Restock_variant-tube-length-med-long // Medium-Long
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -614,7 +614,7 @@ PART
name = Long
mass = 0
cost = 0
displayName = #autoLOC_8005066 //#autoLOC_8005066 = Long
displayName = #LOC_Restock_variant-tube-length-long // Long
primaryColor = #3a562a
secondaryColor = #999999
themeName = White

@ -442,7 +442,7 @@ PART
name = Short
mass = -0.02
cost = 0
displayName = #autoLOC_8005067 //#autoLOC_8005067 = Short
displayName = #LOC_Restock_variant-tube-length-short // Short
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -476,7 +476,7 @@ PART
name = Medium-Short
mass = -0.015
cost = 0
displayName = #autoLOC_8005063 //#autoLOC_8005063 = Medium-Short
displayName = #LOC_Restock_variant-tube-length-med-short // Medium-Short
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -510,7 +510,7 @@ PART
name = Medium
mass = -0.01
cost = 0
displayName = #autoLOC_8005064 //#autoLOC_8005064 = Medium
displayName = #LOC_Restock_variant-tube-length-med // Medium
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -544,7 +544,7 @@ PART
name = Medium-Long
mass = -0.005
cost = 0
displayName = #autoLOC_8005065 //#autoLOC_8005065 = Medium-Long
displayName = #LOC_Restock_variant-tube-length-med-long // Medium-Long
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -578,7 +578,7 @@ PART
name = Long
mass = 0
cost = 0
displayName = #autoLOC_8005066 //#autoLOC_8005066 = Long
displayName = #LOC_Restock_variant-tube-length-long // Long
primaryColor = #3a562a
secondaryColor = #999999
themeName = White

@ -518,7 +518,7 @@ PART
name = Short
mass = -0.04
cost = 0
displayName = #autoLOC_8005067 //#autoLOC_8005067 = Short
displayName = #LOC_Restock_variant-tube-length-short // Short
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -554,7 +554,7 @@ PART
name = Medium-Short
mass = -0.03
cost = 0
displayName = #autoLOC_8005063 //#autoLOC_8005063 = Medium-Short
displayName = #LOC_Restock_variant-tube-length-med-short // Medium-Short
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -590,7 +590,7 @@ PART
name = Medium
mass = -0.02
cost = 0
displayName = #autoLOC_8005064 //#autoLOC_8005064 = Medium
displayName = #LOC_Restock_variant-tube-length-med // Medium
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -626,7 +626,7 @@ PART
name = Medium-Long
mass = -0.01
cost = 0
displayName = #autoLOC_8005065 //#autoLOC_8005065 = Medium-Long
displayName = #LOC_Restock_variant-tube-length-med-long // Medium-Long
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -662,7 +662,7 @@ PART
name = Long
mass = 0
cost = 0
displayName = #autoLOC_8005066 //#autoLOC_8005066 = Long
displayName = #LOC_Restock_variant-tube-length-long // Long
primaryColor = #3a562a
secondaryColor = #999999
themeName = White

@ -442,7 +442,7 @@ PART
name = Short
mass = -0.1
cost = 0
displayName = #autoLOC_8005067 //#autoLOC_8005067 = Short
displayName = #LOC_Restock_variant-tube-length-short // Short
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -476,7 +476,7 @@ PART
name = Medium-Short
mass = -0.075
cost = 0
displayName = #autoLOC_8005063 //#autoLOC_8005063 = Medium-Short
displayName = #LOC_Restock_variant-tube-length-med-short // Medium-Short
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -510,7 +510,7 @@ PART
name = Medium
mass = -0.05
cost = 0
displayName = #autoLOC_8005064 //#autoLOC_8005064 = Medium
displayName = #LOC_Restock_variant-tube-length-med // Medium
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -544,7 +544,7 @@ PART
name = Medium-Long
mass = -0.025
cost = 0
displayName = #autoLOC_8005065 //#autoLOC_8005065 = Medium-Long
displayName = #LOC_Restock_variant-tube-length-med-long // Medium-Long
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -578,7 +578,7 @@ PART
name = Long
mass = 0
cost = 0
displayName = #autoLOC_8005066 //#autoLOC_8005066 = Long
displayName = #LOC_Restock_variant-tube-length-long // Long
primaryColor = #3a562a
secondaryColor = #999999
themeName = White

@ -442,7 +442,7 @@ PART
name = Short
mass = -0.15
cost = 0
displayName = #autoLOC_8005067 //#autoLOC_8005067 = Short
displayName = #LOC_Restock_variant-tube-length-short // Short
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -476,7 +476,7 @@ PART
name = Medium-Short
mass = -0.1125
cost = 0
displayName = #autoLOC_8005063 //#autoLOC_8005063 = Medium-Short
displayName = #LOC_Restock_variant-tube-length-med-short // Medium-Short
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -510,7 +510,7 @@ PART
name = Medium
mass = -0.075
cost = 0
displayName = #autoLOC_8005064 //#autoLOC_8005064 = Medium
displayName = #LOC_Restock_variant-tube-length-med // Medium
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -544,7 +544,7 @@ PART
name = Medium-Long
mass = -0.0375
cost = 0
displayName = #autoLOC_8005065 //#autoLOC_8005065 = Medium-Long
displayName = #LOC_Restock_variant-tube-length-med-long // Medium-Long
primaryColor = #3a562a
secondaryColor = #999999
themeName = White
@ -578,7 +578,7 @@ PART
name = Long
mass = 0
cost = 0
displayName = #autoLOC_8005066 //#autoLOC_8005066 = Long
displayName = #LOC_Restock_variant-tube-length-long // Long
primaryColor = #3a562a
secondaryColor = #999999
themeName = White

@ -145,7 +145,7 @@ PART
name = Medium
mass = 0.325
cost = 791
displayName = #LOC_Restock_variant-tube-length-med-short
displayName = #LOC_Restock_variant-tube-length-med
primaryColor = #3a562a
secondaryColor = #999999
sizeGroup = GroupB

@ -145,7 +145,7 @@ PART
name = Medium
mass = 1.125
cost = 2328
displayName = #LOC_Restock_variant-tube-length-med-short
displayName = #LOC_Restock_variant-tube-length-med
primaryColor = #3a562a
secondaryColor = #999999
sizeGroup = GroupB

@ -145,7 +145,7 @@ PART
name = Medium
mass = 2.058
cost = 3864
displayName = #LOC_Restock_variant-tube-length-med-short
displayName = #LOC_Restock_variant-tube-length-med
primaryColor = #3a562a
secondaryColor = #999999
sizeGroup = GroupB

@ -39,7 +39,9 @@ v1.1.0
- Adjusted configs for Caravel, Schnauzer to account for a bug Squad fixed in 1.9
- Fixed SkinnedMeshRenderer scaling for Caravel, Schnauzer (#800)
- Fixed an issue with the thrust transforms on the Cherenkov nuclear engine (#804)
- Fixed localization tag for Caravel's Tankbutt variant
- Reduced Caravel vacuum Isp to 265/320s from 285/340s, increased mass to 2.0t from 1.6t
v1.0.3
-----
- Updated ModuleManager distribution to 4.1.3

Loading…
Cancel
Save