Merge pull request #334 from ihsoft/next

ihsoft · Sep 8, 2022 · ba40aaf · ba40aaf
2 parents 8a5fd4e + 964d05f
commit ba40aaf
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.12 (September 7th, 2022):
+* [Fix] Set a proper normal texture to the RTS hose.
+
 # 1.11 (June 3rd, 2022):
 * [Enhancement #329] Bring back haroon and grapling hook.
 

diff --git a/Deps/CommunityCategoryKit/CCK.dll b/Deps/CommunityCategoryKit/CCK.dll
diff --git a/Deps/CommunityCategoryKit/CCK.version b/Deps/CommunityCategoryKit/CCK.version
@@ -1,31 +1,31 @@
 {
-    "DOWNLOAD": "https://github.com/BobPalmer/CommunityCategoryKit/releases", 
+    "NAME": "Community Category Kit",
+    "URL": "https://raw.githubusercontent.com/UmbraSpaceIndustries/CommunityCategoryKit/main/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version",
+    "DOWNLOAD": "https://github.com/UmbraSpaceIndustries/CommunityCategoryKit/releases",
     "GITHUB": {
-        "ALLOW_PRE_RELEASE": false, 
-        "REPOSITORY": "CommunityCategoryKit", 
-        "USERNAME": "BobPalmer"
-    }, 
+        "ALLOW_PRE_RELEASE": false,
+        "REPOSITORY": "CommunityCategoryKit",
+        "USERNAME": "UmbraSpaceIndustries"
+    },
+    "VERSION": {
+        "BUILD": 112,
+        "MAJOR": 0,
+        "MINOR": 1,
+        "PATCH": 0
+    },
     "KSP_VERSION": {
-        "MAJOR": 1, 
-        "MINOR": 9, 
-        "PATCH": 1
-    }, 
-    "KSP_VERSION_MAX": {
-        "MAJOR": 1, 
-        "MINOR": 99, 
-        "PATCH": 99
-    }, 
+        "MAJOR": 1,
+        "MINOR": 12,
+        "PATCH": 3
+    },
     "KSP_VERSION_MIN": {
-        "MAJOR": 1, 
-        "MINOR": 8, 
-        "PATCH": 0
-    }, 
-    "NAME": "Community Category Kit", 
-    "URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version", 
-    "VERSION": {
-        "BUILD": 0, 
-        "MAJOR": 5, 
-        "MINOR": 1, 
+        "MAJOR": 1,
+        "MINOR": 8,
         "PATCH": 0
+    },
+    "KSP_VERSION_MAX": {
+        "MAJOR": 1,
+        "MINOR": 99,
+        "PATCH": 99
     }
-}
+}
diff --git a/Deps/CommunityCategoryKit/CHANGELOG.txt b/Deps/CommunityCategoryKit/CHANGELOG.txt
@@ -1,3 +1,11 @@
+112.0 - 2021.09.19
+------------------
+KSP 1.12.x Compatibility
+
+5.2.0 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+
 4.3.0 - 2019.10.28
 ------------------
 KSP 1.8.x Compatibility

diff --git a/Deps/CommunityCategoryKit/common-filters.cfg b/Deps/CommunityCategoryKit/common-filters.cfg
@@ -8,7 +8,8 @@ CCKCommonFilterConfig
   {
     name = Containers
     tag = cck-containers
-    normalIcon = CommunityCategoryKit/icons/Containers
+    normalIcon = CommunityCategoryKit/icons/Containers_N
+    selectedIcon = CommunityCategoryKit/icons/Containers_S
     usedByMod = Kerbal Inventory System (KIS)
     usedByMod = Kerbal Attachment System (KAS)
   }

diff --git a/Deps/CommunityCategoryKit/icons/Containers_N.png b/Deps/CommunityCategoryKit/icons/Containers_N.png
diff --git a/...CommunityCategoryKit/icons/Containers.png → ...mmunityCategoryKit/icons/Containers_S.png b/...CommunityCategoryKit/icons/Containers.png → ...mmunityCategoryKit/icons/Containers_S.png
diff --git a/Deps/ModuleManager.4.1.4.dll b/Deps/ModuleManager.4.1.4.dll
diff --git a/Deps/ModuleManager.4.2.2.dll b/Deps/ModuleManager.4.2.2.dll
diff --git a/KAS.version b/KAS.version
@@ -23,9 +23,9 @@
     "NAME": "KAS", 
     "URL": "https://github.com/ihsoft/KAS/blob/master/KAS.version", 
     "VERSION": {
-        "BUILD": 42072, 
+        "BUILD": 34332, 
         "MAJOR": 1, 
-        "MINOR": 11, 
-        "PATCH": 8189
+        "MINOR": 12, 
+        "PATCH": 8285
     }
 }
diff --git a/Parts/RTS1/part.cfg b/Parts/RTS1/part.cfg
@@ -79,6 +79,7 @@ PART
 		pipeTextureRescaleMode = TileFromTarget
 		pipeDiameter = 0.07
 		pipeTexturePath = KAS/Textures/hose-d70-1kn
+		pipeNormalsTexturePath = KAS/Textures/hose-d70-1knNRM
 		pipeTextureSamplesPerMeter = 1
 
 		sourceJoint

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -27,7 +27,7 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion ("1.11.*")]
-[assembly: AssemblyInformationalVersion ("1.11 for KSP v1")]
-[assembly: KSPAssembly ("KAS", 1, 11)]
+[assembly: AssemblyVersion ("1.12.*")]
+[assembly: AssemblyInformationalVersion ("1.12 for KSP v1")]
+[assembly: KSPAssembly ("KAS", 1, 12)]
 [assembly: AssemblyFlags (AssemblyNameFlags.PublicKey)]
diff --git a/Textures/hose-d70-1knNRM.dds b/Textures/hose-d70-1knNRM.dds
diff --git a/Tools/publish_curseforge_args.txt b/Tools/publish_curseforge_args.txt
@@ -4,4 +4,4 @@
 --github=ihsoft/KAS
 --versions=latest_all_builds
 --title=KAS {tag}
---archive=../KAS_v1.11.zip
+--archive=../KAS_v1.12.zip
diff --git a/Tools/publish_github_args.txt b/Tools/publish_github_args.txt
@@ -4,4 +4,4 @@
 --changelog=../CHANGELOG.md
 --as_draft
 --title=KAS v{tag}
---archive=../KAS_v1.11.zip
+--archive=../KAS_v1.12.zip
diff --git a/Tools/publish_spacedock_args.txt b/Tools/publish_spacedock_args.txt
@@ -3,4 +3,4 @@
 --changelog=../CHANGELOG.md
 --github=ihsoft/KAS
 --ksp_version=latest
---archive=../KAS_v1.11.zip
+--archive=../KAS_v1.12.zip