From 557e45e61b93ac4238741029d76d4f70ebe5ced4 Mon Sep 17 00:00:00 2001 From: miozune Date: Mon, 4 Dec 2023 05:40:50 +0900 Subject: Migrate to new RecipeMap (#261) * Migrate to new RecipeMap * update gradle+deps+bs --------- Co-authored-by: Martin Robertz --- .../textures/gui/multimachines/ResearchFake.png | Bin 1972 -> 0 bytes src/main/resources/assets/tectech/lang/en_US.lang | 12 ++++++++++++ .../assets/tectech/textures/gui/picture/rack_large.png | Bin 166 -> 332 bytes .../textures/gui/progressbar/research_station_1.png | Bin 0 -> 114 bytes .../textures/gui/progressbar/research_station_2.png | Bin 0 -> 172 bytes .../textures/gui/progressbar/research_station_3.png | Bin 0 -> 281 bytes 6 files changed, 12 insertions(+) delete mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/ResearchFake.png create mode 100644 src/main/resources/assets/tectech/textures/gui/progressbar/research_station_1.png create mode 100644 src/main/resources/assets/tectech/textures/gui/progressbar/research_station_2.png create mode 100644 src/main/resources/assets/tectech/textures/gui/progressbar/research_station_3.png (limited to 'src/main/resources') 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/ResearchFake.png and /dev/null 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 Binary files a/src/main/resources/assets/tectech/textures/gui/picture/rack_large.png and b/src/main/resources/assets/tectech/textures/gui/picture/rack_large.png 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 Binary files /dev/null and b/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_1.png 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 Binary files /dev/null and b/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_2.png 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 Binary files /dev/null and b/src/main/resources/assets/tectech/textures/gui/progressbar/research_station_3.png differ -- cgit