Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
01f5732
log_new
OneAvargeCoder193 May 22, 2025
9944ce7
placeholder birch textures
OneAvargeCoder193 May 23, 2025
d036138
fix intersection
OneAvargeCoder193 May 23, 2025
e9c62f6
fix bug where only dots would show cut texture
OneAvargeCoder193 May 23, 2025
db8a096
thing
OneAvargeCoder193 May 23, 2025
59a6d84
fixes to logs
OneAvargeCoder193 May 23, 2025
01d714d
thing
OneAvargeCoder193 May 23, 2025
60b698b
thing
OneAvargeCoder193 May 23, 2025
7075b1b
remove half_line from logs
OneAvargeCoder193 May 24, 2025
771e46d
fix texture alignment issues
OneAvargeCoder193 May 24, 2025
d4a5bd7
make birch top and log drop log/birch as part of migrations
OneAvargeCoder193 May 24, 2025
10308dd
format
OneAvargeCoder193 May 24, 2025
5b839d8
fix small alignment issues
OneAvargeCoder193 May 25, 2025
4ce34b4
fix
OneAvargeCoder193 May 25, 2025
6fa0f80
format
OneAvargeCoder193 May 25, 2025
95a7b8d
change some recipes
OneAvargeCoder193 May 25, 2025
2abf116
Oak and mahogany texuters
careeoki May 26, 2025
596dd0f
Pine and willow
careeoki May 26, 2025
87de544
Baobab and birch + tweask
careeoki May 27, 2025
0f9804c
remove replacement and opaque
OneAvargeCoder193 May 27, 2025
14ce0ef
Cactus and bolete
careeoki May 28, 2025
52936ef
Toadstool and glimmergill
careeoki May 29, 2025
a39c0a6
Merge pull request #6 from careeoki/so-many-log
OneAvargeCoder193 May 29, 2025
c84e3c2
add migrations
OneAvargeCoder193 May 29, 2025
4189843
formatting
OneAvargeCoder193 May 29, 2025
e4f3554
stuff
OneAvargeCoder193 May 30, 2025
6cbe667
fixes
OneAvargeCoder193 May 31, 2025
138e9a3
fixes
OneAvargeCoder193 Jun 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/baobab_log.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/baobab"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:baobab_log",
.texture_top = "cubyz:baobab_log_top",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/baobab_top.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/baobab"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:baobab_log",
.texture_top = "cubyz:baobab_log",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/birch_log.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/birch"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:birch_log",
.texture_top = "cubyz:birch_log_top",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/birch_top.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/birch"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:birch_log",
.texture_top = "cubyz:birch_log",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/bolete_stem.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 4,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/bolete"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:bolete_stem",
}
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/cactus.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.leaf},
.blockHealth = 5,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/cactus"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:cactus",
.texture_top = "cubyz:cactus_top",
Expand Down
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/cactus_flower.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.alwaysViewThrough = true,
.absorbedLight = 0x121012,
.model = "cubyz:cactus_flower",
.rotation = .log,
.rotation = .direction,
.texture = "cubyz:cactus_flower",
.texture_top = "cubyz:cactus_flower_top",
.texture_bottom = "cubyz:cactus_flower_top",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/glimmergill_stem.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 4,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/glimmergill"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:glimmergill_stem",
}
9 changes: 9 additions & 0 deletions assets/cubyz/blocks/log/_defaults.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.drops = .{
.{.items = .{.auto}},
},
.rotation = .log,
.model = "cubyz:cube",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/log/baobab.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.texture0 = "cubyz:log/baobab/dot",
.texture1 = "cubyz:log/baobab/line",
.texture2 = "cubyz:log/baobab/bend",
.texture3 = "cubyz:log/baobab/intersection",
.texture4 = "cubyz:log/baobab/cross",
.texture5 = "cubyz:log/baobab/top",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/log/birch.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.texture0 = "cubyz:log/birch/dot",
.texture1 = "cubyz:log/birch/line",
.texture2 = "cubyz:log/birch/bend",
.texture3 = "cubyz:log/birch/intersection",
.texture4 = "cubyz:log/birch/cross",
.texture5 = "cubyz:log/birch/top",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/log/bolete.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.texture0 = "cubyz:log/bolete/dot",
.texture1 = "cubyz:log/bolete/line",
.texture2 = "cubyz:log/bolete/bend",
.texture3 = "cubyz:log/bolete/intersection",
.texture4 = "cubyz:log/bolete/cross",
.texture5 = "cubyz:log/bolete/top",
}
9 changes: 9 additions & 0 deletions assets/cubyz/blocks/log/cactus.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.{
.tags = .{.leaf},
.texture0 = "cubyz:log/cactus/dot",
.texture1 = "cubyz:log/cactus/line",
.texture2 = "cubyz:log/cactus/bend",
.texture3 = "cubyz:log/cactus/intersection",
.texture4 = "cubyz:log/cactus/cross",
.texture5 = "cubyz:log/cactus/top",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/log/glimmergill.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.texture0 = "cubyz:log/glimmergill/dot",
.texture1 = "cubyz:log/glimmergill/line",
.texture2 = "cubyz:log/glimmergill/bend",
.texture3 = "cubyz:log/glimmergill/intersection",
.texture4 = "cubyz:log/glimmergill/cross",
.texture5 = "cubyz:log/glimmergill/top",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/log/mahogany.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.texture0 = "cubyz:log/mahogany/dot",
.texture1 = "cubyz:log/mahogany/line",
.texture2 = "cubyz:log/mahogany/bend",
.texture3 = "cubyz:log/mahogany/intersection",
.texture4 = "cubyz:log/mahogany/cross",
.texture5 = "cubyz:log/mahogany/top",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/log/oak.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.texture0 = "cubyz:log/oak/dot",
.texture1 = "cubyz:log/oak/line",
.texture2 = "cubyz:log/oak/bend",
.texture3 = "cubyz:log/oak/intersection",
.texture4 = "cubyz:log/oak/cross",
.texture5 = "cubyz:log/oak/top",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/log/pine.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.texture0 = "cubyz:log/pine/dot",
.texture1 = "cubyz:log/pine/line",
.texture2 = "cubyz:log/pine/bend",
.texture3 = "cubyz:log/pine/intersection",
.texture4 = "cubyz:log/pine/cross",
.texture5 = "cubyz:log/pine/top",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/log/toadstool.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.texture0 = "cubyz:log/toadstool/dot",
.texture1 = "cubyz:log/toadstool/line",
.texture2 = "cubyz:log/toadstool/bend",
.texture3 = "cubyz:log/toadstool/intersection",
.texture4 = "cubyz:log/toadstool/cross",
.texture5 = "cubyz:log/toadstool/top",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/log/willow.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.texture0 = "cubyz:log/willow/dot",
.texture1 = "cubyz:log/willow/line",
.texture2 = "cubyz:log/willow/bend",
.texture3 = "cubyz:log/willow/intersection",
.texture4 = "cubyz:log/willow/cross",
.texture5 = "cubyz:log/willow/top",
}
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/mahogany_log.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/mahogany"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:mahogany_log",
.texture_top = "cubyz:mahogany_log_top",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/mahogany_top.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/mahogany"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:mahogany_log",
.texture_top = "cubyz:mahogany_log",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/oak_log.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/oak"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:oak_log",
.texture_top = "cubyz:oak_log_top",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/oak_top.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/oak"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:oak_log",
.texture_top = "cubyz:oak_log",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/pine_log.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/pine"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:pine_log",
.texture_top = "cubyz:pine_log_top",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/pine_top.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/pine"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:pine_log",
.texture_top = "cubyz:pine_log",
Expand Down
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/sbb/child/_defaults.zig.zon
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.{
.tags = .{.sbbChild},
.model = "cubyz:cube",
.rotation = .log,
.rotation = .direction,
}
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/sbb/origin.zig.zon
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.{
.tags = .{.sbbOrigin},
.model = "cubyz:cube",
.rotation = .log,
.rotation = .direction,
.texture = "cubyz:sbb/origin_side",
.texture_top = "cubyz:sbb/origin_top",
.texture_bottom = "cubyz:sbb/origin_bottom",
Expand Down
Binary file added assets/cubyz/blocks/textures/log/baobab/bend.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/baobab/cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/baobab/dot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/baobab/line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/baobab/top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/birch/bend.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/birch/cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/birch/dot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/birch/line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/birch/top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/bolete/bend.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/bolete/cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/bolete/dot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/bolete/line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/bolete/top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/cactus/bend.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/cactus/cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/cactus/dot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/cactus/line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/cactus/top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cubyz/blocks/textures/log/glimmergill/dot.png
Binary file added assets/cubyz/blocks/textures/log/glimmergill/top.png
Binary file added assets/cubyz/blocks/textures/log/mahogany/bend.png
Binary file added assets/cubyz/blocks/textures/log/mahogany/cross.png
Binary file added assets/cubyz/blocks/textures/log/mahogany/dot.png
Binary file added assets/cubyz/blocks/textures/log/mahogany/line.png
Binary file added assets/cubyz/blocks/textures/log/mahogany/top.png
Binary file added assets/cubyz/blocks/textures/log/oak/bend.png
Binary file added assets/cubyz/blocks/textures/log/oak/cross.png
Binary file added assets/cubyz/blocks/textures/log/oak/dot.png
Binary file added assets/cubyz/blocks/textures/log/oak/line.png
Binary file added assets/cubyz/blocks/textures/log/oak/top.png
Binary file added assets/cubyz/blocks/textures/log/pine/bend.png
Binary file added assets/cubyz/blocks/textures/log/pine/cross.png
Binary file added assets/cubyz/blocks/textures/log/pine/dot.png
Binary file added assets/cubyz/blocks/textures/log/pine/line.png
Binary file added assets/cubyz/blocks/textures/log/pine/top.png
Binary file added assets/cubyz/blocks/textures/log/toadstool/bend.png
Binary file added assets/cubyz/blocks/textures/log/toadstool/cross.png
Binary file added assets/cubyz/blocks/textures/log/toadstool/dot.png
Binary file added assets/cubyz/blocks/textures/log/toadstool/line.png
Binary file added assets/cubyz/blocks/textures/log/toadstool/top.png
Binary file added assets/cubyz/blocks/textures/log/willow/bend.png
Binary file added assets/cubyz/blocks/textures/log/willow/cross.png
Binary file added assets/cubyz/blocks/textures/log/willow/dot.png
Binary file added assets/cubyz/blocks/textures/log/willow/line.png
Binary file added assets/cubyz/blocks/textures/log/willow/top.png
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/toadstool_stem.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 4,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/toadstool"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:toadstool_stem",
}
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/willow_log.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/willow"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:willow_log",
.texture_top = "cubyz:willow_log_top",
Expand Down
5 changes: 3 additions & 2 deletions assets/cubyz/blocks/willow_top.zig.zon
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.{
.tags = .{.wood},
.blockHealth = 8,
.hasItem = false,
.drops = .{
.{.items = .{.auto}},
.{.items = .{"cubyz:log/willow"}},
},
.rotation = .log,
.rotation = .direction,
.model = "cubyz:cube",
.texture = "cubyz:willow_log",
.texture_top = "cubyz:willow_log",
Expand Down
Loading