aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets/gregtech
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/resources/assets/gregtech')
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang4
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EMS.pngbin0 -> 441 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.pngbin0 -> 440 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.pngbin0 -> 345 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS.pngbin0 -> 254 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE.pngbin0 -> 255 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE_GLOW.pngbin0 -> 255 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_GLOW.pngbin0 -> 256 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/345.pngbin0 -> 565 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/346.pngbin0 -> 549 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/347.pngbin0 -> 524 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/348.pngbin0 -> 586 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/349.pngbin0 -> 587 bytes
15 files changed, 14 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 9d5a59264c..1136c50915 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -327,6 +327,8 @@ GT5U.GTPP_MULTI_WASH_PLANT.mode.1=Simple Washer
GT5U.GTPP_MULTI_WASH_PLANT.mode.2=Chemical Bath
GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.0=Forming Press
GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.1=Bending
+GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode.0=Electromagnetic Separator
+GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode.1=Electromagnetic Polarizer
GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.0=Metal
GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.1=Fluid
GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.2=Misc
@@ -483,6 +485,8 @@ GT5U.gui.text.no_lubricant=§7No lubricant found
GT5U.gui.text.fuel_quality_too_high=§7Fuel quality too high to run without boost
GT5U.gui.text.no_data_sticks=§7No Data Sticks found
GT5U.gui.text.bio_upgrade_missing=§7Recipe needs Bio Upgrade to start
+GT5U.gui.text.electromagnet_missing=§7Needs an Electromagnet to run
+GT5U.gui.text.electromagnet_insufficient=§7Electromagnet too weak to handle exotic energy hatches
GT5U.gui.text.cleanroom_running=§aCleanroom running
GT5U.gui.text.no_machine=§7No valid processing machine
GT5U.gui.text.machine_mismatch=§7Machine doesn't match to locked recipe
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EMS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EMS.png
new file mode 100644
index 0000000000..32001ad716
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EMS.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png
new file mode 100644
index 0000000000..bd5cf275db
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png.mcmeta
new file mode 100644
index 0000000000..0abd1dd96d
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+}
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png
new file mode 100644
index 0000000000..0de4105d57
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png.mcmeta
new file mode 100644
index 0000000000..d2ce2e660a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+}
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS.png
new file mode 100644
index 0000000000..6092ec4c18
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE.png
new file mode 100644
index 0000000000..ffd43d8dc2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE_GLOW.png
new file mode 100644
index 0000000000..3bb29bbda6
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE_GLOW.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_GLOW.png
new file mode 100644
index 0000000000..b7955d63ab
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_GLOW.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/345.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/345.png
new file mode 100644
index 0000000000..a09e6770a0
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/345.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/346.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/346.png
new file mode 100644
index 0000000000..67452a2198
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/346.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/347.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/347.png
new file mode 100644
index 0000000000..d77ba1974b
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/347.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/348.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/348.png
new file mode 100644
index 0000000000..115597c2ff
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/348.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/349.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/349.png
new file mode 100644
index 0000000000..6b17d56df8
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/349.png
Binary files differ