Synchronize changes from 1.6 master branch [ci skip]

e33bf1c Bump net module version after dede110
4138edb Remove objcopy for libmysqlclient.a
82e5e55 Update client en_US pot

Author: github-actions[bot]

Shared/sdk/version.h

@@ -108,8 +108,8 @@
 
 #define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR)
 #define _NETCODE_VERSION_BRANCH_ID      0x4         // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
-#define _CLIENT_NET_MODULE_VERSION      0x0B3       // (0x000 - 0xfff) Lvl9 wizards only
-#define _SERVER_NET_MODULE_VERSION      0x0AC       // (0x000 - 0xfff) Lvl9 wizards only
+#define _CLIENT_NET_MODULE_VERSION      0x0B4       // (0x000 - 0xfff) Lvl9 wizards only
+#define _SERVER_NET_MODULE_VERSION      0x0AD       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1DC       // (0x000 - 0xfff) Increment when net messages change (pre-release)
 
 // (0x000 - 0xfff) Update bitstream.h when net messages change (post-release). (Changing will also require additional backward compatibility code).

utils/docker/Dockerfile

@@ -55,10 +55,8 @@ COPY compat /compat
 
 RUN set -ex ;\
     mkdir -p /compat/x64 /compat/x86 ;\
-    objcopy --redefine-syms=/compat/glibc_version_x64.redef "$(gcc      --print-file-name=libstdc++.a)"   /compat/x64/libstdc++.a      ;\
-    objcopy --redefine-syms=/compat/glibc_version_x86.redef "$(gcc -m32 --print-file-name=libstdc++.a)"   /compat/x86/libstdc++.a      ;\
-    objcopy --redefine-syms=/compat/glibc_version_x64.redef "/usr/lib/x86_64-linux-gnu/libmysqlclient.a"  /compat/x64/libmysqlclient.a ;\
-    objcopy --redefine-syms=/compat/glibc_version_x86.redef "/usr/lib/i386-linux-gnu/libmysqlclient.a"    /compat/x86/libmysqlclient.a
+    objcopy --redefine-syms=/compat/glibc_version_x64.redef "$(gcc      --print-file-name=libstdc++.a)"   /compat/x64/libstdc++.a ;\
+    objcopy --redefine-syms=/compat/glibc_version_x86.redef "$(gcc -m32 --print-file-name=libstdc++.a)"   /compat/x86/libstdc++.a 
 
 VOLUME  /build
 WORKDIR /build