diff --git a/.gitmodules b/.gitmodules index 390753b04..b4ab23261 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,7 @@ [submodule "Universal Content Builder"] path = Universal Content Builder url = https://github.com/AGN-Pokemon-3D/Pokemon-3D-Universal-Content-Builder.git +[submodule "kolben"] + path = kolben + url = git@github.com:nilllzz/kolben.git + branch = master diff --git a/2.5DHero.sln b/2.5DHero.sln index 95e8386ae..123169ab3 100644 --- a/2.5DHero.sln +++ b/2.5DHero.sln @@ -1,10 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26724.1 +VisualStudioVersion = 15.0.27004.2005 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2.5DHero", "2.5DHero\2.5DHero\2.5DHero.vbproj", "{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kolben", "kolben\Kolben\Kolben.csproj", "{ED665F9B-07F4-4415-BD72-A728CF1EA909}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,14 @@ Global {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|Any CPU.Build.0 = Release|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|Any CPU.ActiveCfg = ReleaseNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|Any CPU.Build.0 = ReleaseNoContent|Any CPU + {ED665F9B-07F4-4415-BD72-A728CF1EA909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED665F9B-07F4-4415-BD72-A728CF1EA909}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED665F9B-07F4-4415-BD72-A728CF1EA909}.DebugNoContent|Any CPU.ActiveCfg = Debug|Any CPU + {ED665F9B-07F4-4415-BD72-A728CF1EA909}.DebugNoContent|Any CPU.Build.0 = Debug|Any CPU + {ED665F9B-07F4-4415-BD72-A728CF1EA909}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED665F9B-07F4-4415-BD72-A728CF1EA909}.Release|Any CPU.Build.0 = Release|Any CPU + {ED665F9B-07F4-4415-BD72-A728CF1EA909}.ReleaseNoContent|Any CPU.ActiveCfg = Release|Any CPU + {ED665F9B-07F4-4415-BD72-A728CF1EA909}.ReleaseNoContent|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/kolben b/kolben new file mode 160000 index 000000000..850f7a040 --- /dev/null +++ b/kolben @@ -0,0 +1 @@ +Subproject commit 850f7a0403e9b1729c888d8814fd245071dbf16d