diff options
author | Martin Robertz <dream-master@gmx.net> | 2023-03-18 20:51:52 +0100 |
---|---|---|
committer | Martin Robertz <dream-master@gmx.net> | 2023-03-18 20:51:52 +0100 |
commit | 4159f36223a936528f43eaa4439281478a4314c2 (patch) | |
tree | a5b849e8c020fb4107953a5e10757bfd6828d82d /src/main/resources/assets | |
parent | 76adb65991f741ab39b418b130cb98c93c8cfb70 (diff) | |
download | GT5-Unofficial-4159f36223a936528f43eaa4439281478a4314c2.tar.gz GT5-Unofficial-4159f36223a936528f43eaa4439281478a4314c2.tar.bz2 GT5-Unofficial-4159f36223a936528f43eaa4439281478a4314c2.zip |
Revert "merge master (#1800)"
This reverts commit dafbaf22fd6bef1112143b80d35eae9c60880dfc.
Diffstat (limited to 'src/main/resources/assets')
-rw-r--r-- | src/main/resources/assets/gregtech/sounds.json | 20 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/sounds/buttonDown.ogg | bin | 7353 -> 0 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/sounds/buttonUp.ogg | bin | 9732 -> 0 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me.png | bin | 234 -> 0 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me_disabled.png | bin | 234 -> 0 bytes |
5 files changed, 0 insertions, 20 deletions
diff --git a/src/main/resources/assets/gregtech/sounds.json b/src/main/resources/assets/gregtech/sounds.json deleted file mode 100644 index dcf17b55bb..0000000000 --- a/src/main/resources/assets/gregtech/sounds.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 Binary files differdeleted file mode 100644 index d7dec32263..0000000000 --- a/src/main/resources/assets/gregtech/sounds/buttonDown.ogg +++ /dev/null diff --git a/src/main/resources/assets/gregtech/sounds/buttonUp.ogg b/src/main/resources/assets/gregtech/sounds/buttonUp.ogg Binary files differdeleted file mode 100644 index 9d498d6b74..0000000000 --- a/src/main/resources/assets/gregtech/sounds/buttonUp.ogg +++ /dev/null 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 Binary files differdeleted file mode 100644 index 0fa3f15e9f..0000000000 --- a/src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 2d8f2006e5..0000000000 --- a/src/main/resources/assets/gregtech/textures/gui/overlay_button/auto_pull_me_disabled.png +++ /dev/null |