diff options
| author | Tec <daniel112092@gmail.com> | 2019-06-09 21:38:12 +0200 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2019-06-09 21:38:12 +0200 |
| commit | d7ad2169255f1047e6b1c17391b2eb991e998589 (patch) | |
| tree | 9fc85597bc74fdd52259ea788367097cb75fc1a6 /src/main/resources | |
| parent | 24da8644f1ecaf113d4dcc68cd1edae5179c3aa6 (diff) | |
| parent | 1438d4ba8a02aa1dc570c9c599a3014ccec2a6ca (diff) | |
| download | GT5-Unofficial-d7ad2169255f1047e6b1c17391b2eb991e998589.tar.gz GT5-Unofficial-d7ad2169255f1047e6b1c17391b2eb991e998589.tar.bz2 GT5-Unofficial-d7ad2169255f1047e6b1c17391b2eb991e998589.zip | |
Merge branch 'betterParametrizers' into BassAddons
# Conflicts:
# src/main/java/com/github/technus/tectech/Util.java
# src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
# src/main/java/com/github/technus/tectech/thing/CustomItemList.java
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_LASER.png | bin | 0 -> 369 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_LASER.png | bin | 0 -> 559 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_LASER.png | bin | 0 -> 555 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_LASER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_LASER.png Binary files differnew file mode 100644 index 0000000000..72e277673e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_LASER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_LASER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_LASER.png Binary files differnew file mode 100644 index 0000000000..51f387ba35 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_LASER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_LASER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_LASER.png Binary files differnew file mode 100644 index 0000000000..4706e3cf6a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_LASER.png |
