eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix fmt

Browse Source
This commit is contained in:
Jai A
2024-10-21 13:21:56 -07:00
parent 5605910ac8
commit 70bf61a645
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/daedalus_client/src/forge.rs
View File

@@ -1,6 +1,4 @@
use crate::util::{ use crate::util::{download_file, fetch_json, fetch_xml, format_url};
download_file, fetch_json, fetch_xml, format_url,
};
use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile}; use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile};
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use daedalus::get_path_from_artifact; use daedalus::get_path_from_artifact;

3
packages/daedalus/src/modded.rs
View File

@@ -155,7 +155,8 @@ pub fn merge_partial_version(
downloads: merge.downloads, downloads: merge.downloads,
id: partial.id.replace(DUMMY_REPLACE_STRING, &merge_id), id: partial.id.replace(DUMMY_REPLACE_STRING, &merge_id),
java_version: merge.java_version, java_version: merge.java_version,
libraries: libraries.into_iter() libraries: libraries
.into_iter()
.chain(partial.libraries) .chain(partial.libraries)
.map(|mut x| { .map(|mut x| {
x.name = x.name.replace(DUMMY_REPLACE_STRING, &merge_id); x.name = x.name.replace(DUMMY_REPLACE_STRING, &merge_id);