Release 3.6.999 [nolog]

fluffy-mods · Aug 25, 2020 · ad8ab0e · ad8ab0e
1 parent 6cb0e42
commit ad8ab0e
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 73 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -99,7 +99,7 @@ shadowtouch:    better filename sanitizing code
 Mohas:    fix nullref in online manifests
 
 &lt;size=24&gt;Version&lt;/size&gt;
-This is version 3.5.996, for RimWorld 1.2.2723.
+This is version 3.6.999, for RimWorld 1.2.2723.
 
 </description>
   <supportedVersions>

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
-  <version>3.5.996</version>
+  <version>3.6.999</version>
   <manifestUri>https://raw.githubusercontent.com/fluffy-mods/ModManager/1.2/About/Manifest.xml</manifestUri>
-  <downloadUri>https://github.com/fluffy-mods/ModManager/releases/v3.5.996</downloadUri>
+  <downloadUri>https://github.com/fluffy-mods/ModManager/releases/v3.6.999</downloadUri>
 </Manifest>
diff --git a/Assemblies/ModManager.dll b/Assemblies/ModManager.dll
diff --git a/Readme.md b/Readme.md
@@ -106,4 +106,4 @@ Become a supporter and show your appreciation by buying me a coffee (or contribu
 
 
 ![Version](https://banners.karel-kroeze.nl/title/Version.png)  
-This is version 3.5.996, for RimWorld 1.2.2723.
+This is version 3.6.999, for RimWorld 1.2.2723.
diff --git a/Source/ModConfig.json b/Source/ModConfig.json
@@ -3,8 +3,8 @@
     "version": {
         "alpha": 18,
         "major": 3,
-        "minor": 5,
-        "build": 996
+        "minor": 6,
+        "build": 999
     },
     "visibility": 0,
     "git_repo": "ModManager",
@@ -25,63 +25,13 @@
         "shadowtouch": "better filename sanitizing code",
         "Mohas": "fix nullref in online manifests"
     },
-    "changenote": "2020-08-19 00:08 :: Fluffy :: add steam links for original mod & author to local copies\n2020-08-19 00:08 :: Fluffy :: re-implement updating local copies from steam source\n2020-08-18 22:08 :: Fluffy :: check if userdata exists before trying to copy it\n2020-08-18 21:08 :: Fluffy :: fix key error in auto-sort\n2020-08-18 21:08 :: Fluffy :: fix possible nullref in Incompatible.get_Resolvers\n2020-08-18 20:08 :: Proxyer :: Update Japanese Translation for v3.4.966 (#123)",
+    "changenote": "",
     "tags": [
         "1.0",
         "1.1",
         "1.2"
     ],
     "publishedfileid": "1507748539",
-    "changenotes": [
-        {
-            "repo": "ModManager",
-            "hash": "de9ad0d21db95e45988f85c6dc77ac97c8109b5a",
-            "date": "2020-08-24 22:08",
-            "author": "Fluffy",
-            "message": "add survey notification [nolog]"
-        },
-        {
-            "repo": "ModManager",
-            "hash": "2ee14025cf53c0f499a44efd71e87fa71e33f486",
-            "date": "2020-08-19 00:08",
-            "author": "Fluffy",
-            "message": "add steam links for original mod & author to local copies"
-        },
-        {
-            "repo": "ModManager",
-            "hash": "4f4a04b543d3e45452f2e81ffa46e0e3895afab1",
-            "date": "2020-08-19 00:08",
-            "author": "Fluffy",
-            "message": "re-implement updating local copies from steam source"
-        },
-        {
-            "repo": "ModManager",
-            "hash": "f410514175227e5a9fdf7c28f6dea91ea102f267",
-            "date": "2020-08-18 22:08",
-            "author": "Fluffy",
-            "message": "check if userdata exists before trying to copy it"
-        },
-        {
-            "repo": "ModManager",
-            "hash": "a4347c90f205101628a66840c6746da5977c99b5",
-            "date": "2020-08-18 21:08",
-            "author": "Fluffy",
-            "message": "fix key error in auto-sort"
-        },
-        {
-            "repo": "ModManager",
-            "hash": "097646da380ec6619ad6663dc05207728c7f714d",
-            "date": "2020-08-18 21:08",
-            "author": "Fluffy",
-            "message": "fix possible nullref in Incompatible.get_Resolvers"
-        },
-        {
-            "repo": "ModManager",
-            "hash": "1ad46a0b5a50493e2b695eb9eee08c7feb5d5167",
-            "date": "2020-08-18 20:08",
-            "author": "Proxyer",
-            "message": "Update Japanese Translation for v3.4.966 (#123)"
-        }
-    ],
+    "changenotes": [],
     "packageId": "fluffy.modmanager"
 }
