Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xMAC94x/update' into 'master'

Browse Source 
run cargo update

See merge request veloren/veloren!4308
This commit is contained in:
Marcel 2024-02-06 18:08:26 +00:00
commit 9af1c4c310
2 changed files with 1031 additions and 866 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1894
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

3
common/src/calendar.rs
View File

@ -31,7 +31,8 @@ impl Calendar {
let now = match tz {
Some(tz) => {
let utc = Utc::now().naive_utc();
DateTime::<Tz>::from_utc(utc, tz.offset_from_utc_datetime(&utc)).naive_local()
DateTime::<Tz>::from_naive_utc_and_offset(utc, tz.offset_from_utc_datetime(&utc))
.naive_local()
},
None => Local::now().naive_local(),
};