Add modules to items, upgrades the can persist through combinations

src/Dodge/Default/Weapon.hs

@@ -100,6 +100,9 @@ defaultGun = Item
     , _itTargeting = Nothing
     , _itParams = NoParams
     , _itTweaks = NoTweaks
+    , _itModules = ItemModules
+        { _modHitEffect = DefaultModule
+        }
     }
 defaultCraftable :: Item
 defaultCraftable = Item 
@@ -122,6 +125,7 @@ defaultCraftable = Item
     , _itParams = NoParams
     , _itDimension = defItDimCol green
     , _itTweaks = NoTweaks
+    , _itModules = ItemModules BlockedModule
     }
 defItDim :: ItemDimension
 defItDim = ItemDimension

src/Dodge/Default/World.hs

@@ -87,7 +87,7 @@ defaultWorld = World
     , _worldBounds = defaultBounds
     , _maybeWorld = Nothing'
     , _rewindWorlds = []
-    , _rewinding = NotRewinding
+    , _timeFlow = NormalTimeFlow
     , _lSelHammerPosition = HammerUp
     , _worldTerminal = Nothing'
     }