diff --git a/assets/graphics/fonts/terrarum-sans-bitmap/hangul_johab.tga b/assets/graphics/fonts/terrarum-sans-bitmap/hangul_johab.tga index 409c2f1b1..0985c67eb 100644 --- a/assets/graphics/fonts/terrarum-sans-bitmap/hangul_johab.tga +++ b/assets/graphics/fonts/terrarum-sans-bitmap/hangul_johab.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:950a10788bf390449ed7d66a3a95ced56f2a9cd37c1be8341e27256c15abf9d1 +oid sha256:051d882623fcb5e14a2a32aed68b3090a76efc4044472d521a188fbf4fc1ad89 size 3588018 diff --git a/assets/mods/basegame/crafting/wires.json b/assets/mods/basegame/crafting/wires.json index fbbfb48e5..5ef5dfa58 100644 --- a/assets/mods/basegame/crafting/wires.json +++ b/assets/mods/basegame/crafting/wires.json @@ -32,37 +32,37 @@ "wire@basegame:8192": { /* signal wire red */ "workbench": "wirerollingmill", "ingredients": [ - [10, 1, "item@basegame:112"] /* 1 copper */ + [25, 1, "item@basegame:112"] /* 1 copper */ ] }, "wire@basegame:8193": { /* signal wire green */ "workbench": "wirerollingmill", "ingredients": [ - [10, 1, "item@basegame:112"] /* 1 copper */ + [25, 1, "item@basegame:112"] /* 1 copper */ ] }, "wire@basegame:8194": { /* signal wire blue */ "workbench": "wirerollingmill", "ingredients": [ - [10, 1, "item@basegame:112"] /* 1 copper */ + [25, 1, "item@basegame:112"] /* 1 copper */ ] }, "wire@basegame:8195": { /* signal wire yellow */ "workbench": "wirerollingmill", "ingredients": [ - [10, 1, "item@basegame:112"] /* 1 copper */ + [25, 1, "item@basegame:112"] /* 1 copper */ ] }, "wire@basegame:8196": { /* signal wire purple */ "workbench": "wirerollingmill", "ingredients": [ - [10, 1, "item@basegame:112"] /* 1 copper */ + [25, 1, "item@basegame:112"] /* 1 copper */ ] }, "item@basegame:50": { /* soldering wire */ "workbench": "wirerollingmill", "ingredients": [ - [10, 1, "item@basegame:181"] /* 1 solder bar */ + [25, 1, "item@basegame:181"] /* 1 solder bar */ ] }, diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt index 94a72e95f..f5a606b28 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt @@ -2256,7 +2256,7 @@ open class ActorWithBody : Actor { * Constants */ - @Transient const val METER = 24.0 + @Transient const val METER = 25.0 /** * [m / s^2] * SI_TO_GAME_ACC -> [px / InternalFrame^2] */