diff options
| author | Tec <daniel112092@gmail.com> | 2019-07-17 09:25:46 +0200 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2019-07-17 09:25:46 +0200 |
| commit | 11c0e1d102b7692502f93e416ecbba456515993c (patch) | |
| tree | 635f91a3fa74d89a46b7c3844e44b4b87cd4d944 /src/main/resources | |
| parent | db90af28310cf6a00beea911b9debfce4bea8b1b (diff) | |
| parent | 1d554019f1596476b7198c30debc9a41db27195f (diff) | |
| download | GT5-Unofficial-11c0e1d102b7692502f93e416ecbba456515993c.tar.gz GT5-Unofficial-11c0e1d102b7692502f93e416ecbba456515993c.tar.bz2 GT5-Unofficial-11c0e1d102b7692502f93e416ecbba456515993c.zip | |
Merge branch 'betterParametrizers'
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 | |||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/POLLUTOR.png | bin | 0 -> 849 bytes | |||
| -rw-r--r-- | src/main/resources/assets/tectech/lang/en_US.lang | 5 |
5 files changed, 4 insertions, 1 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 diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/POLLUTOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/POLLUTOR.png Binary files differnew file mode 100644 index 0000000000..c8c32d0ab4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/POLLUTOR.png diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index ccb17a8a0c..59a0d720de 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -13,4 +13,7 @@ death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. death.attack.elementalPollution=%1$s was vaping from the wrong hole. -death.attack.elementalPollution.player=%1$s was vaping from the wrong hole while fighting %2$s.
\ No newline at end of file +death.attack.elementalPollution.player=%1$s was vaping from the wrong hole while fighting %2$s. + +death.attack.subspace=%1$s was N-th dimensionally displeased. +death.attack.subspace.player=%1$s N-th dimensionally displeased while fighting %2$s.
\ No newline at end of file |
