From 75146ff2a575c09ed6f91ecc8ca3f6ba80e4b808 Mon Sep 17 00:00:00 2001 From: scardwell Date: Mon, 7 Aug 2023 08:17:40 -0600 Subject: [PATCH] advanceInternal is now called with the ship's timeflow as a multiplier --- combatactivators.version | 2 +- jars/CombatActivators.jar | Bin 47700 -> 47809 bytes mod_info.json | 2 +- src/activators/ActivatorManager.kt | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/combatactivators.version b/combatactivators.version index 61db155..d3308fb 100644 --- a/combatactivators.version +++ b/combatactivators.version @@ -6,6 +6,6 @@ { "major":1, "minor":1, - "patch":0 + "patch":1 } } \ No newline at end of file diff --git a/jars/CombatActivators.jar b/jars/CombatActivators.jar index 4d79801b30d367ba428975ff4f1014993c29c352..0a4ba0770a15522e0e613d72589f7d705454d50f 100644 GIT binary patch delta 4716 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 delta 4548 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