-
Notifications
You must be signed in to change notification settings - Fork 187
Change log rotation to be more similar to branches, and also remove log_top #1496
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
IntegratedQuantum
merged 28 commits into
PixelGuys:master
from
OneAvargeCoder193:log_rotation
Jun 1, 2025
Merged
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
01f5732
log_new
OneAvargeCoder193 9944ce7
placeholder birch textures
OneAvargeCoder193 d036138
fix intersection
OneAvargeCoder193 e9c62f6
fix bug where only dots would show cut texture
OneAvargeCoder193 db8a096
thing
OneAvargeCoder193 59a6d84
fixes to logs
OneAvargeCoder193 01d714d
thing
OneAvargeCoder193 60b698b
thing
OneAvargeCoder193 7075b1b
remove half_line from logs
OneAvargeCoder193 771e46d
fix texture alignment issues
OneAvargeCoder193 d4a5bd7
make birch top and log drop log/birch as part of migrations
OneAvargeCoder193 10308dd
format
OneAvargeCoder193 5b839d8
fix small alignment issues
OneAvargeCoder193 4ce34b4
fix
OneAvargeCoder193 6fa0f80
format
OneAvargeCoder193 95a7b8d
change some recipes
OneAvargeCoder193 2abf116
Oak and mahogany texuters
careeoki 596dd0f
Pine and willow
careeoki 87de544
Baobab and birch + tweask
careeoki 0f9804c
remove replacement and opaque
OneAvargeCoder193 14ce0ef
Cactus and bolete
careeoki 52936ef
Toadstool and glimmergill
careeoki a39c0a6
Merge pull request #6 from careeoki/so-many-log
OneAvargeCoder193 c84e3c2
add migrations
OneAvargeCoder193 4189843
formatting
OneAvargeCoder193 e4f3554
stuff
OneAvargeCoder193 6cbe667
fixes
OneAvargeCoder193 138e9a3
fixes
OneAvargeCoder193 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| .{ | ||
| .tags = .{.sbbChild}, | ||
| .model = "cubyz:cube", | ||
| .rotation = .log, | ||
| .rotation = .direction, | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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", | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.