From 7a4922087afa1d18b63a1459d78471c24557eab0 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 18 Mar 2023 20:52:28 +0100 Subject: Revert "Revert "merge master (#1800)"" This reverts commit 4159f36223a936528f43eaa4439281478a4314c2. --- src/main/resources/assets/gregtech/sounds.json | 20 ++++++++++++++++++++ .../resources/assets/gregtech/sounds/buttonDown.ogg | Bin 0 -> 7353 bytes .../resources/assets/gregtech/sounds/buttonUp.ogg | Bin 0 -> 9732 bytes .../textures/gui/overlay_button/auto_pull_me.png | Bin 0 -> 234 bytes .../gui/overlay_button/auto_pull_me_disabled.png | Bin 0 -> 234 bytes 5 files changed, 20 insertions(+) create mode 100644 src/main/resources/assets/gregtech/sounds.json create mode 100644 src/main/resources/assets/gregtech/sounds/buttonDown.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/buttonUp.ogg create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me_disabled.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/sounds.json b/src/main/resources/assets/gregtech/sounds.json new file mode 100644 index 0000000000..dcf17b55bb --- /dev/null +++ b/src/main/resources/assets/gregtech/sounds.json @@ -0,0 +1,20 @@ +{ + "gui.buttonDown": { + "category": "block", + "sounds": [ + { + "name": "buttonDown", + "stream": false + } + ] + }, + "gui.buttonUp": { + "category": "block", + "sounds": [ + { + "name": "buttonUp", + "stream": false + } + ] + } +} diff --git a/src/main/resources/assets/gregtech/sounds/buttonDown.ogg b/src/main/resources/assets/gregtech/sounds/buttonDown.ogg new file mode 100644 index 0000000000..d7dec32263 Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/buttonDown.ogg differ diff --git a/src/main/resources/assets/gregtech/sounds/buttonUp.ogg b/src/main/resources/assets/gregtech/sounds/buttonUp.ogg new file mode 100644 index 0000000000..9d498d6b74 Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/buttonUp.ogg differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me.png new file mode 100644 index 0000000000..0fa3f15e9f Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me_disabled.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me_disabled.png new file mode 100644 index 0000000000..2d8f2006e5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me_disabled.png differ -- cgit