Merge branch 'DEVELOP' of https://github.com/tjdeckard/MKS into atlas

UmbraSpaceIndustries · Aug 20, 2019 · 8f2a8d7 · 8f2a8d7
2 parents 09db274 + d5c174c
commit 8f2a8d7
Show file tree

Hide file tree

Showing 90 changed files with 868 additions and 189 deletions.
diff --git a/FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version b/FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version
@@ -6,20 +6,20 @@
     "VERSION":
      {
          "MAJOR":1,
-         "MINOR":6,
-         "PATCH":2,
+         "MINOR":8,
+         "PATCH":0,
          "BUILD":0
      },
     "KSP_VERSION_MIN":
      {
          "MAJOR":1,
-         "MINOR":4,
-         "PATCH":5
+         "MINOR":7,
+         "PATCH":0
      },
     "KSP_VERSION_MAX":
      {
          "MAJOR":1,
-         "MINOR":4,
-         "PATCH":5
+         "MINOR":7,
+         "PATCH":0
      }
 }
diff --git a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll
diff --git a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/002_MultiAnimators.dll b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/002_MultiAnimators.dll
diff --git a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/0_00_AT_Utils_UI.dll b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/0_00_AT_Utils_UI.dll
diff --git a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/PluginData/000_AT_Utils/000_AT_Utils.glob b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/PluginData/000_AT_Utils/000_AT_Utils.glob
@@ -1,15 +1,78 @@
+LineWidthMult = 0.4
+MinLineWidthMult = 0.01
+
 MeshesToSkip = flagtransform canopy
-BadParts = RadialDrill MKS.Drill.02 MKS.Drill.03
+BadParts = RadialDrill MKS.Drill.02 MKS.Drill.03 dmFlexoTube
+
+Colors
+{
+	Enabled
+	{
+		html = #00FF00FF
+	}
+	Active
+	{
+		html = #FFEB04FF
+	}
+	Inactive
+	{
+		html = #808080FF
+	}
+	Confirm
+	{
+		html = #00FF00FF
+	}
+	Open
+	{
+		html = #00FF00FF
+	}
+	Close
+	{
+		html = #FF0000FF
+	}
+	Good
+	{
+		html = #00FF00FF
+	}
+	Warning
+	{
+		html = #FFEB04FF
+	}
+	Danger
+	{
+		html = #FF0000FF
+	}
+	Selected1
+	{
+		html = #00FFFFFF
+	}
+	Selected2
+	{
+		html = #FF00FFFF
+	}
+	FractionGradient
+	{
+		Item
+		{
+			html = #FF0000FF
+		}
+		Item
+		{
+			html = #FFEB04FF
+		}
+		Item
+		{
+			html = #FFFFFF
+		}
+		Item
+		{
+			html = #00FF00FF
+		}
+	}
+}
 
 StylesConfig
 {
-    //available colors: normal (meaning white), grey, red, dark_red, green, dark_green, yellow, dark_yellow, cyan, magenta
-    EnabledButtonColor = green
-    ActiveButtonColor = yellow
-    InactiveButtonColor = grey
-    ConfirmButtonColor = green
-    AddButtonColor = green
-    CloseButtonColor = red
-    DangerButtonColor = red
 }
