diff options
| author | Martin Robertz <dream-master@gmx.net> | 2022-10-01 12:38:45 +0200 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2022-10-01 12:38:45 +0200 |
| commit | 83a59b8babdccf6eb29967a52cda15c6bc2fd8c9 (patch) | |
| tree | 3c850aecc7916c02ceeebbc6ac000c6b7ad8fbba /src/main/resources | |
| parent | 1f68b3430593b9bdec6bf3c96dcafe1eb9cf730c (diff) | |
| parent | 0268d287a9d165899ff456b674d56ba10d382d81 (diff) | |
| download | GT5-Unofficial-83a59b8babdccf6eb29967a52cda15c6bc2fd8c9.tar.gz GT5-Unofficial-83a59b8babdccf6eb29967a52cda15c6bc2fd8c9.tar.bz2 GT5-Unofficial-83a59b8babdccf6eb29967a52cda15c6bc2fd8c9.zip | |
Merge branch 'advanced_redstone_covers'
# Conflicts:
# src/main/java/gregtech/api/util/GT_Utility.java
Diffstat (limited to 'src/main/resources')
23 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ADVANCED_REDSTONE_RECEIVER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ADVANCED_REDSTONE_RECEIVER.png Binary files differnew file mode 100644 index 0000000000..206047ad36 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ADVANCED_REDSTONE_RECEIVER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ADVANCED_REDSTONE_TRANSMITTER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ADVANCED_REDSTONE_TRANSMITTER.png Binary files differnew file mode 100644 index 0000000000..2d2ec5fe79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ADVANCED_REDSTONE_TRANSMITTER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_MAINTENANCE_DETECTOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_MAINTENANCE_DETECTOR.png Binary files differnew file mode 100644 index 0000000000..7ed1d9178e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_MAINTENANCE_DETECTOR.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_REDSTONE_RECEIVER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_REDSTONE_RECEIVER.png Binary files differnew file mode 100644 index 0000000000..e6ddc3002e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_REDSTONE_RECEIVER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_REDSTONE_TRANSMITTER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_REDSTONE_TRANSMITTER.png Binary files differnew file mode 100644 index 0000000000..d7d1c8a4b5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_REDSTONE_TRANSMITTER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_WIRELESS_FLUID_DETECTOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_WIRELESS_FLUID_DETECTOR.png Binary files differnew file mode 100644 index 0000000000..766671d5bf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_WIRELESS_FLUID_DETECTOR.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_WIRELESS_ITEM_DETECTOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_WIRELESS_ITEM_DETECTOR.png Binary files differnew file mode 100644 index 0000000000..0fe7a164d6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_WIRELESS_ITEM_DETECTOR.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_WIRELESS_MAINTENANCE_DETECTOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_WIRELESS_MAINTENANCE_DETECTOR.png Binary files differnew file mode 100644 index 0000000000..4cc9679888 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_WIRELESS_MAINTENANCE_DETECTOR.png diff --git a/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png b/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png Binary files differindex ce0652d14a..d621e199c3 100644 --- a/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png +++ b/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png diff --git a/src/main/resources/assets/gregtech/textures/gui/GuiCoverBig.png b/src/main/resources/assets/gregtech/textures/gui/GuiCoverBig.png Binary files differnew file mode 100644 index 0000000000..e835ea7e12 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/GuiCoverBig.png diff --git a/src/main/resources/assets/gregtech/textures/gui/GuiCoverLong.png b/src/main/resources/assets/gregtech/textures/gui/GuiCoverLong.png Binary files differnew file mode 100644 index 0000000000..1b9a18f691 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/GuiCoverLong.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/741.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/741.png Binary files differindex c986ab738c..d5d8f25f35 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/741.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/741.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/742.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/742.png Binary files differindex c7b141b32b..d5d8f25f35 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/742.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/742.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/746.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/746.png Binary files differindex 14feeb8947..b49d621131 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/746.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/746.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/747.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/747.png Binary files differindex 7f8b3fcb37..b49d621131 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/747.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/747.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/748.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/748.png Binary files differindex c986ab738c..dbd57d68e3 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/748.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/748.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/577.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/577.png Binary files differnew file mode 100644 index 0000000000..09df66bdeb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/577.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/578.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/578.png Binary files differnew file mode 100644 index 0000000000..09df66bdeb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/578.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/579.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/579.png Binary files differnew file mode 100644 index 0000000000..1d6d781628 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/579.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/580.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/580.png Binary files differnew file mode 100644 index 0000000000..1d6d781628 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/580.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/581.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/581.png Binary files differnew file mode 100644 index 0000000000..8f79c8f74a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/581.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/582.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/582.png Binary files differnew file mode 100644 index 0000000000..13d6380747 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/582.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/583.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/583.png Binary files differnew file mode 100644 index 0000000000..5326a6ed66 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/583.png |
