From ad8ab0ef3b21ba72c4171721fb7499e223d24b8a Mon Sep 17 00:00:00 2001 From: Fluffy Date: Tue, 25 Aug 2020 20:32:53 +0200 Subject: [PATCH] Release 3.6.999 [nolog] --- About/About.xml | 2 +- About/Manifest.xml | 4 +- Assemblies/ModManager.dll | Bin 134144 -> 134144 bytes Readme.md | 2 +- Source/ModConfig.json | 58 ++---------------- .../ModButton/ModButton_Installed.cs | 28 ++++----- Source/ModManager/Properties/AssemblyInfo.cs | 2 +- 7 files changed, 23 insertions(+), 73 deletions(-) diff --git a/About/About.xml b/About/About.xml index dc2de66..d16707c 100644 --- a/About/About.xml +++ b/About/About.xml @@ -99,7 +99,7 @@ shadowtouch: better filename sanitizing code Mohas: fix nullref in online manifests <size=24>Version</size> -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/About/Manifest.xml b/About/Manifest.xml index 2c0a7e8..26a733b 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,6 +1,6 @@ - 3.5.996 + 3.6.999 https://raw.githubusercontent.com/fluffy-mods/ModManager/1.2/About/Manifest.xml - https://github.com/fluffy-mods/ModManager/releases/v3.5.996 + https://github.com/fluffy-mods/ModManager/releases/v3.6.999 \ No newline at end of file diff --git a/Assemblies/ModManager.dll b/Assemblies/ModManager.dll index 4455ff880418a5f28114c075c6bdf584b93bb36a..4ecff64bf56b48a2496423dea2d23cf5ef090fc5 100644 GIT binary patch delta 4786 zcmZA53tSY{9tZIAKg+`Kej_mMt}|ncJY1iFq9%&@3d{F9!F_<7fPy-~T*j=FIHkq7Q^c z9|*-uOrs|}S+djui%YhQgU%{|3zn#b;EJ3sQ^J1+v%i#>NlbYpEq@ITl^uD zwU9J6+d2tKbrq2Y3CJX6AYh$Qx-gn67IiL`OF@ZkxVoTdJXaR# zw60RrfJC0PF0CQhX3c{em;nJYl`T!}+!W%ntv99}n*iiFNJIUkD;u>ufM;V+j|*JS z=_-mJne#;SbMT=qkI-UwNYh}Qt`Z?IsXNma%&v*Or0GzKS)Jj9nw`zvSw6}nQ$BxHUgNgqC8_4_|Jqtb$LkL;8D`^;J1OFl85AVS0Nwbb@7D) z$%j%y!r|m}rkV{dURoq{?aF!G=*Z4urj!rA=&BZacT-LI@H=KX-A2)T2;Ip0Rg;F^ ze9%N)MM9MnW6g*5sN+%sll^03hWv5q#0h!2s!5OtOfP>-`1~a#R#d?Wft!p$Jq{kW zMZL++&&6&l>^TUhv!&VKS8nvH9akXDfmpAWNpm3! zb$Q$>X&&TzwN+XGuX4HAgqO$dm0p9j7_P~ykru*5)L^F9p#@buu0|?=9y^Q)zj(Gr za=~m=_mnfzBG{v=NVqxrinJK+7$W9j3;Y*D=L+7hNN|j~BDrC>u5Lx7Jqz7%akn0l zrV$JL-+;6)4SmwSL3$H*?cpjUnKmGA!RxB?j_BG^$=j+)S4S*sJArbrTlY3x)m21p zJj3O;k5?9v4XpRukguzdObc{c-iB9EeZrfirSNZ5nV-}04y;E_6`YoLz4|N6X;}ta zT^J5v?~dhAsmmicGPc2TxM_%N8G2t@4&*C7y@x4CE{55tT~pi0C2$zEgy}sHs*K7> zHWgGzM7^u4gCXJ0SgWi;X_ZSa6|zTnV64N^G5xwRS@s*5z_RyYm?835MlYs`UTqFv z0rOC$Y5immgd8xY-|2W-{t)7Il@M#EiSmD7cVC_v5Ahm!{{RVLEQueVqrw{aObxv& zLVGp&Zt|c5)q0_DvR9tG2I3F3DqsExX6f>fqKs>{wNQ*&l`%(N2YXOmJG~;WhdOuJn*l9@kEw_VQ0hO&Cmkw>QR=_DN4NBV_z6*w{&)gGT z@73yy&@aQ6a6p%boVV|7_a)>UH5PH+ezIL9977$pUys`hXS~{L{x96{>YTg}Iv+Fo zg;-mxU%@<-JXM7%*n0f$`Kn;I+Hfy)&~ClWO|Au8ldGT#wTXR3d=2MNwa_4c?Q;+J z!&S@@f*WNfwNHyU=oYqB#Q-@7OB7!TCo2cj$TTRw)H^kZjM2R2>Ch;=?A)%R|xf8J1K8_EqZPd(gamclLlM%{TGp#C_Ns^}v)=HjYk-lM&4??rHo&YEksyv~U21llGV9OYh5tax ztiQl~te+fGX8j)&psLK7=9^Hg%eaTPeCD|Yt5+0)IBg@=#|8mugrlg_;as;+%h@y3 z2yogs(?0AOYV;Ya5t1=$uaENRzHfv9D;|OvJ_9QzvgfK1+*&e#n5tppji8arZ}7D) zW3j*cOz=A#*XFPe;lE-BQ*fsF4|t%hWQ{J%8Dn8}L7Ca zw_ynCPDpxKGmJ+`{!Q{ipEHUSdVK%X+jnGH08KE7tGG5t3JH`%!im|d2ySjvi z^50L`Q+l13wF#_o%vx;h;x}Ib zx&>7b`np1C8EOSI$tJH33Qe*f-Hq8qTBMk173yHfGR2=B*N(8EEoZT@TW|#l^f}Ey z`m+Xp>@=G-3p=>{zB5j&HUd~>iZ1>!ZDtyvs~&o=FGWFgA!J_^~_C9uy0y_ zt0dfM38v{%{+Z17PYCUg9lEm{A4*#@6T4_(bUbF4!g7>wuOeb{ln6Qlv$(kJ zN+f*|bw7TW5=CD@6(sCaqG{_(J(a!GW9VuZhT(}vl~~&Pj*n*V_&9Ir>_n=xp`T-A z3i}+2r(dAD1aj?1No;S$)7E$QkESwfymv9nV|OVDv<@qOj@zdsvKa>Qi{~bL;;ACi z)fnDrb5v>T9j13enbqQ5%&`QjSZOm>CP$Z9ZPa{8d)gloAw+ZfgV@t{$ryAq+xHUf ziki%}hvajAB$|cUUcGXZwwHIGj*TA#omV8f3NSc43m}DlJq1G2#C& zQtbrmFs%|B{{WkmOk3ZPC!;1PDc=46A$vAbY3oaIE_*i8yx9-YO>#${i5xVhp0FP` z`IK!=2c54y6Ug3%+pzI1b`2f061AFLLkB&A`WL%uj(-ex2D6>P_Y?d%qpZc4rK|P?2>WZarpBcl7Mpv!dHWX!461kN;c5*D{y?yIqMC2h%G? z_|cu9h56Ih!u^Sfg+H0_SfTmTeh`>W9Hb}zQ&As4b04ubB#`c-Z*;AQ45E!t(mCM& Db8(aq delta 4695 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 diff --git a/Readme.md b/Readme.md index eed1a32..d78ac1d 100644 --- 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. \ No newline at end of file +This is version 3.6.999, for RimWorld 1.2.2723. \ No newline at end of file diff --git a/Source/ModConfig.json b/Source/ModConfig.json index c02fe90..cd24dec 100644 --- 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" } \ No newline at end of file diff --git a/Source/ModManager/ModButton/ModButton_Installed.cs b/Source/ModManager/ModButton/ModButton_Installed.cs index 480e992..cd2cc54 100644 --- 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 index 68a5ae7..7bd1e12 100644 --- 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")] \ No newline at end of file +[assembly: AssemblyFileVersion("3.6.999")] \ No newline at end of file