Skip to content
This repository has been archived by the owner on Jun 7, 2024. It is now read-only.

Commit

Permalink
2.4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
NoozAbooz committed Oct 31, 2022
1 parent fcc8de0 commit 81ecd7d
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 15 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion debian/client-amd64
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Version: ${VERSION}
Architecture: amd64
Maintainer: Nooz <[email protected]>
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
2 changes: 1 addition & 1 deletion debian/client-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Version: ${VERSION}
Architecture: arm64
Maintainer: Nooz <[email protected]>
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
2 changes: 1 addition & 1 deletion debian/client-armhf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Version: ${VERSION}
Architecture: armhf
Maintainer: Nooz <[email protected]>
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
2 changes: 1 addition & 1 deletion debian/server-amd64
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: minecraft-pi-reborn-server
Version: ${VERSION}
Maintainer: Nooz <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion debian/server-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: minecraft-pi-reborn-server
Version: ${VERSION}
Maintainer: Nooz <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion debian/server-armhf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: minecraft-pi-reborn-server
Version: ${VERSION}
Maintainer: Nooz <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion dependencies/zenity/src
Submodule src updated from c9ff7f to 435bc1
6 changes: 6 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/MODDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion launcher/src/client/launcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion launcher/src/crash-report.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href=\"https://discord.gg/uUMCMAcFcF\">Discord server</a>! <i>If you believe this is a problem with " MCPI_APP_TITLE " itself, please upload this crash report to the #bugs Discord channel.</i>",
"--text", MCPI_APP_BASE_TITLE " has crashed!\n\nNeed help? Consider asking on the <a href=\"https://discord.gg/uUMCMAcFcF\">Discord server</a>! <i>If you believe this is a problem with " MCPI_APP_BASE_TITLE " itself, please upload this crash report to the #bugs Discord channel.</i>",
"--filename", log_filename,
"--no-wrap",
"--font", "Monospace",
Expand Down
2 changes: 1 addition & 1 deletion launcher/src/patchelf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions libreborn/src/util/exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 81ecd7d

Please sign in to comment.