diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | mm/2s2h/BenGui/BenMenu.cpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 920907d44..9f2a9fbde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,10 +5,10 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version") set(GAME_STR "MM") -project(2s2h VERSION 2.0.1 LANGUAGES C CXX) +project(2s2h VERSION 3.0.0 LANGUAGES C CXX) include(CMake/2ship-cvars.cmake) include(CMake/lus-cvars.cmake) -set(PROJECT_BUILD_NAME "Rena Bravo" CACHE STRING "" FORCE) +set(PROJECT_BUILD_NAME "Mion Alfa" CACHE STRING "" FORCE) set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "" FORCE) execute_process( diff --git a/mm/2s2h/BenGui/BenMenu.cpp b/mm/2s2h/BenGui/BenMenu.cpp index 7ad19d54b..43c71124c 100644 --- a/mm/2s2h/BenGui/BenMenu.cpp +++ b/mm/2s2h/BenGui/BenMenu.cpp @@ -206,9 +206,10 @@ WidgetInfo& BenMenu::AddWidget(WidgetPath& pathInfo, std::string widgetName, Wid return widget; } -// Last generated with the following command on 05/19/2025 +// Last generated with the following command on 10/30/2025. The gap in commits is so that cherry-picks from other repos +// do not get mixed in. // clang-format off -// git shortlog -sn 2332f63f5a9ca4b949f029c11a9744d601d7155f..HEAD | sed -E 's/^[[:space:]]*[0-9]+[[:space:]]+/"/' | sed -E 's/(.+)/\1",/' +// { git shortlog -sn 2332f63..558f59b ; git shortlog -sn dfcc80e..HEAD; } | sort -k2 | uniq -f1 | sed -E 's/^[[:space:]]*[0-9]+[[:space:]]+/"/' | sed -E 's/(.+)/\1",/' // clang-format on std::vector<std::string> contributors = { "ProxySaw", // "Garrett Cox", manual replacement @@ -262,6 +263,8 @@ std::vector<std::string> contributors = { "justawayofthesamurai", "verbes4", "ammar sadaoui", + "Mrlinkwii", + "Corbin Park", }; void BenMenu::AddSettings() { |