Index: binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- binaries/data/mods/public/gui/credits/texts/programming.json
+++ binaries/data/mods/public/gui/credits/texts/programming.json
@@ -145,6 +145,7 @@
 				{ "nick": "joskar", "name": "Johnny Oskarsson" },
 				{ "nick": "jP_wanN", "name": "Jonas Platte" },
 				{ "nick": "jprahman", "name": "Jason Rahman" },
+				{ "nick": "jpshack", "name": "John-Mason Shackelford" },
 				{ "nick": "Jubalbarca", "name": "James Baillie" },
 				{ "nick": "JubJub", "name": "Sebastian Vetter" },
 				{ "nick": "jurgemaister" },
Index: libraries/osx/build-osx-libs.sh
===================================================================
--- libraries/osx/build-osx-libs.sh
+++ libraries/osx/build-osx-libs.sh
@@ -24,7 +24,7 @@
 CURL_VERSION="curl-7.71.0"
 ICONV_VERSION="libiconv-1.16"
 XML2_VERSION="libxml2-2.9.10"
-SDL2_VERSION="SDL2-2.0.18"
+SDL2_VERSION="SDL2-2.26.5"
 # NOTE: remember to also update LIB_URL below when changing version
 BOOST_VERSION="boost_1_76_0"
 # NOTE: remember to also update LIB_URL below when changing version
Index: libraries/source/fcollada/include/FUtils/Platforms.h
===================================================================
--- libraries/source/fcollada/include/FUtils/Platforms.h
+++ libraries/source/fcollada/include/FUtils/Platforms.h
@@ -129,9 +129,6 @@
 inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; }
 inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; }
 inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; }
-#ifndef isinf
-#define isinf __isinff
-#endif
 #define _stricmp strcasecmp
 #define _getcwd getcwd
 #define _chdir chdir
Index: libraries/source/fcollada/src/FCollada/FUtils/Platforms.h
===================================================================
--- libraries/source/fcollada/src/FCollada/FUtils/Platforms.h
+++ libraries/source/fcollada/src/FCollada/FUtils/Platforms.h
@@ -129,9 +129,6 @@
 inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; }
 inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; }
 inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; }
-#ifndef isinf
-#define isinf __isinff
-#endif
 #define _stricmp strcasecmp
 #define _getcwd getcwd
 #define _chdir chdir