fix merge conflict error

fluffy-mods · Mar 21, 2020 · dfdaf27 · dfdaf27
1 parent 3049d02
commit dfdaf27
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -56,9 +56,10 @@ rw-chaos:    German translation
 53N4:    Spanish translation
 Silverside:    Fix UI scaling bug for vertical text
 shiuanyue:    Chinese (traditional) translation
+notfood:    
 
 &lt;size=24&gt;Version&lt;/size&gt;
-This is version 3.13.503, for RimWorld 1.1.2575.
+This is version 3.13.503, for RimWorld 1.1.2579.
 
 </description>
   <supportedVersions>

diff --git a/Assemblies/ResearchTree.dll b/Assemblies/ResearchTree.dll
diff --git a/Readme.md b/Readme.md
@@ -48,6 +48,7 @@ Luckily, the crossing reduction and edge length reduction steps partially achiev
  - 53N4:	Spanish translation
  - Silverside:	Fix UI scaling bug for vertical text
  - shiuanyue:	Chinese (traditional) translation
+ - notfood:	
 
 # Think you found a bug? 
 Please read [this guide](http://steamcommunity.com/sharedfiles/filedetails/?id=725234314) before creating a bug report,
@@ -70,4 +71,4 @@ Show your appreciation by buying me a coffee (or contribute towards a nice singl
 [![I Have a Black Dog](https://i.ibb.co/ss59Rwy/New-Project-2.png)](https://www.youtube.com/watch?v=XiCrniLQGYc)
 
 # Version
-This is version 3.13.503, for RimWorld 1.1.2575.
+This is version 3.13.503, for RimWorld 1.1.2579.
diff --git a/Source/Graph/ResearchNode.cs b/Source/Graph/ResearchNode.cs
@@ -78,9 +78,6 @@ public List<ResearchNode> Children
             }
         }
 
-        public override bool Completed => Research.IsFinished;
-        public override bool Available => !Research.IsFinished && ( DebugSettings.godMode || BuildingPresent() );
-
         public override string Label => Research.LabelCap;
 
         public static bool BuildingPresent( ResearchProjectDef research )
@@ -190,7 +187,7 @@ public bool TechprintAvailable()
         {
             return TechprintAvailable( Research );
         }
-        
+
         /// <summary>
         ///     Draw the node, including interactions.
         /// </summary>
@@ -263,15 +260,14 @@ public override void Draw( Rect visibleRect, bool forceDetailedMode = false )
                 // attach description and further info to a tooltip
                 TooltipHandler.TipRegion( Rect, GetResearchTooltipString, Research.GetHashCode() );
                 if ( !BuildingPresent() )
-                    TooltipHandler.TipRegion( Rect,
-                        "Fluffy.ResearchTree.MissingFacilities".Translate( string.Join( ", ",
-                            MissingFacilities().Select( td => td.LabelCap ).ToArray() ) ) );
-                }
+                    TooltipHandler.TipRegion( Rect, "Fluffy.ResearchTree.MissingFacilities".Translate(
+                                                  string.Join( ", ",
+                                                               MissingFacilities()
+                                                                  .Select( td => td.LabelCap ).ToArray() ) ) );
+
                 else if ( !TechprintAvailable() )
-                {
-                    TooltipHandler.TipRegion(Rect,
-                        "Fluffy.ResearchTree.MissingTechprints".Translate(Research.TechprintsApplied, Research.techprintCount));
-                }
+                    TooltipHandler.TipRegion( Rect, "Fluffy.ResearchTree.MissingTechprints".Translate(
+                                                  Research.TechprintsApplied, Research.techprintCount ) );
 
                 // draw unlock icons
                 if ( detailedMode )