Merge branch 'dev'

nedex · Feb 24, 2023 · a098c40 · a098c40
2 parents 7665c24 + 1e50800
commit a098c40
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -17,6 +17,11 @@
       "type": "shell",
       "command": "make clean",
       "problemMatcher": ["$gcc"]
+    },
+    {
+      "label": "Docker make",
+      "type": "shell",
+      "command": "docker run --rm -v ${PWD}:/${workspaceFolderBasename} -w /${workspaceFolderBasename} devkitpro/devkita64 make clean && make"
     }
   ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.2.7] - 2023-02-24
+
+### Updated
+
+- libtesla @ [b32acbc](https://github.com/WerWolv/libtesla/commit/b32acbca64c78bf37bc456bd386cd6b7148842c81)
+
 ## [1.2.6] - 2022-09-22
 
 ### Added
@@ -63,6 +69,7 @@ Thanks to [@DarkMatterCore](https://github.com/DarkMatterCore)!
 
 - First release
 
+[1.2.7]: https://github.com/nedex/QuickNTP/compare/1.2.6...1.2.7
 [1.2.6]: https://github.com/nedex/QuickNTP/compare/1.2.5...1.2.6
 [1.2.5]: https://github.com/nedex/QuickNTP/compare/1.2.1...1.2.5
 [1.2.1]: https://github.com/nedex/QuickNTP/compare/1.2.0...1.2.1

diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 #   NACP building is skipped as well.
 #---------------------------------------------------------------------------------
 APP_TITLE	:=	QuickNTP
-APP_VERSION :=	1.2.6
+APP_VERSION :=	1.2.7
 
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build

diff --git a/libs/libtesla b/libs/libtesla
diff --git a/source/main.cpp b/source/main.cpp
@@ -131,7 +131,7 @@ class NtpGui : public tsl::Gui {
                serverNames(vectorPairKeys(NTPSERVERS)) {}
 
     virtual tsl::elm::Element* createUI() override {
-        auto frame = new tsl::elm::CustomOverlayFrame("QuickNTP", "by NedEX - v1.2.6");
+        auto frame = new tsl::elm::CustomOverlayFrame("QuickNTP", "by NedEX - v1.2.7");
 
         auto list = new tsl::elm::List();