Merge branch 'master' into bassAdditions

# Conflicts:
#	src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java

24 files changed, 40 insertions, 0 deletions

diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION.png
new file mode 100644
index 0000000000..9448ea12bd
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION.png.mcmeta
new file mode 100644
index 0000000000..5d86d73ad2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":5
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION_ACTIVE.png
new file mode 100644
index 0000000000..63d8fda631
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..5d86d73ad2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ANNIHILATION_ACTIVE.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":5
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BHG.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BHG.png
index 524dab8595..ccbc7a0f11 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BHG.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BHG.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BHG_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BHG_ACTIVE.png
index cfe7ac9cf5..fb4943a5c3 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BHG_ACTIVE.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BHG_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png
index 5276027477..910d8cf7cd 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png
index d5a0655928..b9efef601a 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER.png
new file mode 100644
index 0000000000..bd9186a62f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER.png.mcmeta
new file mode 100644
index 0000000000..5e86a7cd5f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":8
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER_ACTIVE.png
new file mode 100644
index 0000000000..911ef96afa
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..5e86a7cd5f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COMPUTER_ACTIVE.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":8
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING.png
new file mode 100644
index 0000000000..bd87d400e7
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING.png.mcmeta
new file mode 100644
index 0000000000..82555396fa
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":7
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING_ACTIVE.png
new file mode 100644
index 0000000000..b3d9c37a9a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..82555396fa
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CRAFTING_ACTIVE.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":7
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY.png
new file mode 100644
index 0000000000..0166c9c7ad
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY.png.mcmeta
new file mode 100644
index 0000000000..5d86d73ad2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":5
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY_ACTIVE.png
new file mode 100644
index 0000000000..29bfd12031
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..5d86d73ad2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DECAY_ACTIVE.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":5
+   }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_WH.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_WH.png
index ac53d4adf9..464121c8fe 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_WH.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_WH.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_WH_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_WH_ACTIVE.png
index c93a69ec0f..cb4828ad05 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_WH_ACTIVE.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_WH_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UC.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UC.png
index 222e0b82b7..c437e992e2 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UC.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UC.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png
index d613b0eee9..441ec3b713 100644
--- a/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png
+++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png