diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a2b66b..c3f776b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,8 @@ endif() set(MCPI_APP_ID "${DEFAULT_APP_ID}" CACHE STRING "App ID") # App Title -set(DEFAULT_APP_TITLE "MCPI-Reborn Extended") +set(MCPI_APP_BASE_TITLE "MCPI++" CACHE STRING "Base App Title") +set(DEFAULT_APP_TITLE "${MCPI_APP_BASE_TITLE}") if(MCPI_SERVER_MODE) string(APPEND DEFAULT_APP_TITLE " (Server)") else() diff --git a/debian/client-amd64 b/debian/client-amd64 index 2e246c6..86eebbe 100644 --- a/debian/client-amd64 +++ b/debian/client-amd64 @@ -3,7 +3,7 @@ Version: ${VERSION} Architecture: amd64 Maintainer: Nooz Description: Community mod of MCPI-Reborn -Homepage: https://github.com/mobilegmYT/mcpi-reborn-extended/ +Homepage: https://github.com/NoozSBC/mcpi-reborn-extended/ Depends: libc6, libstdc++6, libc6-armhf-cross, libstdc++6-armhf-cross, libgles1, libegl1, libglfw3 | libglfw3-wayland, libfreeimage3, libopenal1, python3-minecraftpi Section: games Priority: optional diff --git a/debian/client-arm64 b/debian/client-arm64 index 0a282be..612a369 100644 --- a/debian/client-arm64 +++ b/debian/client-arm64 @@ -3,7 +3,7 @@ Version: ${VERSION} Architecture: arm64 Maintainer: Nooz Description: Community mod of MCPI-Reborn -Homepage: https://github.com/mobilegmYT/mcpi-reborn-extended/ +Homepage: https://github.com/NoozSBC/mcpi-reborn-extended/ Depends: libc6, libstdc++6, libc6:armhf, libstdc++6:armhf, libgles1, libegl1, libglfw3 | libglfw3-wayland, libfreeimage3, libopenal1, python3-minecraftpi Section: games Priority: optional diff --git a/debian/client-armhf b/debian/client-armhf index bc6eb04..3129fc0 100644 --- a/debian/client-armhf +++ b/debian/client-armhf @@ -3,7 +3,7 @@ Version: ${VERSION} Architecture: armhf Maintainer: Nooz Description: Community mod of MCPI-Reborn -Homepage: https://github.com/mobilegmYT/mcpi-reborn-extended/ +Homepage: https://github.com/NoozSBC/mcpi-reborn-extended/ Depends: libc6, libstdc++6, libgles1, libegl1, libglfw3 | libglfw3-wayland, libfreeimage3, libopenal1, python3-minecraftpi Section: games Priority: optional diff --git a/debian/server-amd64 b/debian/server-amd64 index 1d1afa8..dadb50b 100644 --- a/debian/server-amd64 +++ b/debian/server-amd64 @@ -2,7 +2,7 @@ Package: minecraft-pi-reborn-server Version: ${VERSION} Maintainer: Nooz Description: Modded server for Minecraft Pi Edition -Homepage: https://github.com/mobilegmYT/mcpi-reborn-extended/ +Homepage: https://github.com/NoozSBC/mcpi-reborn-extended/ Architecture: amd64 Depends: libc6, libstdc++6, libc6-armhf-cross, libstdc++6-armhf-cross Section: games diff --git a/debian/server-arm64 b/debian/server-arm64 index 3c13dcd..30bc79d 100644 --- a/debian/server-arm64 +++ b/debian/server-arm64 @@ -2,7 +2,7 @@ Package: minecraft-pi-reborn-server Version: ${VERSION} Maintainer: Nooz Description: Modded server for Minecraft Pi Edition -Homepage: https://github.com/mobilegmYT/mcpi-reborn-extended/ +Homepage: https://github.com/NoozSBC/mcpi-reborn-extended/ Architecture: arm64 Depends: libc6, libstdc++6, libc6:armhf, libstdc++6:armhf Section: games diff --git a/debian/server-armhf b/debian/server-armhf index 5b013d0..c818bc6 100644 --- a/debian/server-armhf +++ b/debian/server-armhf @@ -2,7 +2,7 @@ Package: minecraft-pi-reborn-server Version: ${VERSION} Maintainer: Nooz Description: Modded server for Minecraft Pi Edition -Homepage: https://github.com/mobilegmYT/mcpi-reborn-extended/ +Homepage: https://github.com/NoozSBC/mcpi-reborn-extended/ Architecture: armhf Depends: libc6, libstdc++6 Section: games diff --git a/dependencies/zenity/src b/dependencies/zenity/src index c9ff7f1..435bc15 160000 --- a/dependencies/zenity/src +++ b/dependencies/zenity/src @@ -1 +1 @@ -Subproject commit c9ff7f17aa81d9d1566d426c87a184831ce4f7d9 +Subproject commit 435bc154ef8dcec8a3f126ed7f5198b7db32ea29 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 35d120d..f4de9fc 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog The changelog for every single MCPI v2 release is listed here. Under-the-hood modifications that don't effect the user experience are prefixed with "[INT]". +### **2.4.6-1** +* Fix Crash Report Log Saving + +### **2.4.6** + + ### **2.4.5** * Remove Coloured Terminal Output * Implemented Upstream Crash Dialog diff --git a/docs/MODDING.md b/docs/MODDING.md index 13d8b77..505daa2 100644 --- a/docs/MODDING.md +++ b/docs/MODDING.md @@ -25,7 +25,7 @@ __attribute__((constructor)) static void init() { This code will print "Helloworld" when loaded by MCPI-Reborn. ## ``libreborn.so`` API -Header files can be download from [Github](https://github.com/mobilegmYT/mcpi-reborn-extended/tree/source/libreborn/include/libreborn). +Header files can be download from [Github](https://github.com/NoozSBC/mcpi-reborn-extended/tree/source/libreborn/include/libreborn). ### ``void overwrite(void *start, void *target)`` This method replaces a function with another function. diff --git a/launcher/src/client/launcher.cpp b/launcher/src/client/launcher.cpp index 937a9e8..0f93139 100644 --- a/launcher/src/client/launcher.cpp +++ b/launcher/src/client/launcher.cpp @@ -99,7 +99,7 @@ static void run_command_and_set_env(const char *env_name, const char *command[]) } // Check Return Code if (!is_exit_status_success(return_code)) { - INFO("Launch Interrupted"); + // Launch Interrupted exit(EXIT_SUCCESS); } } diff --git a/launcher/src/crash-report.c b/launcher/src/crash-report.c index 4a61dd1..5ca7b95 100644 --- a/launcher/src/crash-report.c +++ b/launcher/src/crash-report.c @@ -34,7 +34,7 @@ static void show_report(const char *log_filename) { "--width", CRASH_REPORT_DIALOG_WIDTH, "--height", CRASH_REPORT_DIALOG_HEIGHT, "--text-info", - "--text", MCPI_APP_TITLE " has crashed!\n\nNeed help? Consider asking on the Discord server! If you believe this is a problem with " MCPI_APP_TITLE " itself, please upload this crash report to the #bugs Discord channel.", + "--text", MCPI_APP_BASE_TITLE " has crashed!\n\nNeed help? Consider asking on the Discord server! If you believe this is a problem with " MCPI_APP_BASE_TITLE " itself, please upload this crash report to the #bugs Discord channel.", "--filename", log_filename, "--no-wrap", "--font", "Monospace", diff --git a/launcher/src/patchelf.cpp b/launcher/src/patchelf.cpp index 8452f3d..3e8e9ce 100644 --- a/launcher/src/patchelf.cpp +++ b/launcher/src/patchelf.cpp @@ -75,7 +75,7 @@ static int dl_iterate_callback(struct dl_phdr_info *info, __attribute__((unused) for (int i = 0; i < info->dlpi_phnum; i++) { if (info->dlpi_phdr[i].p_type == PT_INTERP) { // Callback - *(char **) data = (char *) info->dlpi_phdr[i].p_vaddr; + *(char **) data = (char *) (info->dlpi_addr + info->dlpi_phdr[i].p_vaddr); } } } diff --git a/libreborn/src/util/exec.c b/libreborn/src/util/exec.c index 9e34717..b1aa21e 100644 --- a/libreborn/src/util/exec.c +++ b/libreborn/src/util/exec.c @@ -11,11 +11,11 @@ static void setenv_safe(const char *name, const char *value) { } } void set_and_print_env(const char *name, const char *value) { - // Print New Value - DEBUG("Set %s = %s", name, value != NULL ? value : "(unset)"); - // Set The Value setenv_safe(name, value); + + // Print New Value + DEBUG("Set %s = %s", name, value != NULL ? value : "(unset)"); } // Safe execvpe()