diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index 3ce5d3a51..055428aad 100644 --- a/assets/mods/basegame/items/items.tga +++ b/assets/mods/basegame/items/items.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1135ff2beb22d57e9453a1fc058071b54d62d7d79dd3bbfef61c98d4fdc7eab +oid sha256:95bc99089d2503ff9ed9bdf11c1ff54748590f6678d9164d7f134200dc2f2a64 size 2408466 diff --git a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt index 36716dca1..45a43191f 100644 --- a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt +++ b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt @@ -66,16 +66,16 @@ basegame * e.g. 0x02010034 will be translated as 2.1.52 * */ - const val VERSION_RAW: Long = 0x0000_000004_000000 + const val VERSION_RAW: Long = 0x0000_000004_000001 // Commit counts up to the Release 0.3.0: 2259 // Commit counts up to the Release 0.3.1: 2278 // Commit counts up to the Release 0.3.2: 2732 // Commit counts up to the Release 0.3.3: 3020 // Commit counts up to the Release 0.4.0: 3631 -// val VERSION_SNAPSHOT = Snapshot(0) // for normal dev + val VERSION_SNAPSHOT = Snapshot(0) // for normal dev // val VERSION_SNAPSHOT = ForcedSnapshot("24w07d") // for snapshot release - val VERSION_SNAPSHOT = null // for the release +// val VERSION_SNAPSHOT = null // for the release const val VERSION_TAG: String = "" diff --git a/src/net/torvald/terrarum/console/Authenticator.kt b/src/net/torvald/terrarum/console/Authenticator.kt index 8e5595619..218609212 100644 --- a/src/net/torvald/terrarum/console/Authenticator.kt +++ b/src/net/torvald/terrarum/console/Authenticator.kt @@ -15,7 +15,7 @@ import org.apache.commons.codec.digest.DigestUtils * - BE CRACKABLE (crackstation.net) * * Example passwords would be: - * aryll -> beedle -> ciela -> daruk -> ... -> linebeck -> mido -> navi -> ... + * aryll -> beedle -> ciela -> daruk -> epona -> ... -> linebeck -> mido -> navi -> ... * * Notes: * do NOT put plaintext anywhere in the code (except for comments maybe) @@ -36,7 +36,7 @@ internal object Authenticator : ConsoleCommand { // println("auth passwd: '$pwd'") // println("hash: $hashedPwd") - if ("c40232ae7b8020da3ab1449a015e7cc23f249a790856b63b1b69c6a5de019fed".equals(hashedPwd, ignoreCase = true)) { + if ("4a26c5cd64195c4a52d2e3770e56c1d0c65861d2a03b47f8ba5d25ca033b9c42".equals(hashedPwd, ignoreCase = true)) { // beedle val msg = if (a) "Locked" else "Authenticated" Echo(msg) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UICrafting.kt b/src/net/torvald/terrarum/modulebasegame/ui/UICrafting.kt index a43965f71..d2509d215 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UICrafting.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UICrafting.kt @@ -344,7 +344,7 @@ class UICrafting(val full: UIInventoryFull?) : UICanvas( addUIitem(spinnerCraftCount) addUIitem(buttonCraft) // temporarily disabled for 0.4 release - if (TerrarumAppConfiguration.VERSION_RAW >= 0x0000_000005_000000) { + if (TerrarumAppConfiguration.VERSION_RAW >= 0x0000_000004_000001) { addUIitem(menuButtonCraft) addUIitem(menuButtonTechView) } diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 5f3fbfb2c..4f6f42745 100644 --- a/work_files/graphics/items/basegame_items.kra +++ b/work_files/graphics/items/basegame_items.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7ed83fc39e033cb6fba1ba9e452408df5c9e53a5486ca367d38e282bbff48af -size 1357591 +oid sha256:39fe755507572d163467e5c6dd357937456cec87d505b76a325510c07f66edfd +size 1366750