-//:mode=c#:
+
+//:mode=c#:
diff --git a/FOR_RELEASE/GameData/000_AT_Utils/at_utils_ui.ksp b/FOR_RELEASE/GameData/000_AT_Utils/at_utils_ui.ksp
diff --git a/FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg b/FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg
@@ -1,9 +1,9 @@
 AGENT
 {
     name = Umbra Space Industries
-	title = Umbra Space Industries
+	title = #LOC_USI_agency_usi_title
 
-    description = A world leader in corrugated paper products, Umbra Space Industries is now applying their formidable boxing and packaging skills into a a series of products for colonization, exploration, and resource exploitation!
+    description = #LOC_USI_agency_usi_description
 
     logoURL = 000_USITools/Agency/USILogo
     logoScaledURL = 000_USITools/Agency/USILogo_SM

diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,7 @@
+1.2.0 - 2019.08.04
+------------------
+KSP 1.7.x Compatibility
+
 1.1.0 - 2019.02.05
 ------------------
 KSP 1.6.x Compatibility

diff --git a/FOR_RELEASE/GameData/000_USITools/Comms.cfg b/FOR_RELEASE/GameData/000_USITools/Comms.cfg
@@ -1,4 +1,4 @@
-@PART[*]:HAS[!MODULE[ModuleDataTransmitter],MODULE[ModuleCommand]]
+@PART[*]:HAS[!MODULE[ModuleDataTransmitter],@MODULE[ModuleCommand]]
 {
 	MODULE
 	{

diff --git a/FOR_RELEASE/GameData/000_USITools/Localization/en-us.cfg b/FOR_RELEASE/GameData/000_USITools/Localization/en-us.cfg
@@ -0,0 +1,9 @@
+Localization
+{
+	en-us
+	{
+		// Agency
+		#LOC_USI_agency_usi_title = Umbra Space Industries
+		#LOC_USI_agency_usi_description = A world leader in corrugated paper products, Umbra Space Industries is now applying their formidable boxing and packaging skills into a a series of products for colonization, exploration, and resource exploitation!
+	}
+}
diff --git a/FOR_RELEASE/GameData/000_USITools/Logistics.cfg b/FOR_RELEASE/GameData/000_USITools/Logistics.cfg
@@ -18,10 +18,18 @@ RESOURCE_DEFINITION  //Hidden resource used to manage mass
     volume = 1
 }
 
-@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],RESOURCE[Machinery|EnrichedUranium|DepletedFuel|Recyclables]]:FOR[USITools]
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[Machinery|EnrichedUranium|DepletedFuel|Recyclables]]:FOR[USITools]
 {
     MODULE
     {
         name = USI_ModuleFieldRepair
     }
 }
+
+@PART[*]:HAS[!MODULE[USI_ModuleRecycleBin],@RESOURCE[MaterialKits]]:FOR[USITools]
+{
+    MODULE
+    {
+        name = USI_ModuleRecycleBin
+    }
+}
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version
@@ -9,14 +9,14 @@
      },
      "VERSION":{
          "MAJOR":1,
-         "MINOR":1,
+         "MINOR":2,
          "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":6,
-         "PATCH":0
+         "MINOR":7,
+         "PATCH":3
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -25,7 +25,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":6,
+         "MINOR":8,
          "PATCH":9
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll
diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version
@@ -7,8 +7,8 @@
     }, 
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":6,
-         "PATCH":0
+         "MINOR":7,
+         "PATCH":3
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -17,14 +17,14 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":6,
+         "MINOR":8,
          "PATCH":9
      }, 
     "NAME": "Community Category Kit", 
     "URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version", 
     "VERSION": {
         "MAJOR": 4, 
-        "MINOR": 1, 
+        "MINOR": 3, 
         "PATCH": 0,
         "BUILD": 0     
 	}

diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt
@@ -1,3 +1,7 @@
+4.2.0 - 2019.08.04
+------------------
+KSP 1.7.x Compatibility
+
 4.1.0 - 2019.02.05
 ------------------
 KSP 1.6.x Compatibility

diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Containers.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Containers.png
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,7 @@
+1.2.0 - 2019.08.04
+------------------
+KSP 1.7.x Compatibility
+
 1.1.0 - 2019.02.05
 ------------------
 KSP 1.6.x Compatibility

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
@@ -9,14 +9,14 @@
      },
      "VERSION":{
          "MAJOR":1,
-         "MINOR":1,
+         "MINOR":2,
          "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":6,
-         "PATCH":0
+         "MINOR":7,
+         "PATCH":3
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -25,7 +25,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":6,
+         "MINOR":8,
          "PATCH":9
      }
  }