search

FractalUK / KSPInterstellar

KSP Instellar Mod for Kerbal Space Program
115 stars 69 forks source link

development merge #34

Closed confusingbits closed 10 years ago

confusingbits commented 10 years ago

I think I finally learned how to merge from upstream. This should resolve the conflicts.

confusingbits commented 10 years ago

Sorry I'm such a idiot.

here's a repost of my changes: (There is already an update changelog.)

Sorry for the mess, but everything works. Here's a list of changes.

Fixed data collection on magnetometer Replaced non-functional model for .625m arcjet thruster to rescaled 1.25m model (temp fix, fractaluk has a fixed version for the next big update) Improved reactor, radiator, and generator tooltips Added water and lithium resource maps to kerbin Added (currently unused) water and lithium resource assets Added atmospheric intake functionality to atmospheric scoops Added full initial electric charge to generators to aid in fusion reactor activation Charging is now disabled by default on the alcubierre drives Added electric charge to computer core, and increased torque to 5/5/5 Added a more detailed tooltip description for the computer core Added details about power transmission to array and reciever to tooltip descriptions Added details about generator attachment and modes to tooltip descriptions Added detail to the GC/MS tooltip to indicate that it is also a science experiment Added details to the GRS description to indicate that it is useful for detecting concentrations of uranium and thorium Added a more detailed description of the science labs capabilities Added a clarification of the crygenic helium tank, and its use with the IR telescope Added details about the magnetometer is also a science experiment to the tooltip desciption. Added details to the helium-3 container to clarify that it does not store helium, and is used as a reator fuel. Added tooltip to antimatter containers to indicate maximum capacity. Remove old hex can part files that were causing loading errors. Removed old methane tank part file that was causing loading errors. The large xenon tank now actually contains xenon. The UN tank now uses the correct model. Charging is now disabled by default for antimatter containers. Renamed aim reactor module to resolve a display issue caused by the previously very long class name. Corrected the names of the AIM reactors in the config.