-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New coloured blocks palette, Chalk and glass (#340)
* Create chalk folder * Add chalk * Delete temp file * Create chalk texture folder * Add chalk textures * Delete assets/cubyz/blocks/glass/light_blue.json * Delete assets/cubyz/blocks/glass/dark_green.json * Delete assets/cubyz/blocks/glass/dark_red.json * Delete assets/cubyz/blocks/glass/dark_gray.json * Delete assets/cubyz/blocks/glass/gray.json * Updated glass colous * Delete assets/cubyz/blocks/textures/glass/black.png_absorption.png * Delete assets/cubyz/blocks/textures/glass/blue.png_absorption.png * Delete assets/cubyz/blocks/textures/glass/brown.png_absorption.png * Delete assets/cubyz/blocks/textures/glass/cyan.png_absorption.png * Delete assets/cubyz/blocks/textures/glass/dark_gray.png * Delete assets/cubyz/blocks/textures/glass/dark_gray.png_absorption.png * Delete assets/cubyz/blocks/textures/glass/dark_gray.png_reflectivity.png * Delete assets/cubyz/blocks/textures/glass/dark_green.png * Delete assets/cubyz/blocks/textures/glass/dark_green.png_absorption.png * Delete assets/cubyz/blocks/textures/glass/dark_green.png_reflectivity.png * Delete assets/cubyz/blocks/textures/glass/dark_red.png * Delete assets/cubyz/blocks/textures/glass/dark_red.png_absorption.png * Delete assets/cubyz/blocks/textures/glass/dark_red.png_reflectivity.png * Delete assets/cubyz/blocks/textures/glass/gray.png_absorption.png * Delete assets/cubyz/blocks/textures/glass/gray.png * Delete assets/cubyz/blocks/textures/glass/gray.png_reflectivity.png * Delete assets/cubyz/blocks/textures/glass/light_blue.png * Delete assets/cubyz/blocks/textures/glass/light_blue.png_absorption.png * Delete assets/cubyz/blocks/textures/glass/light_blue.png_reflectivity.png * Update glass textures * Reduce saturation of Chalk
- Loading branch information
Showing
105 changed files
with
433 additions
and
188 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 |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/aqua" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/black" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/blue" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/brown" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/crimson" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/cyan" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/dark_grey" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/green" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/grey" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/indigo" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/lime" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/magenta" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/orange" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/pink" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/purple" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/red" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/violet" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/viridian" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/white" | ||
| } |
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,10 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 6, | ||
| "drops" : [ | ||
| "auto" | ||
| ], | ||
| "model" : "cube", | ||
| "rotation" : "stairs", | ||
| "texture" : "cubyz:chalk/yellow" | ||
| } |
22 changes: 11 additions & 11 deletions
22
assets/cubyz/blocks/glass/dark_gray.json → assets/cubyz/blocks/glass/aqua.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 |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xbbbbbb, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/dark_gray" | ||
| } | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xe95825, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/aqua" | ||
| } |
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,11 +1,11 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xffffff, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/black" | ||
| } | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xe6e6e6, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/black" | ||
| } |
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,11 +1,11 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xffff01, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/blue" | ||
| } | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xdc923c, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/blue" | ||
| } |
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,11 +1,11 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0x80b0ff, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/brown" | ||
| } | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0x96bdd8, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/brown" | ||
| } |
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,11 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0x69e4e1, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/crimson" | ||
| } |
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,11 +1,11 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xff0102, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/cyan" | ||
| } | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xc62031, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/cyan" | ||
| } |
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,11 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xacacac, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/dark_grey" | ||
| } |
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,11 +1,11 @@ | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xff01ff, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/green" | ||
| } | ||
| { | ||
| "class" : "stone", | ||
| "hardness" : 2, | ||
| "drops" : [ | ||
| "none" | ||
| ], | ||
| "transparent" : true, | ||
| "absorbedLight" : 0xd966d9, | ||
| "model" : "cube", | ||
| "texture" : "cubyz:glass/green" | ||
| } |
Oops, something went wrong.