aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorbasdxz <tudurap.com@gmail.com>2020-12-21 22:28:43 +0000
committerbasdxz <tudurap.com@gmail.com>2020-12-21 22:28:43 +0000
commit7a2db9a02428b7ffa939c8bcc36a7edfe8c4d938 (patch)
treef208851b757057fa6979ed67521c36626a4082d4 /src/main/resources
parent43d44fb27efb0d0832e0ca4182416913472d4711 (diff)
parent0198f6db20d7d05b835bcad447597b4df1e068c2 (diff)
downloadGT5-Unofficial-7a2db9a02428b7ffa939c8bcc36a7edfe8c4d938.tar.gz
GT5-Unofficial-7a2db9a02428b7ffa939c8bcc36a7edfe8c4d938.tar.bz2
GT5-Unofficial-7a2db9a02428b7ffa939c8bcc36a7edfe8c4d938.zip
Merge branch 'BassAddons'
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/ENDERFLUIDLINK_OVERLAY.pngbin0 -> 1986 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/ENDERFLUIDLINK_OVERLAY.png.mcmeta5
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang5
-rw-r--r--src/main/resources/assets/tectech/textures/items/itemEnderFluidLinkCover.pngbin0 -> 574 bytes
4 files changed, 10 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/ENDERFLUIDLINK_OVERLAY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ENDERFLUIDLINK_OVERLAY.png
new file mode 100644
index 0000000000..010bc0888d
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ENDERFLUIDLINK_OVERLAY.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/ENDERFLUIDLINK_OVERLAY.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ENDERFLUIDLINK_OVERLAY.png.mcmeta
new file mode 100644
index 0000000000..5e86a7cd5f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ENDERFLUIDLINK_OVERLAY.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":8
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index b81b865b22..9f49d692b8 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -87,6 +87,11 @@ item.tm.teslaCover.desc.4=Who the hell uses cables anyway?
item.tm.teslaStaff.name=Tesla Staff
item.tm.teslaStaff.desc=Power of the gods, at the whim of a mortal!
+item.tm.enderfluidlinkcover.name=Ender Fluid Link Cover
+item.tm.enderfluidlinkcover.desc.0=Ender-Fluid-Enables Machines!
+item.tm.enderfluidlinkcover.desc.1=Use on any side of a fluid tank to link it to the Ender
+item.tm.enderfluidlinkcover.desc.2=Ender Tanks so are laggy -Bot from the Chads of NH
+
#Death Messages
death.attack.microwaving=%1$s was dehydrated by radiation.
death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s.
diff --git a/src/main/resources/assets/tectech/textures/items/itemEnderFluidLinkCover.png b/src/main/resources/assets/tectech/textures/items/itemEnderFluidLinkCover.png
new file mode 100644
index 0000000000..201f7e4090
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/items/itemEnderFluidLinkCover.png
Binary files differ