Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/artillery.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/belts.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/combinators.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/constant_logistic_group.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/flipped_fluidboxes.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/fluidboxes/pumps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/fluidboxes/regular_pipes.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/fluidboxes/storagetanks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/fluidboxes/valves.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/gate_edgecase.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/heat.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/inserters.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/large_connectables/cargo_bays.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/large_connectables/fusion.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/parametrics.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/platform_hub.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/quality_chemplants.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/rail_things/elevated_rails.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/rail_things/long_train.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/rail_things/rail_signals.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/rail_things/rail_test_circle.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/rail_things/train_schedule.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/test_book.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/walls.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blueprint/tests/2.0/wires.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion factorio_datastage/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "factorio_datastage"
version = "0.6.0-2.0.72"
version = "0.6.0-2.0.73"
authors.workspace = true
edition.workspace = true

Expand Down
5 changes: 4 additions & 1 deletion factorio_datastage/defines.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- version: 2.0.72
-- version: 2.0.73
-- get defines by running "/c log(serpent.block(defines))"

return {
Expand Down Expand Up @@ -951,6 +951,9 @@ return {
logistic_member_index = {
car_provider = 2,
car_requester = 0,
cargo_landing_pad_provider = 1,
cargo_landing_pad_requester = 0,
cargo_landing_pad_trash_provider = 2,
character_provider = 2,
character_requester = 0,
character_storage = 1,
Expand Down
4 changes: 2 additions & 2 deletions factorio_datastage/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ enum LocalisedString {
Number(f64),
Boolean(bool),
// LuaObject(?),
Array(Vec<LocalisedString>),
Array(Vec<Self>),
}

impl FromLua for LocalisedString {
Expand Down Expand Up @@ -326,7 +326,7 @@ impl DataLoader {
let tmap = gmap.entry(typename.to_string_lossy()).or_default();

additions.for_each::<LuaValue, LuaString>(|_, id| {
tmap.insert(id.to_string_lossy(), mod_name.to_string());
tmap.insert(id.to_string_lossy(), mod_name.clone());
Ok(())
})?;
Ok(())
Expand Down
2 changes: 1 addition & 1 deletion factorio_datastage/src/require.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ fn require_relative(parts: &[String], data: &VmData) -> Option<(Vec<u8>, String,
};

let file_path = if folder.is_empty() {
parts[parts.len() - 1].to_string() + ".lua"
parts[parts.len() - 1].clone() + ".lua"
} else {
folder.clone() + "/" + &parts[parts.len() - 1] + ".lua"
};
Expand Down
2 changes: 1 addition & 1 deletion mod_util/src/any_basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub enum AnyBasic {
Bool(bool),
Number(f64),
Table(TagTable),
Array(Vec<AnyBasic>),
Array(Vec<Self>),
}

impl std::fmt::Display for AnyBasic {
Expand Down
4 changes: 2 additions & 2 deletions mod_util/src/mod_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ impl ModList {
let mut reqs = Vec::new();
for (name, version) in required {
let Some(info) = self.list.get(name) else {
return Err(ModListError::SolverMissingInfo(name.to_string()));
return Err(ModListError::SolverMissingInfo(name.clone()));
};

let info_versions = info.versions.keys().copied().collect::<Vec<_>>();
Expand All @@ -480,7 +480,7 @@ impl ModList {
}

let Some(version) = version.get_allowed_version(&info_versions) else {
return Err(ModListError::SolverMissingInfo(name.to_string()));
return Err(ModListError::SolverMissingInfo(name.clone()));
};

reqs.push((name.as_str(), *version));
Expand Down
2 changes: 1 addition & 1 deletion mod_util/src/mod_settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ impl SettingsDat {
buf.write_u8(0)?; // false bool

let data = PropertyTree::Dictionary(
vec![
[
(
"startup".to_owned(),
PropertyTree::Dictionary(self.startup.clone()),
Expand Down
4 changes: 2 additions & 2 deletions mod_util/src/property_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ pub enum PropertyTree {
Bool(bool),
Number(f64),
String(String),
List(Vec<PropertyTree>),
Dictionary(HashMap<String, PropertyTree>),
List(Vec<Self>),
Dictionary(HashMap<String, Self>),
SignedInteger(i64),
UnsignedInteger(u64),
}
Expand Down
2 changes: 1 addition & 1 deletion prototypes/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "prototypes"
version = "3.0.1-2.0.72"
version = "3.0.1-2.0.73"
authors.workspace = true
edition.workspace = true

Expand Down
2 changes: 1 addition & 1 deletion prototypes/src/entity/artillery_turret.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl super::Renderable for ArtilleryTurretData {
orientation: Some(
options
.orientation
.map_or_else(|| options.direction.to_orientation(), |o| o),
.unwrap_or_else(|| options.direction.to_orientation()),
),
..options.clone()
};
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion scanner/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use image::{ImageEncoder, codecs::png, imageops};
use imageproc::geometric_transformations::{self, rotate_about_center};
use serde::{Deserialize, Serialize};
use serde_with::skip_serializing_none;
use tracing::{debug, error, field, info, info_span, instrument, warn};
use tracing::{debug, field, info, info_span, instrument, warn};

use blueprint::{EntityExtraData, SignalID, SplitterPriority};
use mod_util::{
Expand Down Expand Up @@ -259,6 +259,7 @@ pub fn calculate_target_size(
}
}

#[expect(clippy::float_cmp, reason = "checking against initial values")]
if min_x == f64::MAX || min_y == f64::MAX || max_x == f64::MIN || max_y == f64::MIN {
return None;
}
Expand Down
Loading
Loading