diff --git a/.gitignore b/.gitignore
index 51e89409a..dd8629d35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@ forge*changelog.txt
 /src/main/resources/assets/overdrive_that_matters/models/block/pattern/pattern_storage_pattern6.json
 /src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java
 /src/main/resources/assets/overdrive_that_matters/blockstates/pattern_storage.json
+/src/main/resources/assets/overdrive_that_matters/blockstates/matter_replicator.json
+/src/main/resources/assets/overdrive_that_matters/blockstates/matter_scanner.json
diff --git a/shapenator.js b/shapenator.js
index 7f81cd52e..f18cdd6a8 100644
--- a/shapenator.js
+++ b/shapenator.js
@@ -110,4 +110,34 @@ const facings = [
 	fs.writeFileSync(_root + 'blockstates/pattern_storage.json', JSON.stringify(blockstate, null, '\t'))
 }
 
+// Matter scanner
+{
+	const to_generate = ['matter_scanner', 'matter_replicator']
+	const states = ['idle', 'working', 'error']
+
+	for (const machine of to_generate) {
+		const blockstate = {
+			multipart: []
+		}
+
+		for (const face of facings) {
+			for (const state of states) {
+				blockstate.multipart.push({
+					when: {
+						facing: face.facing,
+						worker: state
+					},
+
+					apply: {
+						model: 'overdrive_that_matters:block/' + machine + '_' + state,
+						y: face.y ? face.y : undefined
+					}
+				});
+			}
+		}
+
+		fs.writeFileSync(_root + 'blockstates/' + machine + '.json', JSON.stringify(blockstate, null, '\t'))
+	}
+}
+
 process.stdout.write(`Generated data files in ${Date.now() - time}ms\n`)