Merge branch 'dev' into rc

c-api/core.cpp

@@ -2159,6 +2159,11 @@ uint64_t Core_GetServerTime(alt::ICore* core)
 {
     return core->GetServerTime();
 }
+
+uint8_t Core_ReloadVehiclePhysics(alt::ICore* core, uint32_t modelHash)
+{
+    return core->ReloadVehiclePhysics(modelHash);
+}
 #endif
 
 CAPI_END()

c-api/core.h

@@ -430,4 +430,6 @@ EXPORT_CLIENT void Core_RemoveVoiceFilter(alt::ICore* core, uint32_t playerRemod
 EXPORT_CLIENT alt::IAudioFilter* Core_GetVoiceFilter(alt::ICore* core, uint32_t playerRemodeId);
 EXPORT_CLIENT void Core_UpdateClipContext(alt::ICore* core, const char* keys[], const char* values[], uint64_t size);
 
-EXPORT_CLIENT uint64_t Core_GetServerTime(alt::ICore* core);
+EXPORT_CLIENT uint64_t Core_GetServerTime(alt::ICore* core);
+
+EXPORT_CLIENT uint8_t Core_ReloadVehiclePhysics(alt::ICore* core, uint32_t modelHash);

c-api/func_table.cpp

@@ -1,6 +1,6 @@
 #include "func_table.h"
 
-inline uint64_t capiHash = 78812385462098472UL;
+inline uint64_t capiHash = 4464148992254491289UL;
 inline uint64_t capiHashes[] = {
     0,
     #ifdef ALT_CLIENT_API
@@ -211,6 +211,7 @@ inline uint64_t capiHashes[] = {
     11543552066785919265UL,
     15255809094076439747UL,
     84574382701044016UL,
+    6341556497973967320UL,
     2950682702415179672UL,
     3186817815537256556UL,
     4203146524234440953UL,
@@ -1992,6 +1993,7 @@ inline void* capiPointers[] = {
     (void*) Core_OverrideFocusEntity,
     (void*) Core_OverrideFocusPosition,
     (void*) Core_RegisterFont,
+    (void*) Core_ReloadVehiclePhysics,
     (void*) Core_RemoveGXTText,
     (void*) Core_RemoveIpl,
     (void*) Core_RemoveVoiceFilter,

client/src/coreclr/CoreClr.cpp

@@ -195,7 +195,7 @@ uint8_t GetCachedAssembly(const char* name, int* bufferSize, void** buffer) {
     std::stringstream contentStream;
     auto fileName = std::string("lib/net6.0/") + name + ".dll";
     if (!zip.has_file(fileName)) {
-        cs::Log::Warning << "Nupkg was found, but no dll was found in it" << cs::Log::Endl;
+        cs::Log::Warning << "Nupkg was found, but no dll was found in it " << fileName << cs::Log::Endl;
         zip.printdir();
         return false;
     }

client/src/coreclr/CoreClrValidation.cpp

@@ -13,6 +13,7 @@ namespace fs = std::filesystem;
 
 std::string CoreClr::GetBaseCdnUrl() const {
     static auto branch = _core->GetBranch();
+    if (branch == "internal") branch = "dev";
     return "https://cdn.alt-mp.com/coreclr-client-module/" + branch + "/x64_win32/";
 }