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

18 files changed, 40 insertions, 0 deletions

diff --git a/src/main/resources/assets/tectech/sounds.json b/src/main/resources/assets/tectech/sounds.json
index 73c9e62808..c4049f5f02 100644
--- a/src/main/resources/assets/tectech/sounds.json
+++ b/src/main/resources/assets/tectech/sounds.json
@@ -3,5 +3,45 @@
     "category": "block",
     "subtitle": "tectech.subtitle.microwave_ding",
     "sounds": [{"name": "microwave_ding","stream": false}]
+  },
+  "fx_alarm": {
+    "category": "block",
+    "subtitle": "tectech.subtitle.fx_alarm",
+    "sounds": [{"name": "fx_alarm","stream": false}]
+  },
+  "fx_click": {
+    "category": "block",
+    "subtitle": "tectech.subtitle.fx_click",
+    "sounds": [{"name": "fx_click","stream": false}]
+  },
+  "fx_lo_freq": {
+    "category": "block",
+    "subtitle": "tectech.subtitle.fx_lo_freq",
+    "sounds": [{"name": "fx_lo_freq","stream": false}]
+  },
+  "fx_mid_freq": {
+    "category": "block",
+    "subtitle": "tectech.subtitle.fx_mid_freq",
+    "sounds": [{"name": "fx_mid_freq","stream": false}]
+  },
+  "fx_hi_freq": {
+    "category": "block",
+    "subtitle": "tectech.subtitle.fx_hi_freq",
+    "sounds": [{"name": "fx_hi_freq","stream": false}]
+  },
+  "fx_noise": {
+    "category": "block",
+    "subtitle": "tectech.subtitle.fx_noise",
+    "sounds": [{"name": "fx_noise","stream": false}]
+  },
+  "fx_woo_uu": {
+    "category": "block",
+    "subtitle": "tectech.subtitle.fx_woo_uu",
+    "sounds": [{"name": "fx_woo_uu","stream": false}]
+  },
+  "fx_whooum": {
+    "category": "block",
+    "subtitle": "tectech.subtitle.fx_whooum",
+    "sounds": [{"name": "fx_whooum","stream": false}]
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/tectech/sounds/fx_alarm.ogg b/src/main/resources/assets/tectech/sounds/fx_alarm.ogg
new file mode 100644
index 0000000000..6156f6b1eb
--- /dev/null
+++ b/src/main/resources/assets/tectech/sounds/fx_alarm.ogg
diff --git a/src/main/resources/assets/tectech/sounds/fx_click.ogg b/src/main/resources/assets/tectech/sounds/fx_click.ogg
new file mode 100644
index 0000000000..3211d0d12e
--- /dev/null
+++ b/src/main/resources/assets/tectech/sounds/fx_click.ogg
diff --git a/src/main/resources/assets/tectech/sounds/fx_hi_freq.ogg b/src/main/resources/assets/tectech/sounds/fx_hi_freq.ogg
new file mode 100644
index 0000000000..bb21d14ea5
--- /dev/null
+++ b/src/main/resources/assets/tectech/sounds/fx_hi_freq.ogg
diff --git a/src/main/resources/assets/tectech/sounds/fx_lo_freq.ogg b/src/main/resources/assets/tectech/sounds/fx_lo_freq.ogg
new file mode 100644
index 0000000000..8eab2d92e2
--- /dev/null
+++ b/src/main/resources/assets/tectech/sounds/fx_lo_freq.ogg
diff --git a/src/main/resources/assets/tectech/sounds/fx_mid_freq.ogg b/src/main/resources/assets/tectech/sounds/fx_mid_freq.ogg
new file mode 100644
index 0000000000..b16d1297f4
--- /dev/null
+++ b/src/main/resources/assets/tectech/sounds/fx_mid_freq.ogg
diff --git a/src/main/resources/assets/tectech/sounds/fx_noise.ogg b/src/main/resources/assets/tectech/sounds/fx_noise.ogg
new file mode 100644
index 0000000000..0bb3a58dc0
--- /dev/null
+++ b/src/main/resources/assets/tectech/sounds/fx_noise.ogg
diff --git a/src/main/resources/assets/tectech/sounds/fx_whooum.ogg b/src/main/resources/assets/tectech/sounds/fx_whooum.ogg
new file mode 100644
index 0000000000..4e9331924d
--- /dev/null
+++ b/src/main/resources/assets/tectech/sounds/fx_whooum.ogg
diff --git a/src/main/resources/assets/tectech/sounds/fx_woo_uu.ogg b/src/main/resources/assets/tectech/sounds/fx_woo_uu.ogg
new file mode 100644
index 0000000000..51a35371a1
--- /dev/null
+++ b/src/main/resources/assets/tectech/sounds/fx_woo_uu.ogg
diff --git a/src/main/resources/assets/tectech/textures/gui/scanDisplayItem.png b/src/main/resources/assets/tectech/textures/gui/scanDisplayItem.png
new file mode 100644
index 0000000000..dc9794a424
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/scanDisplayItem.png
diff --git a/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen1.png b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen1.png
new file mode 100644
index 0000000000..e1e659718c
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen1.png
diff --git a/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen2.png b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen2.png
new file mode 100644
index 0000000000..fd29923b87
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen2.png
diff --git a/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen3.png b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen3.png
new file mode 100644
index 0000000000..0dbe68fba6
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen3.png
diff --git a/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen4.png b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen4.png
new file mode 100644
index 0000000000..a9488280c1
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen4.png
diff --git a/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen5.png b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen5.png
new file mode 100644
index 0000000000..6cefaa0186
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen5.png
diff --git a/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen6.png b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen6.png
new file mode 100644
index 0000000000..90cb09abac
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen6.png
diff --git a/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen7.png b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen7.png
new file mode 100644
index 0000000000..6a11d2df4a
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen7.png
diff --git a/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen8.png b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen8.png
new file mode 100644
index 0000000000..bbe69099c2
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/scanDisplayScreen8.png