diff options
author | Tec <daniel112092@gmail.com> | 2022-02-02 17:52:12 +0100 |
---|---|---|
committer | Tec <daniel112092@gmail.com> | 2022-02-02 17:55:11 +0100 |
commit | b4530cdb125cfdea042b1af9622bf554029c8800 (patch) | |
tree | 552858f821e46fc70f1c03010c9efcec63b65105 /src/main/resources/assets/tectech/textures | |
parent | 091b97f7cc183f43fa03049f29e3bd985458e754 (diff) | |
parent | 719fdf6f550c0ab9c69eedefed55aefbf5a07187 (diff) | |
download | GT5-Unofficial-b4530cdb125cfdea042b1af9622bf554029c8800.tar.gz GT5-Unofficial-b4530cdb125cfdea042b1af9622bf554029c8800.tar.bz2 GT5-Unofficial-b4530cdb125cfdea042b1af9622bf554029c8800.zip |
Merge branch 'develop' into OrbitalAffinity
# Conflicts:
# src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
Diffstat (limited to 'src/main/resources/assets/tectech/textures')
-rw-r--r-- | src/main/resources/assets/tectech/textures/items/itemCapacitorLuV.png | bin | 0 -> 570 bytes |
-rw-r--r-- | src/main/resources/assets/tectech/textures/items/itemCapacitorZPM.png | bin | 0 -> 563 bytes |
-rw-r--r-- | src/main/resources/assets/tectech/textures/items/itemEnderFluidLinkCover.png | bin | 0 -> 574 bytes |
-rw-r--r-- | src/main/resources/assets/tectech/textures/items/itemPowerPassUpgradeCover.png | bin | 0 -> 583 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/tectech/textures/items/itemCapacitorLuV.png b/src/main/resources/assets/tectech/textures/items/itemCapacitorLuV.png Binary files differnew file mode 100644 index 0000000000..0801e3f0d7 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/items/itemCapacitorLuV.png diff --git a/src/main/resources/assets/tectech/textures/items/itemCapacitorZPM.png b/src/main/resources/assets/tectech/textures/items/itemCapacitorZPM.png Binary files differnew file mode 100644 index 0000000000..29b30dc63e --- /dev/null +++ b/src/main/resources/assets/tectech/textures/items/itemCapacitorZPM.png diff --git a/src/main/resources/assets/tectech/textures/items/itemEnderFluidLinkCover.png b/src/main/resources/assets/tectech/textures/items/itemEnderFluidLinkCover.png Binary files differnew file mode 100644 index 0000000000..201f7e4090 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/items/itemEnderFluidLinkCover.png diff --git a/src/main/resources/assets/tectech/textures/items/itemPowerPassUpgradeCover.png b/src/main/resources/assets/tectech/textures/items/itemPowerPassUpgradeCover.png Binary files differnew file mode 100644 index 0000000000..85f8a77b77 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/items/itemPowerPassUpgradeCover.png |