Merge branch 'master' of gitlab.com:DBotThePony/overdrive-that-matters into master

2021-08-31 19:45:20 +07:00 · 2021-08-31 19:45:20 +07:00 · 4f8aaaa019
commit 4f8aaaa019
parent 4aef68fed6 a30e6dcb9b
2 changed files with 8 additions and 0 deletions
--- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_error.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_error.json
@ -0,0 +1,8 @@
+{
+	"parent": "overdrive_that_matters:block/matter_decomposer_working",
+	"texture_size": [64, 64],
+	"textures": {
+		"texture": "overdrive_that_matters:block/matter_decomposer_offline",
+		"particle": "overdrive_that_matters:block/matter_decomposer_offline"
+	}
+}
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/carbon_fibre_block.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/carbon_fibre_block.png