Merge branch 'upsilon-dev' of https://github.com/UpsilonNumworks/Upsilon

into upsilon-dev
AngeDieu · Nov 23, 2023 · 52bc616 · 52bc616
2 parents 458c931 + 9ac62c0
commit 52bc616
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp
@@ -38,7 +38,8 @@ const ToolboxMessageTree complexChildren[] = {
 
 const ToolboxMessageTree combinatoricsChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::BinomialCommandWithArg, I18n::Message::Combination),
-  ToolboxMessageTree::Leaf(I18n::Message::PermuteCommandWithArg, I18n::Message::Permutation)
+  ToolboxMessageTree::Leaf(I18n::Message::PermuteCommandWithArg, I18n::Message::Permutation),
+  ToolboxMessageTree::Leaf(I18n::Message::FactorialCommandWithArg, I18n::Message::Factorial)
 };
 
 const ToolboxMessageTree normalDistributionChildren[] = {

diff --git a/bootloader/boot.cpp b/bootloader/boot.cpp
@@ -107,7 +107,7 @@ void Boot::bootSlot(Bootloader::Slot s) {
   if (!s.userlandHeader()->isOmega() && !s.userlandHeader()->isUpsilon()) {
     // We are trying to boot epsilon, so we check the version and show an advertisement if needed
     const char * version = s.userlandHeader()->version();
-    const char * min = "21.2.1";
+    const char * min = "21.3.1";
     int versionSum = Utility::versionSum(version, strlen(version));
     int minimalVersionTrigger = Utility::versionSum(min, strlen(min));
     if (versionSum >= minimalVersionTrigger) {

diff --git a/bootloader/interface/static/messages.h b/bootloader/interface/static/messages.h
@@ -72,7 +72,7 @@ class Messages {
   constexpr static const char * aboutMessage4 = "and select the OS";
   constexpr static const char * aboutMessage5 = "to boot.";
 
-  constexpr static const char * bootloaderVersion = "Version 1.0.7 - FREED0M.21.2";
+  constexpr static const char * bootloaderVersion = "Version 1.0.8 - FREED0M.21.3";
 
   //USB NAMES
   constexpr static const char * usbUpsilonBootloader = "Upsilon Bootloader";