Merge remote-tracking branch 'origin/master' into master

2021-08-19 10:40:34 +07:00 · 2021-08-19 10:40:34 +07:00 · be47a36cc3
commit be47a36cc3
parent 9c3ef93695 0d27b058aa
4 changed files with 3 additions and 3 deletions
--- a/src/main/resources/assets/overdrive_that_matters/models/item/matter_decomposer.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/matter_decomposer.json
@ -1,3 +1,3 @@
 {
-	"parent": "overdrive_that_matters:block/matter_decomposer"
+	"parent": "overdrive_that_matters:block/matter_decomposer_working"
 }
--- a/src/main/resources/assets/overdrive_that_matters/models/item/matter_replicator.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/matter_replicator.json
@ -1,3 +1,3 @@
 {
-	"parent": "overdrive_that_matters:block/matter_replicator"
+	"parent": "overdrive_that_matters:block/matter_replicator_working"
 }
--- a/src/main/resources/assets/overdrive_that_matters/models/item/matter_scanner.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/matter_scanner.json
@ -1,3 +1,3 @@
 {
-	"parent": "overdrive_that_matters:block/matter_scanner"
+	"parent": "overdrive_that_matters:block/matter_scanner_working"
 }
--- a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative.png