-
Notifications
You must be signed in to change notification settings - Fork 187
Add coniferous trees the way I like them #1377
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 10 commits into
PixelGuys:master
from
Argmaster:feature/coniferous
Jun 17, 2025
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
39a86da
Add coniferous trees the way I like them
Argmaster 666e58d
Fix toadstool extension
Argmaster 1611a56
Merge remote-tracking branch 'origin/master' into feature/coniferous
Argmaster 40af2b9
Merge remote-tracking branch 'origin/master' into feature/coniferous
Argmaster 8f93e4b
More better?
Argmaster 5d3a154
Add young trees
Argmaster f77669d
Equalize tree proportions
Argmaster 96ebc81
Decorations?
Argmaster 1806e4c
Remove toadstool from extenders
Argmaster c895a30
Halve bolete spawn rates
Argmaster 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
Binary file not shown.
Binary file not shown.
Binary file not shown.
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,7 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/0", | ||
| .children = .{ | ||
| .white = .{.{.structure = null}}, | ||
| .black = .{.{.structure = null}}, | ||
| }, | ||
| } |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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,11 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/stem/extender/0", | ||
| .children = .{ | ||
| .white = .{ | ||
| .{.structure = "cubyz:tree/coniferous/roots/alone/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/roots/alone/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/roots/alone/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/roots/alone/3"}, | ||
| }, | ||
| }, | ||
| } |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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,12 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/stem/extender/0", | ||
| .children = .{ | ||
| .white = .{ | ||
| .{.structure = "cubyz:tree/coniferous/sapling/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/sapling/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/sapling/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/sapling/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/sapling/4"}, | ||
| }, | ||
| }, | ||
| } |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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,15 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/0", | ||
| .children = .{ | ||
| .white = .{ | ||
| .{.structure = "cubyz:tree/coniferous/stem/extender/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/stem/extender/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/stem/extender/3"}, | ||
| }, | ||
| .black = .{ | ||
| .{.structure = "cubyz:tree/coniferous/roots/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/roots/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/roots/2"}, | ||
| }, | ||
| }, | ||
| } |
Binary file not shown.
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,19 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/stem/3/0", | ||
| .children = .{ | ||
| .white = .{ | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/2"}, | ||
| }, | ||
| .red = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/2/0"}, | ||
| }, | ||
| .orange = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/3/0"}, | ||
| }, | ||
| .yellow = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/4/0"}, | ||
| }, | ||
| }, | ||
| } |
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,19 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/stem/3/0", | ||
| .children = .{ | ||
| .white = .{ | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/2"}, | ||
| }, | ||
| .red = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/2/0"}, | ||
| }, | ||
| .orange = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/3/0"}, | ||
| }, | ||
| .yellow = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/4/0"}, | ||
| }, | ||
| }, | ||
| } |
Binary file not shown.
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,27 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/stem/5/0", | ||
| .children = .{ | ||
| .white = .{ | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/6/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/6/1"}, | ||
| }, | ||
| .purple = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/2/0"}, | ||
| }, | ||
| .crimson = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/3/0"}, | ||
| }, | ||
| .red = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/4/0"}, | ||
| }, | ||
| .orange = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/5/0"}, | ||
| }, | ||
| .yellow = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/2/0"}, | ||
| }, | ||
| }, | ||
| } |
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,27 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/stem/5/0", | ||
| .children = .{ | ||
| .white = .{ | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/6/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/6/1"}, | ||
| }, | ||
| .purple = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/2/0"}, | ||
| }, | ||
| .crimson = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/3/0"}, | ||
| }, | ||
| .red = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/4/0"}, | ||
| }, | ||
| .orange = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/5/0"}, | ||
| }, | ||
| .yellow = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/lushy/6/0"}, | ||
| }, | ||
| }, | ||
| } |
Binary file not shown.
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,49 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/stem/5/1", | ||
| .children = .{ | ||
| .white = .{ | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/2"}, | ||
| }, | ||
| .purple = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/4"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/5"}, | ||
| }, | ||
| .crimson = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/4"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/5"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/6"}, | ||
| }, | ||
| .red = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/4"}, | ||
| }, | ||
| .orange = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/1/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/1/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/4"}, | ||
| }, | ||
| .yellow = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/1/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/1/1"}, | ||
| .{.structure = null}, | ||
| }, | ||
| }, | ||
| } |
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,48 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/stem/5/1", | ||
| .children = .{ | ||
| .white = .{ | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/2"}, | ||
| }, | ||
| .purple = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/4"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/5"}, | ||
| }, | ||
| .crimson = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/4"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/5"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/6"}, | ||
| }, | ||
| .red = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/4"}, | ||
| }, | ||
| .orange = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/6/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/6/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/6/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/6/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/6/4"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/6/5"}, | ||
| }, | ||
| .yellow = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/1/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/1/1"}, | ||
| .{.structure = null}, | ||
| }, | ||
| }, | ||
| } |
Binary file not shown.
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,49 @@ | ||
| .{ | ||
| .blueprint = "cubyz:tree/coniferous/stem/5/2", | ||
| .children = .{ | ||
| .white = .{ | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/4/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/tip/5/2"}, | ||
| }, | ||
| .purple = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/4"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/5"}, | ||
| }, | ||
| .crimson = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/4"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/5"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/4/6"}, | ||
| }, | ||
| .red = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/5/4"}, | ||
| }, | ||
| .orange = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/1/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/1/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/1"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/2"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/3"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/2/4"}, | ||
| }, | ||
| .yellow = .{ | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/1/0"}, | ||
| .{.structure = "cubyz:tree/coniferous/branch/average/1/1"}, | ||
| .{.structure = null}, | ||
| }, | ||
| }, | ||
| } |
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.