-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
improved witch, villager, creeper, vine, grass, all wood/logs/planks,…
… podzol, lilac; add bone item, fix carpet items
- Loading branch information
Showing
425 changed files
with
981 additions
and
477 deletions.
There are no files selected for viewing
This file contains 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,52 +1,7 @@ | ||
| { | ||
| "variants": { | ||
| "age=0": { | ||
| "model": "block/sugar_cane_stage1" | ||
| }, | ||
| "age=1": { | ||
| "": { | ||
| "model": "block/sugar_cane_stage0" | ||
| }, | ||
| "age=2": { | ||
| "model": "block/sugar_cane_stage0" | ||
| }, | ||
| "age=3": { | ||
| "model": "block/sugar_cane_stage0" | ||
| }, | ||
| "age=4": { | ||
| "model": "block/sugar_cane_stage0" | ||
| }, | ||
| "age=5": { | ||
| "model": "block/sugar_cane_stage0" | ||
| }, | ||
| "age=6": { | ||
| "model": "block/sugar_cane_stage0" | ||
| }, | ||
| "age=7": { | ||
| "model": "block/sugar_cane_stage0" | ||
| }, | ||
| "age=8": { | ||
| "model": "block/sugar_cane_stage0" | ||
| }, | ||
| "age=9": { | ||
| "model": "block/sugar_cane_stage0" | ||
| }, | ||
| "age=10": { | ||
| "model": "block/sugar_cane_stage0" | ||
| }, | ||
| "age=11": { | ||
| "model": "block/sugar_cane_stage1" | ||
| }, | ||
| "age=12": { | ||
| "model": "block/sugar_cane_stage1" | ||
| }, | ||
| "age=13": { | ||
| "model": "block/sugar_cane_stage1" | ||
| }, | ||
| "age=14": { | ||
| "model": "block/sugar_cane_stage1" | ||
| }, | ||
| "age=15": { | ||
| "model": "block/sugar_cane_stage1" | ||
| } | ||
| } | ||
| } |
This file contains 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.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
Binary file modified
BIN
-1.04 KB
(78%)
src-models/assets/minecraft/optifine/ctm/jungle_leaves/1/base.xcf
Binary file not shown.
13 changes: 4 additions & 9 deletions
13
src-models/assets/minecraft/optifine/ctm/jungle_leaves/1/mat.yml
This file contains 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
File renamed without changes
File renamed without changes
6 changes: 3 additions & 3 deletions
6
src-models/assets/minecraft/optifine/ctm/jungle_leaves/2/mat.yml
This file contains 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
File renamed without changes
This file contains 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 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 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,59 @@ | ||
| { | ||
| "variants": { | ||
| "axis=y": [ | ||
| { | ||
| "model": "block/birch_log" | ||
| }, | ||
| { | ||
| "model": "block/birch_log", | ||
| "y": 90 | ||
| }, | ||
| { | ||
| "model": "block/birch_log", | ||
| "y": 180 | ||
| }, | ||
| { | ||
| "model": "block/birch_log", | ||
| "y": 270 | ||
| } | ||
| ], | ||
| "axis=z": [ | ||
| { | ||
| "model": "block/birch_log_horizontal", | ||
| "y": 90 | ||
| }, | ||
| { | ||
| "model": "block/birch_log_horizontal", | ||
| "y": 90, | ||
| "x": 90 | ||
| }, | ||
| { | ||
| "model": "block/birch_log_horizontal", | ||
| "y": 90, | ||
| "x": 180 | ||
| }, | ||
| { | ||
| "model": "block/birch_log_horizontal", | ||
| "y": 90, | ||
| "x": 270 | ||
| } | ||
| ], | ||
| "axis=x": [ | ||
| { | ||
| "model": "block/birch_log_horizontal" | ||
| }, | ||
| { | ||
| "model": "block/birch_log_horizontal", | ||
| "x": 90 | ||
| }, | ||
| { | ||
| "model": "block/birch_log_horizontal", | ||
| "x": 180 | ||
| }, | ||
| { | ||
| "model": "block/birch_log_horizontal", | ||
| "x": 270 | ||
| } | ||
| ] | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains 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,59 @@ | ||
| { | ||
| "variants": { | ||
| "axis=y": [ | ||
| { | ||
| "model": "block/oak_log" | ||
| }, | ||
| { | ||
| "model": "block/oak_log", | ||
| "y": 90 | ||
| }, | ||
| { | ||
| "model": "block/oak_log", | ||
| "y": 180 | ||
| }, | ||
| { | ||
| "model": "block/oak_log", | ||
| "y": 270 | ||
| } | ||
| ], | ||
| "axis=z": [ | ||
| { | ||
| "model": "block/oak_log_horizontal", | ||
| "y": 90 | ||
| }, | ||
| { | ||
| "model": "block/oak_log_horizontal", | ||
| "y": 90, | ||
| "x": 90 | ||
| }, | ||
| { | ||
| "model": "block/oak_log_horizontal", | ||
| "y": 90, | ||
| "x": 180 | ||
| }, | ||
| { | ||
| "model": "block/oak_log_horizontal", | ||
| "y": 90, | ||
| "x": 270 | ||
| } | ||
| ], | ||
| "axis=x": [ | ||
| { | ||
| "model": "block/oak_log_horizontal" | ||
| }, | ||
| { | ||
| "model": "block/oak_log_horizontal", | ||
| "x": 90 | ||
| }, | ||
| { | ||
| "model": "block/oak_log_horizontal", | ||
| "x": 180 | ||
| }, | ||
| { | ||
| "model": "block/oak_log_horizontal", | ||
| "x": 270 | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains 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 @@ | ||
| { | ||
| "parent": "block/cube_column_horizontal2", | ||
| "textures": { | ||
| "end": "block/birch_log_top", | ||
| "side": "block/birch_log" | ||
| } | ||
| } |
This file contains 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,6 @@ | ||
| { | ||
| "parent": "block/cube_all", | ||
| "textures": { | ||
| "all": "block/birch_wood" | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
src/assets/minecraft/models/block/cube_column_horizontal2.json
This file contains 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 @@ | ||
| { | ||
| "parent": "block/block", | ||
| "textures": { | ||
| "particle": "#side" | ||
| }, | ||
| "elements": [ | ||
| { "from": [ 0, 0, 0 ], | ||
| "to": [ 16, 16, 16 ], | ||
| "faces": { | ||
| "down": { "texture": "#side", "cullface": "down", "rotation": 90 }, | ||
| "up": { "texture": "#side", "cullface": "up", "rotation": 90 }, | ||
| "north": { "texture": "#side", "cullface": "north", "rotation": 90 }, | ||
| "south": { "texture": "#side", "cullface": "south", "rotation": 90 }, | ||
| "west": { "texture": "#end", "cullface": "west" }, | ||
| "east": { "texture": "#end", "cullface": "east" } | ||
| } | ||
| } | ||
| ] | ||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains 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,7 +1,6 @@ | ||
| { | ||
| "parent": "block/cube_column", | ||
| "parent": "block/cube_all", | ||
| "textures": { | ||
| "end": "block/jungle_wood", | ||
| "side": "block/jungle_wood" | ||
| "all": "block/jungle_wood" | ||
| } | ||
| } |
This file contains 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 @@ | ||
| { | ||
| "parent": "block/cube_column_horizontal2", | ||
| "textures": { | ||
| "end": "block/oak_log_top", | ||
| "side": "block/oak_log" | ||
| } | ||
| } |
This file contains 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,6 @@ | ||
| { | ||
| "parent": "block/cube_all", | ||
| "textures": { | ||
| "all": "block/oak_wood" | ||
| } | ||
| } |
This file contains 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 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,6 @@ | ||
| { | ||
| "parent": "block/carpet", | ||
| "textures": { | ||
| "wool": "block/black_wool" | ||
| } | ||
| } |
Oops, something went wrong.