Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e1c9baddaf8d
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6f9dc87d7b1c
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 29, 2019

  1. Remove 1.3.1 and add 1.7.2.

    pleroy committed Jun 29, 2019
    Copy the full SHA
    dac33d4 View commit details
  2. Missing changes.

    pleroy committed Jun 29, 2019
    Copy the full SHA
    5fd2498 View commit details
  3. Merge branch 'master' into 131

    pleroy committed Jun 29, 2019
    Copy the full SHA
    92296e7 View commit details
  4. Merge pull request #2229 from pleroy/131

    Remove 1.3.1 and add 1.7.2
    pleroy authored Jun 29, 2019
    Copy the full SHA
    6f9dc87 View commit details
Showing with 14 additions and 78 deletions.
  1. +0 −43 Principia.sln
  2. +4 −14 ksp_plugin_adapter/ksp_plugin_adapter.cs
  3. +10 −21 ksp_plugin_adapter/ksp_plugin_adapter.csproj
43 changes: 0 additions & 43 deletions Principia.sln
Original file line number Diff line number Diff line change
@@ -147,174 +147,131 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Release KSP 1.3.1|x64 = Release KSP 1.3.1|x64
Release_LLVM|x64 = Release_LLVM|x64
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{273987F9-5E73-43E6-868E-E9D3C137F01A}.Debug|x64.ActiveCfg = Debug|x64
{273987F9-5E73-43E6-868E-E9D3C137F01A}.Debug|x64.Build.0 = Debug|x64
{273987F9-5E73-43E6-868E-E9D3C137F01A}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{273987F9-5E73-43E6-868E-E9D3C137F01A}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{273987F9-5E73-43E6-868E-E9D3C137F01A}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{273987F9-5E73-43E6-868E-E9D3C137F01A}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{273987F9-5E73-43E6-868E-E9D3C137F01A}.Release|x64.ActiveCfg = Release|x64
{273987F9-5E73-43E6-868E-E9D3C137F01A}.Release|x64.Build.0 = Release|x64
{0FD08CDF-228C-48C6-8690-CF0A72CF6C69}.Debug|x64.ActiveCfg = Debug|x64
{0FD08CDF-228C-48C6-8690-CF0A72CF6C69}.Debug|x64.Build.0 = Debug|x64
{0FD08CDF-228C-48C6-8690-CF0A72CF6C69}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{0FD08CDF-228C-48C6-8690-CF0A72CF6C69}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{0FD08CDF-228C-48C6-8690-CF0A72CF6C69}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{0FD08CDF-228C-48C6-8690-CF0A72CF6C69}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{0FD08CDF-228C-48C6-8690-CF0A72CF6C69}.Release|x64.ActiveCfg = Release|x64
{0FD08CDF-228C-48C6-8690-CF0A72CF6C69}.Release|x64.Build.0 = Release|x64
{2E28828E-8364-4962-A9FF-C20A72EB884C}.Debug|x64.ActiveCfg = Debug|x64
{2E28828E-8364-4962-A9FF-C20A72EB884C}.Debug|x64.Build.0 = Debug|x64
{2E28828E-8364-4962-A9FF-C20A72EB884C}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{2E28828E-8364-4962-A9FF-C20A72EB884C}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{2E28828E-8364-4962-A9FF-C20A72EB884C}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{2E28828E-8364-4962-A9FF-C20A72EB884C}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{2E28828E-8364-4962-A9FF-C20A72EB884C}.Release|x64.ActiveCfg = Release|x64
{2E28828E-8364-4962-A9FF-C20A72EB884C}.Release|x64.Build.0 = Release|x64
{86AFF67D-38CD-487E-B4C1-B93984A9ED0D}.Debug|x64.ActiveCfg = Debug|x64
{86AFF67D-38CD-487E-B4C1-B93984A9ED0D}.Debug|x64.Build.0 = Debug|x64
{86AFF67D-38CD-487E-B4C1-B93984A9ED0D}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{86AFF67D-38CD-487E-B4C1-B93984A9ED0D}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{86AFF67D-38CD-487E-B4C1-B93984A9ED0D}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{86AFF67D-38CD-487E-B4C1-B93984A9ED0D}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{86AFF67D-38CD-487E-B4C1-B93984A9ED0D}.Release|x64.ActiveCfg = Release|x64
{86AFF67D-38CD-487E-B4C1-B93984A9ED0D}.Release|x64.Build.0 = Release|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Debug|x64.ActiveCfg = Debug|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Debug|x64.Build.0 = Debug|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release|x64.ActiveCfg = Release|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release|x64.Build.0 = Release|x64
{41332E9A-729C-45C4-BDE1-A567608DADF2}.Debug|x64.ActiveCfg = Debug|x64
{41332E9A-729C-45C4-BDE1-A567608DADF2}.Debug|x64.Build.0 = Debug|x64
{41332E9A-729C-45C4-BDE1-A567608DADF2}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{41332E9A-729C-45C4-BDE1-A567608DADF2}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{41332E9A-729C-45C4-BDE1-A567608DADF2}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{41332E9A-729C-45C4-BDE1-A567608DADF2}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{41332E9A-729C-45C4-BDE1-A567608DADF2}.Release|x64.ActiveCfg = Release|x64
{41332E9A-729C-45C4-BDE1-A567608DADF2}.Release|x64.Build.0 = Release|x64
{E75B3F05-D64F-4AFE-9493-2F94A9B37510}.Debug|x64.ActiveCfg = Debug|Any CPU
{E75B3F05-D64F-4AFE-9493-2F94A9B37510}.Debug|x64.Build.0 = Debug|Any CPU
{E75B3F05-D64F-4AFE-9493-2F94A9B37510}.Release KSP 1.3.1|x64.ActiveCfg = Release KSP 1.3.1|Any CPU
{E75B3F05-D64F-4AFE-9493-2F94A9B37510}.Release KSP 1.3.1|x64.Build.0 = Release KSP 1.3.1|Any CPU
{E75B3F05-D64F-4AFE-9493-2F94A9B37510}.Release_LLVM|x64.ActiveCfg = Release|Any CPU
{E75B3F05-D64F-4AFE-9493-2F94A9B37510}.Release_LLVM|x64.Build.0 = Release|Any CPU
{E75B3F05-D64F-4AFE-9493-2F94A9B37510}.Release|x64.ActiveCfg = Release|Any CPU
{E75B3F05-D64F-4AFE-9493-2F94A9B37510}.Release|x64.Build.0 = Release|Any CPU
{A3F94607-2666-408F-AF98-0E47D61C98BB}.Debug|x64.ActiveCfg = Debug|x64
{A3F94607-2666-408F-AF98-0E47D61C98BB}.Debug|x64.Build.0 = Debug|x64
{A3F94607-2666-408F-AF98-0E47D61C98BB}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{A3F94607-2666-408F-AF98-0E47D61C98BB}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{A3F94607-2666-408F-AF98-0E47D61C98BB}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{A3F94607-2666-408F-AF98-0E47D61C98BB}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{A3F94607-2666-408F-AF98-0E47D61C98BB}.Release|x64.ActiveCfg = Release|x64
{A3F94607-2666-408F-AF98-0E47D61C98BB}.Release|x64.Build.0 = Release|x64
{A942ADF0-62F4-435C-85B2-934D5B666DB8}.Debug|x64.ActiveCfg = Debug|x64
{A942ADF0-62F4-435C-85B2-934D5B666DB8}.Debug|x64.Build.0 = Debug|x64
{A942ADF0-62F4-435C-85B2-934D5B666DB8}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{A942ADF0-62F4-435C-85B2-934D5B666DB8}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{A942ADF0-62F4-435C-85B2-934D5B666DB8}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{A942ADF0-62F4-435C-85B2-934D5B666DB8}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{A942ADF0-62F4-435C-85B2-934D5B666DB8}.Release|x64.ActiveCfg = Release|x64
{A942ADF0-62F4-435C-85B2-934D5B666DB8}.Release|x64.Build.0 = Release|x64
{7E7CC89A-FC65-409C-A975-9C3A6A50786B}.Debug|x64.ActiveCfg = Debug|x64
{7E7CC89A-FC65-409C-A975-9C3A6A50786B}.Debug|x64.Build.0 = Debug|x64
{7E7CC89A-FC65-409C-A975-9C3A6A50786B}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{7E7CC89A-FC65-409C-A975-9C3A6A50786B}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{7E7CC89A-FC65-409C-A975-9C3A6A50786B}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{7E7CC89A-FC65-409C-A975-9C3A6A50786B}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{7E7CC89A-FC65-409C-A975-9C3A6A50786B}.Release|x64.ActiveCfg = Release|x64
{7E7CC89A-FC65-409C-A975-9C3A6A50786B}.Release|x64.Build.0 = Release|x64
{06E78A3D-AAA0-4CD9-8F23-B5BBBBE6F14F}.Debug|x64.ActiveCfg = Debug|Any CPU
{06E78A3D-AAA0-4CD9-8F23-B5BBBBE6F14F}.Debug|x64.Build.0 = Debug|Any CPU
{06E78A3D-AAA0-4CD9-8F23-B5BBBBE6F14F}.Release KSP 1.3.1|x64.ActiveCfg = Release|Any CPU
{06E78A3D-AAA0-4CD9-8F23-B5BBBBE6F14F}.Release KSP 1.3.1|x64.Build.0 = Release|Any CPU
{06E78A3D-AAA0-4CD9-8F23-B5BBBBE6F14F}.Release_LLVM|x64.ActiveCfg = Release|Any CPU
{06E78A3D-AAA0-4CD9-8F23-B5BBBBE6F14F}.Release_LLVM|x64.Build.0 = Release|Any CPU
{06E78A3D-AAA0-4CD9-8F23-B5BBBBE6F14F}.Release|x64.ActiveCfg = Release|Any CPU
{06E78A3D-AAA0-4CD9-8F23-B5BBBBE6F14F}.Release|x64.Build.0 = Release|Any CPU
{5C482C18-BBAE-484D-A211-A25C86370061}.Debug|x64.ActiveCfg = Debug|x64
{5C482C18-BBAE-484D-A211-A25C86370061}.Debug|x64.Build.0 = Debug|x64
{5C482C18-BBAE-484D-A211-A25C86370061}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{5C482C18-BBAE-484D-A211-A25C86370061}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{5C482C18-BBAE-484D-A211-A25C86370061}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{5C482C18-BBAE-484D-A211-A25C86370061}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{5C482C18-BBAE-484D-A211-A25C86370061}.Release|x64.ActiveCfg = Release|x64
{5C482C18-BBAE-484D-A211-A25C86370061}.Release|x64.Build.0 = Release|x64
{83A31DA7-3F62-464D-9F6B-09CCE07A865A}.Debug|x64.ActiveCfg = Debug|x64
{83A31DA7-3F62-464D-9F6B-09CCE07A865A}.Debug|x64.Build.0 = Debug|x64
{83A31DA7-3F62-464D-9F6B-09CCE07A865A}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{83A31DA7-3F62-464D-9F6B-09CCE07A865A}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{83A31DA7-3F62-464D-9F6B-09CCE07A865A}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{83A31DA7-3F62-464D-9F6B-09CCE07A865A}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{83A31DA7-3F62-464D-9F6B-09CCE07A865A}.Release|x64.ActiveCfg = Release|x64
{83A31DA7-3F62-464D-9F6B-09CCE07A865A}.Release|x64.Build.0 = Release|x64
{0AC374A7-36CD-40FC-B831-112389B6D9ED}.Debug|x64.ActiveCfg = Debug|Any CPU
{0AC374A7-36CD-40FC-B831-112389B6D9ED}.Debug|x64.Build.0 = Debug|Any CPU
{0AC374A7-36CD-40FC-B831-112389B6D9ED}.Release KSP 1.3.1|x64.ActiveCfg = Release|Any CPU
{0AC374A7-36CD-40FC-B831-112389B6D9ED}.Release KSP 1.3.1|x64.Build.0 = Release|Any CPU
{0AC374A7-36CD-40FC-B831-112389B6D9ED}.Release_LLVM|x64.ActiveCfg = Release|Any CPU
{0AC374A7-36CD-40FC-B831-112389B6D9ED}.Release_LLVM|x64.Build.0 = Release|Any CPU
{0AC374A7-36CD-40FC-B831-112389B6D9ED}.Release|x64.ActiveCfg = Release|Any CPU
{0AC374A7-36CD-40FC-B831-112389B6D9ED}.Release|x64.Build.0 = Release|Any CPU
{9E0AE155-47B1-4090-AF00-038AF87A876D}.Debug|x64.ActiveCfg = Debug|x64
{9E0AE155-47B1-4090-AF00-038AF87A876D}.Debug|x64.Build.0 = Debug|x64
{9E0AE155-47B1-4090-AF00-038AF87A876D}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{9E0AE155-47B1-4090-AF00-038AF87A876D}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{9E0AE155-47B1-4090-AF00-038AF87A876D}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{9E0AE155-47B1-4090-AF00-038AF87A876D}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{9E0AE155-47B1-4090-AF00-038AF87A876D}.Release|x64.ActiveCfg = Release|x64
{9E0AE155-47B1-4090-AF00-038AF87A876D}.Release|x64.Build.0 = Release|x64
{5498EE37-1A80-4DA8-8D81-01892C4C8EEB}.Debug|x64.ActiveCfg = Debug|Any CPU
{5498EE37-1A80-4DA8-8D81-01892C4C8EEB}.Debug|x64.Build.0 = Debug|Any CPU
{5498EE37-1A80-4DA8-8D81-01892C4C8EEB}.Release KSP 1.3.1|x64.ActiveCfg = Release|Any CPU
{5498EE37-1A80-4DA8-8D81-01892C4C8EEB}.Release KSP 1.3.1|x64.Build.0 = Release|Any CPU
{5498EE37-1A80-4DA8-8D81-01892C4C8EEB}.Release_LLVM|x64.ActiveCfg = Release|Any CPU
{5498EE37-1A80-4DA8-8D81-01892C4C8EEB}.Release_LLVM|x64.Build.0 = Release|Any CPU
{5498EE37-1A80-4DA8-8D81-01892C4C8EEB}.Release|x64.ActiveCfg = Release|Any CPU
{5498EE37-1A80-4DA8-8D81-01892C4C8EEB}.Release|x64.Build.0 = Release|Any CPU
{5EEA5210-0FA9-4B44-8466-C40B22D24E8E}.Debug|x64.ActiveCfg = Debug|x64
{5EEA5210-0FA9-4B44-8466-C40B22D24E8E}.Debug|x64.Build.0 = Debug|x64
{5EEA5210-0FA9-4B44-8466-C40B22D24E8E}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{5EEA5210-0FA9-4B44-8466-C40B22D24E8E}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{5EEA5210-0FA9-4B44-8466-C40B22D24E8E}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{5EEA5210-0FA9-4B44-8466-C40B22D24E8E}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{5EEA5210-0FA9-4B44-8466-C40B22D24E8E}.Release|x64.ActiveCfg = Release|x64
{5EEA5210-0FA9-4B44-8466-C40B22D24E8E}.Release|x64.Build.0 = Release|x64
{972E4E09-3B2C-4A23-9338-74D97D589207}.Debug|x64.ActiveCfg = Debug|x64
{972E4E09-3B2C-4A23-9338-74D97D589207}.Debug|x64.Build.0 = Debug|x64
{972E4E09-3B2C-4A23-9338-74D97D589207}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{972E4E09-3B2C-4A23-9338-74D97D589207}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{972E4E09-3B2C-4A23-9338-74D97D589207}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{972E4E09-3B2C-4A23-9338-74D97D589207}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{972E4E09-3B2C-4A23-9338-74D97D589207}.Release|x64.ActiveCfg = Release|x64
{972E4E09-3B2C-4A23-9338-74D97D589207}.Release|x64.Build.0 = Release|x64
{873680B3-2406-4A30-9EE7-569E9B9DA661}.Debug|x64.ActiveCfg = Debug|x64
{873680B3-2406-4A30-9EE7-569E9B9DA661}.Debug|x64.Build.0 = Debug|x64
{873680B3-2406-4A30-9EE7-569E9B9DA661}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{873680B3-2406-4A30-9EE7-569E9B9DA661}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{873680B3-2406-4A30-9EE7-569E9B9DA661}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{873680B3-2406-4A30-9EE7-569E9B9DA661}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{873680B3-2406-4A30-9EE7-569E9B9DA661}.Release|x64.ActiveCfg = Release|x64
{873680B3-2406-4A30-9EE7-569E9B9DA661}.Release|x64.Build.0 = Release|x64
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Debug|x64.ActiveCfg = Debug|Any CPU
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Debug|x64.Build.0 = Debug|Any CPU
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Release KSP 1.3.1|x64.ActiveCfg = Release|Any CPU
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Release KSP 1.3.1|x64.Build.0 = Release|Any CPU
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Release_LLVM|x64.ActiveCfg = Release|Any CPU
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Release_LLVM|x64.Build.0 = Release|Any CPU
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Release|x64.ActiveCfg = Release|Any CPU
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Release|x64.Build.0 = Release|Any CPU
{3882467C-89D7-4DAE-9730-BB2E610F05AD}.Debug|x64.ActiveCfg = Debug|x64
{3882467C-89D7-4DAE-9730-BB2E610F05AD}.Debug|x64.Build.0 = Debug|x64
{3882467C-89D7-4DAE-9730-BB2E610F05AD}.Release KSP 1.3.1|x64.ActiveCfg = Release|x64
{3882467C-89D7-4DAE-9730-BB2E610F05AD}.Release KSP 1.3.1|x64.Build.0 = Release|x64
{3882467C-89D7-4DAE-9730-BB2E610F05AD}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{3882467C-89D7-4DAE-9730-BB2E610F05AD}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{3882467C-89D7-4DAE-9730-BB2E610F05AD}.Release|x64.ActiveCfg = Release|x64
18 changes: 4 additions & 14 deletions ksp_plugin_adapter/ksp_plugin_adapter.cs
Original file line number Diff line number Diff line change
@@ -192,20 +192,13 @@ private KSP.UI.Screens.SpaceTracking space_tracking {
"The Principia DLL failed to load.\n" + load_error;
bad_installation_dialog_.Show();
}
#if KSP_VERSION_1_3_1
if (Versioning.version_major != 1 ||
Versioning.version_minor != 3 ||
Versioning.Revision != 1) {
string expected_version = "1.3.1";
#elif KSP_VERSION_1_7_0
#if KSP_VERSION_1_7_2
if (!(Versioning.version_major == 1 &&
(Versioning.version_minor == 4 &&
(Versioning.Revision >= 1 && Versioning.Revision <= 5)) ||
(Versioning.version_minor == 5 && Versioning.Revision == 1) ||
(Versioning.version_minor == 6 && Versioning.Revision == 1) ||
(Versioning.version_minor == 7 && Versioning.Revision == 0))) {
(Versioning.version_minor == 7 && Versioning.Revision <= 2))) {
string expected_version =
"1.7.0, 1.6.1, 1.5.1, 1.4.5, 1.4.4, 1.4.3, 1.4.2, and 1.4.1";
"1.7.2, 1.7.1, 1.7.0, 1.6.1, and 1.5.1";
#endif
string message = $@"Unexpected KSP version {Versioning.version_major}.{
Versioning.version_minor}.{Versioning.Revision}; this build targets {
@@ -460,12 +453,9 @@ private bool LoadTextureIfExists(out UnityEngine.Texture texture,
path;
if (File.Exists(full_path)) {
var texture2d = new UnityEngine.Texture2D(2, 2);
#if KSP_VERSION_1_7_0
#if KSP_VERSION_1_7_2
bool success = UnityEngine.ImageConversion.LoadImage(
texture2d, File.ReadAllBytes(full_path));
#elif KSP_VERSION_1_3_1
bool success = texture2d.LoadImage(
File.ReadAllBytes(full_path));
#endif
if (!success) {
Log.Fatal("Failed to load texture " + full_path);
31 changes: 10 additions & 21 deletions ksp_plugin_adapter/ksp_plugin_adapter.csproj
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\Debug\GameData\Principia\</OutputPath>
<DefineConstants>TRACE;DEBUG;KSP_VERSION_1_7_0</DefineConstants>
<DefineConstants>TRACE;DEBUG;KSP_VERSION_1_7_2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -27,55 +27,44 @@
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Release\GameData\Principia\</OutputPath>
<DefineConstants>TRACE;KSP_VERSION_1_7_0</DefineConstants>
<DefineConstants>TRACE;KSP_VERSION_1_7_2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DebugSymbols>true</DebugSymbols>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release KSP 1.3.1|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\Release\1.3.1 Compatibility\GameData\Principia\</OutputPath>
<DefineConstants>TRACE;KSP_VERSION_1_3_1</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'Debug'">
<Reference Include="Assembly-CSharp">
<HintPath>..\..\KSP Assemblies\1.7.0\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.7.2\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="UnityEngine">
<HintPath>..\..\KSP Assemblies\1.7.0\UnityEngine.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.7.2\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule" Condition="'$(OS)' == 'Unix'">
<HintPath>..\..\KSP Assemblies\1.7.0\UnityEngine.CoreModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.7.2\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.ImageConversionModule" Condition="'$(OS)' == 'Unix'">
<HintPath>..\..\KSP Assemblies\1.7.0\UnityEngine.ImageConversionModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.7.2\UnityEngine.ImageConversionModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule" Condition="'$(OS)' == 'Unix'">
<HintPath>..\..\KSP Assemblies\1.7.0\UnityEngine.IMGUIModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.7.2\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.PhysicsModule" Condition="'$(OS)' == 'Unix'">
<HintPath>..\..\KSP Assemblies\1.7.0\UnityEngine.PhysicsModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.7.2\UnityEngine.PhysicsModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.TextRenderingModule" Condition="'$(OS)' == 'Unix'">
<HintPath>..\..\KSP Assemblies\1.7.0\UnityEngine.TextRenderingModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.7.2\UnityEngine.TextRenderingModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>..\..\KSP Assemblies\1.7.0\UnityEngine.UI.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.7.2\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>