Merge branch 'master' into gh-pages

This commit is contained in:
Aktanusa committed 2016-07-27 23:17:24 -04:00
commit db95fe5147
3 files changed
+4 -4

No files matched your search

+2 -2
View File
@@ -1909,7 +1909,7 @@ CM.Disp.AddMenuStats = function(title) {
stats.appendChild(listing(listingQuest('Chocolate Egg Cookies', 'ChoEggTooltipPlaceholder'), document.createTextNode(Beautify(CM.Cache.lastChoEgg))));
}
if (centEgg) {
stats.appendChild(listing('Century Egg Multiplier', document.createTextNode((Math.round(CM.Cache.CentEgg * 100) / 100) + '%')));
stats.appendChild(listing('Century Egg Multiplier', document.createTextNode((Math.round((CM.Cache.CentEgg - 1) * 10000) / 100) + '%')));
}
}
}
@@ -2573,7 +2573,7 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkB
CM.ConfigPrefix = 'CMConfig';
CM.VersionMajor = '2.002';
CM.VersionMinor = '1';
CM.VersionMinor = '2';
/*******
* Sim *
+1 -1
View File
@@ -1403,7 +1403,7 @@ CM.Disp.AddMenuStats = function(title) {
stats.appendChild(listing(listingQuest('Chocolate Egg Cookies', 'ChoEggTooltipPlaceholder'), document.createTextNode(Beautify(CM.Cache.lastChoEgg))));
}
if (centEgg) {
stats.appendChild(listing('Century Egg Multiplier', document.createTextNode((Math.round(CM.Cache.CentEgg * 100) / 100) + '%')));
stats.appendChild(listing('Century Egg Multiplier', document.createTextNode((Math.round((CM.Cache.CentEgg - 1) * 10000) / 100) + '%')));
}
}
}
+1 -1
View File
@@ -204,5 +204,5 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkB
CM.ConfigPrefix = 'CMConfig';
CM.VersionMajor = '2.002';
CM.VersionMinor = '1';
CM.VersionMinor = '2';