Merge branch 'master' into notan

keeping things up to date. lets not have any annoying conflicts to fix later.
2023-10-05 04:30:23 +01:00 · 2023-10-05 04:30:23 +01:00 · bb775761de
commit bb775761de
parent 139e718fd1 46bbe14bea
14 changed files with 703 additions and 5 deletions
--- a/src/saveload_system.rs
+++ b/src/saveload_system.rs
@ -101,6 +101,7 @@ pub fn save_game(ecs: &mut World) {
            IdentifiedItem,
            InBackpack,
            InflictsDamage,
+            IntrinsicChanged,
            Intrinsics,
            Item,
            Key,
@ -238,6 +239,7 @@ pub fn load_game(ecs: &mut World) {
            IdentifiedItem,
            InBackpack,
            InflictsDamage,
+            IntrinsicChanged,
            Intrinsics,
            Item,
            Key,