diff options
author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2022-07-05 06:40:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-05 12:40:33 +0700 |
commit | 6ae126921b95a38acef23e6025371f032f5ae2f4 (patch) | |
tree | 811c783e7638500a966754ea6a0ee87854f5a488 /src/main/resources/assets | |
parent | 864f4183d5f3e600e531e0d4afecdf4b265819b3 (diff) | |
download | GT5-Unofficial-6ae126921b95a38acef23e6025371f032f5ae2f4.tar.gz GT5-Unofficial-6ae126921b95a38acef23e6025371f032f5ae2f4.tar.bz2 GT5-Unofficial-6ae126921b95a38acef23e6025371f032f5ae2f4.zip |
DTPF Laser (#1100)
* DTPF Laser
* exotic
* Structure forms with TT laser, recipe broken. WIP.
* Format amps in PA correctly.
* Fix incorrect colouring on text.
* New DTPF controller textures.
* Update spacetime material.
* Update DTPF texture
* Update DTPF NEI page
* Add spacetime wires
* Tons of fixes/adjustments.
* Localise achievements.
* Typos
* More fixes + move plasmas to mixer.
* Spacetime adjustment
* Spacetime blocks.
* Spacetime wires.
* Localise coils
* Adjust DTPF fuels
* Adjust DTPF fuels.
* Stuff
* Fix optimiser
* DTPF
* Depreciated
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com>
Diffstat (limited to 'src/main/resources/assets')
-rw-r--r-- | src/main/resources/assets/gregtech/lang/en_US.lang | 13 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png | bin | 0 -> 37428 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png.mcmeta | 1 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_OFF.png | bin | 0 -> 1111 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png | bin | 0 -> 1244 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png.mcmeta | 6 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/BLOCK_SPACETIME.png | bin | 0 -> 37428 bytes |
7 files changed, 20 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index ff2d2fb765..ac08125618 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -612,6 +612,19 @@ achievement.gt.blockcasingsTT.8=Hollow Casing achievement.gt.blockcasingsTT.8.desc=Pickup this item to see the recipe in NEI achievement.gt.blockcasingsTT.7=Molecular Coil achievement.gt.blockcasingsTT.7.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockcasings.12=Dimensionally Transcendent Casing +achievement.gt.blockcasings.12.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockcasings.13=Dimensional Injection Casing +achievement.gt.blockcasings.13.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockcasings.14=Dimensional Bridge +achievement.gt.blockcasings.14.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.multimachine.plasmaforge=Dimensionally Transcendent Plasma Forge +achievement.gt.blockmachines.multimachine.plasmaforge.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockcasings5.12=Hypogen Coil +achievement.gt.blockcasings5.12.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockcasings5.13=Eternal Coil +achievement.gt.blockcasings5.13.desc=Pickup this item to see the recipe in NEI + achievement.gt.blockmachines.multimachine.em.infuser=Energy Infuser achievement.gt.blockmachines.multimachine.em.infuser.desc=Pickup this item to see the recipe in NEI achievement.gt.blockmachines.hatch.holder.tier.09=Object Holder diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png Binary files differnew file mode 100644 index 0000000000..fe5696854b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_OFF.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_OFF.png Binary files differnew file mode 100644 index 0000000000..0db6b6bf29 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_OFF.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png Binary files differnew file mode 100644 index 0000000000..9d397ecde5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png.mcmeta new file mode 100644 index 0000000000..f16b74ddb1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 8 + } +} + diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/BLOCK_SPACETIME.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/BLOCK_SPACETIME.png Binary files differnew file mode 100644 index 0000000000..fe5696854b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/BLOCK_SPACETIME.png |