Skip to content

Commit 1dc1b4a

Browse files
authored
Merge branch 'PixelGuys:master' into creativereach_setting
2 parents b74ba74 + d2aa614 commit 1dc1b4a

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

assets/cubyz/blocks/amber_block.zig.zon

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.{
2-
.tags = .{.mineable, .choppable},
3-
.blockHealth = 15,
2+
.tags = .{.mineable},
3+
.blockHealth = 30,
4+
.blockResistance = 3,
45
.drops = .{
56
.{.items = .{.auto}},
67
},

assets/cubyz/blocks/cut_amber_block.zig.zon

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.{
2-
.tags = .{.mineable, .choppable},
3-
.blockHealth = 15,
2+
.tags = .{.mineable},
3+
.blockHealth = 30,
4+
.blockResistance = 3,
45
.drops = .{
56
.{.items = .{.auto}},
67
},

assets/cubyz/blocks/gold_block.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.{
22
.tags = .{.mineable},
33
.blockHealth = 50,
4-
.blockResistance = 10,
4+
.blockResistance = 8.5,
55
.drops = .{
66
.{.items = .{.auto}},
77
},

assets/cubyz/blocks/iron_block.zig.zon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.{
22
.tags = .{.mineable},
3-
.blockHealth = 50,
4-
.blockResistance = 1,
3+
.blockHealth = 45,
4+
.blockResistance = 5,
55
.drops = .{
66
.{.items = .{.auto}},
77
},

assets/cubyz/blocks/silver_block.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.{
22
.tags = .{.mineable},
33
.blockHealth = 50,
4-
.blockResistance = 10,
4+
.blockResistance = 7,
55
.drops = .{
66
.{.items = .{.auto}},
77
},

assets/cubyz/blocks/uranium_block.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.{
22
.tags = .{.mineable},
33
.blockHealth = 50,
4-
.blockResistance = 1,
4+
.blockResistance = 17.5,
55
.drops = .{
66
.{.items = .{.auto}},
77
},

0 commit comments

Comments
 (0)