diff --git a/daedalus/Cargo.toml b/daedalus/Cargo.toml index 3190f9e09..3daee5cfc 100644 --- a/daedalus/Cargo.toml +++ b/daedalus/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daedalus" -version = "0.1.12" +version = "0.1.13" authors = ["Jai A "] edition = "2018" license = "MIT" diff --git a/daedalus_client/Cargo.toml b/daedalus_client/Cargo.toml index c7f1d2b65..cf925cfcb 100644 --- a/daedalus_client/Cargo.toml +++ b/daedalus_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daedalus_client" -version = "0.1.12" +version = "0.1.13" authors = ["Jai A "] edition = "2018" diff --git a/daedalus_client/src/fabric.rs b/daedalus_client/src/fabric.rs index 514252c96..fdc3cf46c 100644 --- a/daedalus_client/src/fabric.rs +++ b/daedalus_client/src/fabric.rs @@ -229,13 +229,23 @@ pub async fn retrieve_data( version.loaders.sort_by(|x, y| { list.loader .iter() - .position(|z| x.id == z.version) + .position(|z| { + x.id.split('-') + .next() + .unwrap_or_default() + == &*z.version + }) .unwrap_or_default() .cmp( &list .loader .iter() - .position(|z| y.id == z.version) + .position(|z| { + y.id.split('-') + .next() + .unwrap_or_default() + == z.version + }) .unwrap_or_default(), ) }) diff --git a/daedalus_client/src/forge.rs b/daedalus_client/src/forge.rs index a2fba717f..c0e841c5e 100644 --- a/daedalus_client/src/forge.rs +++ b/daedalus_client/src/forge.rs @@ -27,7 +27,6 @@ pub async fn retrieve_data( minecraft_versions: &VersionManifest, uploaded_files: &mut Vec, ) -> Result<(), Error> { - println!("forg"); let maven_metadata = fetch_maven_metadata(None).await?; let old_manifest = daedalus::modded::fetch_manifest(&*format_url(&*format!( "forge/v{}/manifest.json", @@ -98,7 +97,7 @@ pub async fn retrieve_data( "1.12.2-14.23.5.2851" ]; - if !WHITELIST.contains(&&*loader_version_full) { + if WHITELIST.contains(&&*loader_version_full) { return Ok(None); }