diff --git a/Source/ModManager/ModButton/ModButton_Installed.cs b/Source/ModManager/ModButton/ModButton_Installed.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using ColourPicker;
 using HarmonyLib;
 using RimWorld;
 using Steamworks;
@@ -223,8 +224,7 @@ public string GetVersionTip( ModMetaData mod )
         {
             if ( mod.VersionCompatible )
                 return I18n.CurrentVersion;
-            else
-                return I18n.DifferentVersion( mod );
+            return I18n.DifferentVersion( mod );
         }
 
         internal virtual void DoSourceButtons(Rect canvas)
@@ -304,12 +304,12 @@ internal override void DoModActionButtons( Rect canvas )
             {
                 var options = NewOptionsList;
                 options.Add( new FloatMenuOption( I18n.ChangeModColour( Name ), () => Find.WindowStack.Add(
-                    new ColourPicker.Dialog_ColourPicker( Color, color =>
-                        ModManager.UserData[Selected].Color = color
+                    new Dialog_ColourPicker( Color, color =>
+                                                 ModManager.UserData[Selected].Color = color
                      ) ) ) );
                 options.Add( new FloatMenuOption( I18n.ChangeButtonColour( Name ), () => Find.WindowStack.Add(
-                    new ColourPicker.Dialog_ColourPicker( Color, color =>
-                     ModManager.UserData[this].Color = color
+                    new Dialog_ColourPicker( Color, color =>
+                                                 ModManager.UserData[this].Color = color
                      ) ) ) );
                 FloatMenu( options );
             }
@@ -353,14 +353,14 @@ public void DoModActionFloatMenu()
             {
                 var options2 = NewOptionsList;
                 options2.Add( new FloatMenuOption( I18n.ChangeModColour( Name ), () => Find.WindowStack.Add(
-                    new ColourPicker.Dialog_ColourPicker( Color,
-                        color =>
+                    new Dialog_ColourPicker( Color,
+                                             color =>
                         
-                            ModManager.UserData[Selected].Color = color
+                                                 ModManager.UserData[Selected].Color = color
                          ) ) ) );
                 options2.Add( new FloatMenuOption( I18n.ChangeButtonColour( Name ), () => Find.WindowStack.Add(
-                    new ColourPicker.Dialog_ColourPicker( Color,
-                        color => ModManager.UserData[this].Color = color
+                    new Dialog_ColourPicker( Color,
+                                             color => ModManager.UserData[this].Color = color
                          ) ) ) );
                 FloatMenu(options2);
             } ) );
@@ -499,16 +499,16 @@ internal override void DoModDetails( Rect canvas )
                 switch ( mod.Source )
                 {
                     case ContentSource.ModsFolder:
-                        steamMod = mod;
+                        steamMod = mod.UserData()?.Source;
                         break;
                     case ContentSource.SteamWorkshop:
-                        steamMod = mod.UserData()?.Source;
+                        steamMod = mod;
                         break;
                     default:
                         steamMod = null;
                         break;
                 }
-                if (steamMod != null)
+                if (steamMod != null && SteamManager.Initialized )
                 {
                     var authorId = Traverse.Create( steamMod.GetWorkshopItemHook() )
                         .Field( "steamAuthor" )

diff --git a/Source/ModManager/Properties/AssemblyInfo.cs b/Source/ModManager/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.0.0")]
-[assembly: AssemblyFileVersion("3.5.996")]
+[assembly: AssemblyFileVersion("3.6.999")]