aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/multimachines/ResearchFake.pngbin1972 -> 0 bytes
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang12
-rw-r--r--src/main/resources/assets/tectech/textures/gui/picture/rack_large.pngbin166 -> 332 bytes
-rw-r--r--src/main/resources/assets/tectech/textures/gui/progressbar/research_station_1.pngbin0 -> 114 bytes
-rw-r--r--src/main/resources/assets/tectech/textures/gui/progressbar/research_station_2.pngbin0 -> 172 bytes
-rw-r--r--src/main/resources/assets/tectech/textures/gui/progressbar/research_station_3.pngbin0 -> 281 bytes
6 files changed, 12 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/ResearchFake.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/ResearchFake.png
deleted file mode 100644
index b80e150877..0000000000
--- a/src/main/resources/assets/gregtech/textures/gui/multimachines/ResearchFake.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index f5ccf9bcbc..ea7e870d6c 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -988,6 +988,18 @@ GT5U.gui.text.invalid_time_setting=§7Invalid time setting
GT5U.gui.text.invalid_overdrive_setting=§7Invalid overdrive setting
GT5U.gui.text.insufficient_power_no_val=§7Insufficient power
+# RecipeMaps
+gt.recipe.eyeofharmony=Eye of Harmony
+gt.recipe.researchStation=Research Station
+
+# NEI
+tt.nei.eoh.total_items=Total Items: %s
+tt.nei.eoh.solid_mass=Percentage of Solid Mass: %s%%
+tt.nei.eoh.item_count=Item Count: %s
+tt.nei.research.max_eu=Max EU: %s EU
+tt.nei.research.computation=Computation: %s
+tt.nei.research.min_computation=Min Computation: %s /s
+
#Keywords and phrases
#Example: ID:3
tt.keyword.ID=ID
diff --git a/src/main/resources/assets/tectech/textures/gui/picture/rack_large.png b/src/main/resources/assets/tectech/textures/gui/picture/rack_large.png
index b57e9267aa..89b957b19a 100644
--- a/src/main/resources/assets/tectech/textures/gui/picture/rack_large.png
+++ b/src/main/resources/assets/tectech/textures/gui/picture/rack_large.png
Binary files differ
diff --git a/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_1.png b/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_1.png
new file mode 100644
index 0000000000..e1c451f81a
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_1.png
Binary files differ
diff --git a/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_2.png b/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_2.png
new file mode 100644
index 0000000000..974a02f281
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_2.png
Binary files differ
diff --git a/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_3.png b/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_3.png
new file mode 100644
index 0000000000..f1ba80dec7
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_3.png
Binary files differ