diff --git a/Distribution/GameData/Endurance/Assets/habitatInflatable.mu b/Distribution/GameData/Endurance/Assets/habitatInflatable.mu index 2766b9b..8ee2891 100644 Binary files a/Distribution/GameData/Endurance/Assets/habitatInflatable.mu and b/Distribution/GameData/Endurance/Assets/habitatInflatable.mu differ diff --git a/Distribution/GameData/Endurance/Changelog.txt b/Distribution/GameData/Endurance/Changelog.txt index 71889da..4c9a47b 100644 --- a/Distribution/GameData/Endurance/Changelog.txt +++ b/Distribution/GameData/Endurance/Changelog.txt @@ -1,3 +1,6 @@ +V1.7 +Re-Compile for KSP 1.4.1 +Fixed hatch blocked on the inflatable habitat part. V1.6 Re-Compile for KSP 1.3.1 V1.5 diff --git a/Distribution/GameData/Endurance/Endurance.version b/Distribution/GameData/Endurance/Endurance.version index fc3264e..1cb4217 100644 --- a/Distribution/GameData/Endurance/Endurance.version +++ b/Distribution/GameData/Endurance/Endurance.version @@ -1,9 +1,9 @@ -{ +{ "NAME":"Endurance Continued", "URL":"http://ksp-avc.cybutek.net/version.php?id=258", "DOWNLOAD":"http://spacedock.info/mod/357/Endurance%20%28from%20Interstellar%29%20Continued...", -"VERSION":{"MAJOR":1,"MINOR":6,"PATCH":0,"BUILD":0}, -"KSP_VERSION":{"MAJOR":1,"MINOR":3,"PATCH":1}, -"KSP_VERSION_MIN":{"MAJOR":1,"MINOR":3,"PATCH":1}, -"KSP_VERSION_MAX":{"MAJOR":1,"MINOR":3,"PATCH":1} -} +"VERSION":{"MAJOR":1,"MINOR":7,"PATCH":0,"BUILD":0}, +"KSP_VERSION":{"MAJOR":1,"MINOR":4,"PATCH":1, +"KSP_VERSION_MIN":{"MAJOR":1,"MINOR":4,"PATCH":1, +"KSP_VERSION_MAX":{"MAJOR":1,"MINOR":4,"PATCH":1 +} \ No newline at end of file diff --git a/Distribution/GameData/Endurance/Plugins/ENHabitat.dll b/Distribution/GameData/Endurance/Plugins/ENHabitat.dll index 1844e0a..a048aa7 100644 Binary files a/Distribution/GameData/Endurance/Plugins/ENHabitat.dll and b/Distribution/GameData/Endurance/Plugins/ENHabitat.dll differ diff --git a/Distribution/GameData/Endurance/Plugins/Endurance.dll b/Distribution/GameData/Endurance/Plugins/Endurance.dll index d60ff82..cbe5a7c 100644 Binary files a/Distribution/GameData/Endurance/Plugins/Endurance.dll and b/Distribution/GameData/Endurance/Plugins/Endurance.dll differ diff --git a/Endurance/Endurance.csproj b/Endurance/Endurance.csproj index 6474cf5..12befde 100644 --- a/Endurance/Endurance.csproj +++ b/Endurance/Endurance.csproj @@ -33,9 +33,9 @@ <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> </PropertyGroup> <ItemGroup> - <Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\KSPDLLs - 1.3\Assembly-CSharp.dll</HintPath> + <HintPath>..\..\KSPDLLs - 1.4\Assembly-CSharp.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -45,11 +45,11 @@ <Reference Include="System.Xml" /> <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\KSPDLLs - 1.3\UnityEngine.dll</HintPath> + <HintPath>..\..\KSPDLLs - 1.4\UnityEngine.dll</HintPath> </Reference> <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\KSPDLLs - 1.3\UnityEngine.UI.dll</HintPath> + <HintPath>..\..\KSPDLLs - 1.4\UnityEngine.UI.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/Endurance/Properties/AssemblyInfo.cs b/Endurance/Properties/AssemblyInfo.cs index 3fc843f..aae5dc2 100644 --- a/Endurance/Properties/AssemblyInfo.cs +++ b/Endurance/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.0.0")] -[assembly: AssemblyFileVersion("1.6.0.0")] +[assembly: AssemblyVersion("1.7.0.0")] +[assembly: AssemblyFileVersion("1.7.0.0")] diff --git a/Habitat/HabitatPack.csproj b/Habitat/HabitatPack.csproj index 9a3df66..fa44c1d 100644 --- a/Habitat/HabitatPack.csproj +++ b/Habitat/HabitatPack.csproj @@ -1,87 +1,87 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{9788D41F-8AC3-49B8-9E73-F2B1249CF7E6}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>ENHabitat</RootNamespace> - <AssemblyName>ENHabitat</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup> - <RunPostBuildEvent>Always</RunPostBuildEvent> - </PropertyGroup> - <ItemGroup> - <Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\KSPDLLs - 1.3\Assembly-CSharp.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> - <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\KSPDLLs - 1.3\UnityEngine.dll</HintPath> - </Reference> - <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\KSPDLLs - 1.3\UnityEngine.UI.dll</HintPath> - </Reference> - </ItemGroup> - <ItemGroup> - <Compile Include="Habitat.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - </ItemGroup> - <ItemGroup> - <WCFMetadata Include="Service References\" /> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> - <PostBuildEvent>set /p KSP_DIR=<"$(SolutionDir)LocalDev\ksp_dir.txt" - -set /p MONO_EXE_DIR=<"$(SolutionDir)LocalDev\mono_exe.txt" - -set /p PDB2MDB_EXE_DIR=<"$(SolutionDir)LocalDev\pdb2mdb_exe.txt" - -set /p ZA_DIR=<"$(SolutionDir)LocalDev\7za_dir.txt" - -xcopy "$(TargetPath)" "$(SolutionDir)Distribution\GameData\$(SolutionName)\Plugins\" /Y -xcopy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)Distribution\GameData\$(SolutionName)\Plugins\" /Y - -cd "$(TargetDir)" -"%25MONO_EXE_DIR%25" "%25PDB2MDB_EXE_DIR%25" "$(TargetFileName)" -xcopy "$(TargetDir)$(TargetName).dll.mdb" "$(SolutionDir)Distribution\GameData\$(SolutionName)\Plugins\" /Y -</PostBuildEvent> - </PropertyGroup> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{9788D41F-8AC3-49B8-9E73-F2B1249CF7E6}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>ENHabitat</RootNamespace> + <AssemblyName>ENHabitat</AssemblyName> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup> + <RunPostBuildEvent>Always</RunPostBuildEvent> + </PropertyGroup> + <ItemGroup> + <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\KSPDLLs - 1.4\Assembly-CSharp.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\KSPDLLs - 1.4\UnityEngine.dll</HintPath> + </Reference> + <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\KSPDLLs - 1.4\UnityEngine.UI.dll</HintPath> + </Reference> + </ItemGroup> + <ItemGroup> + <Compile Include="Habitat.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <WCFMetadata Include="Service References\" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <PropertyGroup> + <PostBuildEvent>set /p KSP_DIR=<"$(SolutionDir)LocalDev\ksp_dir.txt" + +set /p MONO_EXE_DIR=<"$(SolutionDir)LocalDev\mono_exe.txt" + +set /p PDB2MDB_EXE_DIR=<"$(SolutionDir)LocalDev\pdb2mdb_exe.txt" + +set /p ZA_DIR=<"$(SolutionDir)LocalDev\7za_dir.txt" + +xcopy "$(TargetPath)" "$(SolutionDir)Distribution\GameData\$(SolutionName)\Plugins\" /Y +xcopy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)Distribution\GameData\$(SolutionName)\Plugins\" /Y + +cd "$(TargetDir)" +"%25MONO_EXE_DIR%25" "%25PDB2MDB_EXE_DIR%25" "$(TargetFileName)" +xcopy "$(TargetDir)$(TargetName).dll.mdb" "$(SolutionDir)Distribution\GameData\$(SolutionName)\Plugins\" /Y +</PostBuildEvent> + </PropertyGroup> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> </Project> \ No newline at end of file diff --git a/Habitat/Properties/AssemblyInfo.cs b/Habitat/Properties/AssemblyInfo.cs index 071850b..be62d35 100644 --- a/Habitat/Properties/AssemblyInfo.cs +++ b/Habitat/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.0.0")] -[assembly: AssemblyFileVersion("1.6.0.0")] +[assembly: AssemblyVersion("1.7.0.0")] +[assembly: AssemblyFileVersion("1.7.0.0")]