Merge pull request #783 from DanielNoord/fix/upgradesorting

Fix upgrade sorting on firefox #780

src/Disp/BuildingsUpgrades/Upgrades.js

@@ -72,6 +72,7 @@ export default function UpdateUpgrades() {
     o.name = Game.UpgradesInStore[x].name;
     o.price = Game.UpgradesInStore[x].basePrice;
     o.pp = CacheUpgrades[o.name].pp;
+    o.color = CacheUpgrades[o.name].color;
     arr.push(o);
   }
 

src/Disp/VariablesAndData.js

@@ -23,7 +23,6 @@ export const ColourGray = 'Gray';
 export const ColourPink = 'Pink';
 export const ColourBrown = 'Brown';
 export const ColoursOrdering = [
-  ColourGray,
   ColourBlue,
   ColourGreen,
   ColourYellow,
@@ -32,6 +31,7 @@ export const ColoursOrdering = [
   ColourPurple,
   ColourPink,
   ColourBrown,
+  ColourGray,
 ];
 
 /**