diff --git a/assets/mods/basegame/crafting/tools.json b/assets/mods/basegame/crafting/tools.json index 3d7fb0909..f6881d762 100644 --- a/assets/mods/basegame/crafting/tools.json +++ b/assets/mods/basegame/crafting/tools.json @@ -1,62 +1,62 @@ { "item@basegame:14": { /* wooden pick */ "workbench": "basiccrafting", - "ingredients": [[1, 6, "$WOOD", 2, "item@basegame:18"]] /* 6 woods, 2 sticks */ + "ingredients": [[1, 5, "$WOOD", 2, "item@basegame:18"]] /* 5 woods, 2 sticks */ }, /*"item@basegame:22": { "workbench": "basiccrafting", - "ingredients": [[1, 6, "$WOOD", 2, "item@basegame:18"]] + "ingredients": [[1, 5, "$WOOD", 2, "item@basegame:18"]] },*/ "item@basegame:15": { /* wooden mallet */ "workbench": "basiccrafting", - "ingredients": [[1, 6, "$WOOD", 2, "item@basegame:18"]] + "ingredients": [[1, 5, "$WOOD", 2, "item@basegame:18"]] }, "item@basegame:23": { /* stone pick */ "workbench": "basiccrafting", - "ingredients": [[1, 6, "$ROCK", 2, "item@basegame:18"]] + "ingredients": [[1, 5, "$ROCK", 2, "item@basegame:18"]] }, "item@basegame:24": { /* stone axe */ "workbench": "basiccrafting", - "ingredients": [[1, 6, "$ROCK", 2, "item@basegame:18"]] + "ingredients": [[1, 5, "$ROCK", 2, "item@basegame:18"]] }, "item@basegame:1": { /* copper pick */ "workbench": "basiccrafting,metalworking", - "ingredients": [[1, 6, "item@basegame:112", 2, "item@basegame:18"]] /* 6 bars, 2 sticks */ + "ingredients": [[1, 5, "item@basegame:112", 2, "item@basegame:18"]] /* 5 bars, 2 sticks */ }, "item@basegame:2": { /* iron pick */ "workbench": "basiccrafting,metalworking", - "ingredients": [[1, 6, "item@basegame:113", 2, "item@basegame:18"]] /* 6 bars, 2 sticks */ + "ingredients": [[1, 5, "item@basegame:113", 2, "item@basegame:18"]] /* 5 bars, 2 sticks */ }, "item@basegame:3": { /* steel pick */ "workbench": "basiccrafting,metalworking", - "ingredients": [[1, 6, "item@basegame:26", 2, "item@basegame:18"]] /* 6 bars, 2 sticks */ + "ingredients": [[1, 5, "item@basegame:26", 2, "item@basegame:18"]] /* 5 bars, 2 sticks */ }, "item@basegame:12": { /* copper sledgehammer */ "workbench": "basiccrafting,metalworking", - "ingredients": [[1, 6, "item@basegame:112", 2, "item@basegame:18"]] /* 6 bars, 2 sticks */ + "ingredients": [[1, 5, "item@basegame:112", 2, "item@basegame:18"]] /* 5 bars, 2 sticks */ }, "item@basegame:4": { /* iron sledgehammer */ "workbench": "basiccrafting,metalworking", - "ingredients": [[1, 6, "item@basegame:113", 2, "item@basegame:18"]] /* 6 bars, 2 sticks */ + "ingredients": [[1, 5, "item@basegame:113", 2, "item@basegame:18"]] /* 5 bars, 2 sticks */ }, "item@basegame:13": { /* steel sledgehammer */ "workbench": "basiccrafting,metalworking", - "ingredients": [[1, 6, "item@basegame:26", 2, "item@basegame:18"]] /* 6 bars, 2 sticks */ + "ingredients": [[1, 5, "item@basegame:26", 2, "item@basegame:18"]] /* 5 bars, 2 sticks */ }, "item@basegame:19": { /* copper sledgehammer */ "workbench": "basiccrafting,metalworking", - "ingredients": [[1, 6, "item@basegame:112", 2, "item@basegame:18"]] /* 6 bars, 2 sticks */ + "ingredients": [[1, 5, "item@basegame:112", 2, "item@basegame:18"]] /* 5 bars, 2 sticks */ }, "item@basegame:20": { /* iron sledgehammer */ "workbench": "basiccrafting,metalworking", - "ingredients": [[1, 6, "item@basegame:113", 2, "item@basegame:18"]] /* 6 bars, 2 sticks */ + "ingredients": [[1, 5, "item@basegame:113", 2, "item@basegame:18"]] /* 5 bars, 2 sticks */ }, "item@basegame:21": { /* steel sledgehammer */ "workbench": "basiccrafting,metalworking", - "ingredients": [[1, 6, "item@basegame:26", 2, "item@basegame:18"]] /* 6 bars, 2 sticks */ + "ingredients": [[1, 5, "item@basegame:26", 2, "item@basegame:18"]] /* 5 bars, 2 sticks */ }, "item@basegame:9": { /* wire cutter */ "workbench": "basiccrafting,metalworking", diff --git a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt index eb25d4140..fe0e2a40b 100644 --- a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt +++ b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt @@ -75,6 +75,7 @@ basegame // 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 + // Commit counts up to the Release 0.4.1: 3??? val VERSION_SNAPSHOT = Snapshot(0) // for normal dev // val VERSION_SNAPSHOT = ForcedSnapshot("24w07d") // for snapshot release