From 3feb46311800a286dfd542ae08b78cf6d4bffbfb Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 13 Dec 2020 22:41:48 +0100 Subject: add textures if anyone have a better one just send it to me. --- .../gregtech/textures/items/gt.metaitem.01/620.png | Bin 0 -> 3188 bytes .../gregtech/textures/items/gt.metaitem.01/621.png | Bin 0 -> 3192 bytes .../gregtech/textures/items/gt.metaitem.01/622.png | Bin 0 -> 3189 bytes .../gregtech/textures/items/gt.metaitem.01/623.png | Bin 0 -> 3185 bytes .../gregtech/textures/items/gt.metaitem.01/624.png | Bin 0 -> 3175 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/620.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/621.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/622.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/623.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/624.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/620.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/620.png new file mode 100644 index 0000000000..cddf97e328 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/620.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/621.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/621.png new file mode 100644 index 0000000000..71c90a9329 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/621.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/622.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/622.png new file mode 100644 index 0000000000..01d7ccf4ed Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/622.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/623.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/623.png new file mode 100644 index 0000000000..bf26cc0bdf Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/623.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/624.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/624.png new file mode 100644 index 0000000000..3122587bc9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/624.png differ -- cgit From 2ba5c5b7f26a1fcdcb4e03a57015f52f032448db Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Mon, 14 Dec 2020 00:25:32 +0100 Subject: add animated texture for the valve --- .../gregtech/textures/blocks/iconsets/OVERLAY_VALVE.png | Bin 0 -> 3299 bytes .../textures/blocks/iconsets/OVERLAY_VALVE.png.mcmeta | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_VALVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_VALVE.png.mcmeta (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_VALVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_VALVE.png new file mode 100644 index 0000000000..b16f11e692 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_VALVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_VALVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_VALVE.png.mcmeta new file mode 100644 index 0000000000..97596ba817 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_VALVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file -- cgit From 259b55e31b9db9079d4797e4b179737208e40695 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 26 Dec 2020 15:50:50 -0800 Subject: Adds long distance Item & Fluid pipelines and pipes. Inspired/ported from GT6 under LGPL. --- .../blocks/iconsets/OVERLAY_PIPELINE_FLUID_BACK.png | Bin 0 -> 534 bytes .../blocks/iconsets/OVERLAY_PIPELINE_FLUID_FRONT.png | Bin 0 -> 534 bytes .../blocks/iconsets/OVERLAY_PIPELINE_FLUID_SIDE.png | Bin 0 -> 362 bytes .../blocks/iconsets/OVERLAY_PIPELINE_ITEM_BACK.png | Bin 0 -> 516 bytes .../blocks/iconsets/OVERLAY_PIPELINE_ITEM_FRONT.png | Bin 0 -> 537 bytes .../blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png | Bin 0 -> 387 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_BACK.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_FRONT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_SIDE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_BACK.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_FRONT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_BACK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_BACK.png new file mode 100644 index 0000000000..171c2e9b71 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_BACK.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_FRONT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_FRONT.png new file mode 100644 index 0000000000..500e594028 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_FRONT.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_SIDE.png new file mode 100644 index 0000000000..47136fe5c2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_BACK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_BACK.png new file mode 100644 index 0000000000..a52e83e3ae Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_BACK.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_FRONT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_FRONT.png new file mode 100644 index 0000000000..19e84f1778 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_FRONT.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png new file mode 100644 index 0000000000..1d5cff3496 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png differ -- cgit From 82edef8ca76f8f594bf10137cbe6831b15b2ccf1 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 26 Dec 2020 17:16:01 -0800 Subject: Add ~~stolen~~ borrowed textures for long distance pipes --- .../textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png | Bin 0 -> 408 bytes .../textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png | Bin 0 -> 418 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png new file mode 100644 index 0000000000..eda6e9363d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png new file mode 100644 index 0000000000..195f5927d6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png differ -- cgit From 7e51be749de428eacac0c67521bf47b36afb9f38 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 27 Dec 2020 23:05:56 +0100 Subject: update Textures bump verion (cherry picked from commit 5cd8800ac37e8cbcf0bc6578cec0c3215c7df4f9) --- .../blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png | Bin 408 -> 3154 bytes .../blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png | Bin 418 -> 3175 bytes .../blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png | Bin 387 -> 3155 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png index eda6e9363d..027a05ee42 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png index 195f5927d6..6dc66efb7e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png index 1d5cff3496..67fd8754a1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png differ -- cgit From 1b9ef1b6c2803647a4ac21176320150698105c8c Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Mon, 28 Dec 2020 00:47:22 +0100 Subject: change textures (cherry picked from commit bcd9bd8449a810cc0022fc58806d3e78f995ef56) --- .../blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png | Bin 3154 -> 3124 bytes .../blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png | Bin 3175 -> 3232 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png index 027a05ee42..02089e9113 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png index 6dc66efb7e..64a8628606 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png differ -- cgit From e141a558bbf5fa37c75d1420691fcf969e5759c8 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Mon, 28 Dec 2020 04:28:06 +0100 Subject: Refactor + Added 2 more coils + Improved Tooltips --- .../textures/blocks/iconsets/MACHINE_COIL_HSSS.png | Bin 0 -> 496 bytes .../textures/blocks/iconsets/MACHINE_COIL_TRINIUM.png | Bin 0 -> 510 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSS.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TRINIUM.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSS.png new file mode 100644 index 0000000000..3851bf2c41 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TRINIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TRINIUM.png new file mode 100644 index 0000000000..f110674d6b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TRINIUM.png differ -- cgit From a34efc6ade3fb0f05017bf697564aba79fb5d7d2 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Fri, 1 Jan 2021 12:38:13 +0100 Subject: fix (GT)emitter and sensor textures (cherry picked from commit 9e483b5c905ec21d8c2193f146a8789a47b17a87) --- .../gregtech/textures/items/gt.metaitem.01/678.png | Bin 643 -> 3292 bytes .../gregtech/textures/items/gt.metaitem.01/679.png | Bin 629 -> 3285 bytes .../gregtech/textures/items/gt.metaitem.01/688.png | Bin 562 -> 3219 bytes .../gregtech/textures/items/gt.metaitem.01/698.png | Bin 513 -> 3164 bytes 4 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/678.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/678.png index 1fd18e5200..75ab908299 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/678.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/678.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/679.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/679.png index 13679b1c24..968385400f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/679.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/679.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/688.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/688.png index 48bd4a3a6d..8573c22620 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/688.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/688.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/698.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/698.png index 5c97efb495..73be90cea7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/698.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/698.png differ -- cgit From c189c8b8b4896d3f0470e94ee35cee06ece83430 Mon Sep 17 00:00:00 2001 From: Prometheus0000 Date: Tue, 5 Jan 2021 06:08:55 -0500 Subject: Add text for achievement --- src/main/resources/assets/gregtech/lang/en_US.lang | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 5d7f6cf7dd..8f7a7f6c39 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -883,6 +883,9 @@ achievement.item.graviChestPlate.desc=Pickup this item to see the recipe in NEI achievement.gt.blockreinforced.12=Raw Deep Dark Portal Block achievement.gt.blockreinforced.12.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.debug.tt.maintenance=Auto-Taping Maintenance Hatch +achievement.gt.blockmachines.debug.tt.maintenance.desc=Pickup this item to see the recipe in NEI + for.bees.species.clay=Clay for.bees.species.slimeball=Slimeball for.bees.species.peat=Peat -- cgit From d9566147b8abcc9ce150564302b5b89ec0ead54f Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sat, 9 Jan 2021 14:21:11 +0100 Subject: fix entity.gregtech.GT_Entity_Arrow.name localization --- src/main/resources/assets/gregtech/lang/en_US.lang | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 8f7a7f6c39..54be49a61d 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -1044,3 +1044,5 @@ gregtech.speedUnproductive=Unproductive gregtech.speedAccelerated=Accelerated gregtech.lifeBlink=Blink gregtech.lifeEon=Eon + +entity.gregtech.GT_Entity_Arrow.name= a GregTech arrow \ No newline at end of file -- cgit From 7fc66dbd10ec5bc71f9942e02f8d1b62a01b336b Mon Sep 17 00:00:00 2001 From: Elisis Date: Mon, 11 Jan 2021 19:21:26 +1100 Subject: Update en_US.lang Fix a whole slew of typos and general inaccuracies --- src/main/resources/assets/gregtech/lang/en_US.lang | 100 ++++++++++----------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 54be49a61d..5979ca680d 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -22,8 +22,8 @@ GT5U.MBTT.Mod=Added by GT5U.turbine.running.true=Turbine running GT5U.turbine.running.false=Turbine stopped -GT5U.turbine.maintenance.false=No Maintainance issues -GT5U.turbine.maintenance.true=Needs Maintainance +GT5U.turbine.maintenance.false=No Maintenance issues +GT5U.turbine.maintenance.true=Needs Maintenance GT5U.turbine.efficiency=Current Speed GT5U.turbine.flow=Optimal Flow GT5U.turbine.fuel=Fuel Remaining @@ -41,7 +41,7 @@ GT5U.PA.discount=Discount GT5U.PA.parallel=Parallel processing GT5U.LHE.steam=(in steam) -GT5U.LHE.superheated=Super Heated +GT5U.LHE.superheated=Superheated GT5U.LHE.threshold=threshold GT5U.fusion.req=EU Required @@ -59,7 +59,7 @@ GT5U.machines.blocks=Blocks GT5U.machines.chunks=Chunks GT5U.machines.miner=Miner GT5U.machines.pump=Pump -GT5U.machines.separatebus=Input busses are separated +GT5U.machines.separatebus=Input buses are separated GT5U.machines.pumpareaset=Pumping area set to GT5U.machines.oilfluidpump=Oil/Fluid Pump GT5U.machines.minermulti=Multiblock Miner @@ -92,9 +92,9 @@ item.gregtech:modularelectric2_boots.name=Modular Nanosuit Boots achievement.Naquadah=Find Naquadah Ore achievement.Naquadah.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto/KuiperBelt/VegaB/BarnardE/BarnardF// -achievement.NaquadahEnriched=Find NaquadahEnriched Ore +achievement.NaquadahEnriched=Find Enriched Naquadah Ore achievement.NaquadahEnriched.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto/KuiperBelt/VegaB/BarnardE/BarnardF// -achievement.Lignite=Find Lignite Ore +achievement.Lignite=Find Lignite Coal Ore achievement.Lignite.desc=Height: 30-210, Chance: 160, Overworld// achievement.Coal=Find Coal Ore achievement.Coal.desc=Height: 30-210, Chance: 160, Overworld/Twilight-Forest// @@ -102,15 +102,15 @@ achievement.Magnetite=Find Magnetite Ore achievement.Magnetite.desc=Height: 30-180, Chance: 160, Overworld/Twilight-Forest/End/End-Asteroids/Mars/Phobos/Deimos/Asteorids/IO/Triton/Pluto/Makamake/VegaB/BarnardE/BarnardF/Tceti// achievement.Iron=Find Iron Ore achievement.Iron.desc=Height: 5-180, Chance: 120, Overworld/Nether/Twilight-Forest/End/End-Asteroids/Moon/Deimos/Ceres/IO/Callisto/Enceladus/Proteus/Makemake/BarnardE/BarnardF/Tceti// -achievement.VanadiumMagnetite=Find VanadiumMagnetite Ore +achievement.VanadiumMagnetite=Find Vanadium Magnetite Ore achievement.VanadiumMagnetite.desc=Height: 60-180, Chance: 160, Overworld/Twilight-Forest/Deimos/IO/Makemake/BarnardE/Tceti/ achievement.Gold=Find Gold Ore achievement.Gold.desc=Height: 30-60, Chance: 160, Overworld/Twilight-Forest/End/End-Asteroids/Mars/Phobos/Asteroids/Callisto/Triton/Pluto/VegaB/BarnardF/Tceti/ -achievement.BrownLimonite=Find BrownLimonite Ore +achievement.BrownLimonite=Find Brown Limonite Ore achievement.BrownLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// -achievement.YellowLimonite=Find YellowLimonite Ore +achievement.YellowLimonite=Find Yellow Limonite Ore achievement.YellowLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// -achievement.BandedIron=Find BandedIron Ore +achievement.BandedIron=Find Banded Iron Ore achievement.BandedIron.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// achievement.Malachite=Find Malachite Ore achievement.Malachite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// @@ -124,7 +124,7 @@ achievement.Copper=Find Copper Ore achievement.Copper.desc=Height: 5-120, Chance: 80, Overworld/Nether/End/End-Asteroids/Moon/Mars/Deimos/Asteroids/Ceres/Ganymed/Callisto/Venus/Enceladus/Miranda/Proteus/KuiperBelt/VegaB/BarnardE/BarnardF// achievement.Stibnite=Find Stibnite Ore achievement.Stibnite.desc=Height: 80-120, Chance: 70, Nether/End/End-Asteroids/Mars/Deimos/Asteroids/Ganymed/Venus/Miranda/KuiperBelt/VegaB// -achievement.NetherQuartz=Find NetherQuartz Ore +achievement.NetherQuartz=Find Nether Quartz Ore achievement.NetherQuartz.desc=Height: 40-80, Chance: 80, /Nether// achievement.Sulfur=Find Sulfur Ore achievement.Sulfur.desc=Height: 5-20, Chance: 100, /Nether/Mars/Phobos/Deimos/IO/Venus// @@ -140,7 +140,7 @@ achievement.Aluminium=Find Aluminium Ore achievement.Aluminium.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto/KuiperBelt/Makemake/Haumea/Tceti// achievement.Ilmenite=Find Ilmenite Ore achievement.Ilmenite.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto/KuiperBelt/Makemake/Haumea/Tceti// -achievement.RockSalt=Find RockSalt Ore +achievement.RockSalt=Find Rock Salt Ore achievement.RockSalt.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forest/Mars/Tceti// achievement.Salt=Find Salt Ore achievement.Salt.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forest/Mars/Tceti// @@ -212,7 +212,7 @@ achievement.Pyrope=Find Pyrope Ore achievement.Pyrope.desc=Height: 10-40, Chance: 60, Twilight-Forest// achievement.Sapphire=Find Sapphire Ore achievement.Sapphire.desc=Height: 10-40, Chance: 60, Twilight-Forest// -achievement.GreenSapphire=Find GreenSapphire Ore +achievement.GreenSapphire=Find Green Sapphire Ore achievement.GreenSapphire.desc=Height: 10-40, Chance: 60, Twilight-Forest// achievement.Grossular=Find Grossular Ore achievement.Grossular.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton/BarnardE/BarnardF// @@ -226,7 +226,7 @@ achievement.Quartzite=Find Quartzite Ore achievement.Quartzite.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus/Tceti// achievement.Barite=Find Barite Ore achievement.Barite.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus/Tceti// -achievement.CertusQuartz=Find CertusQuartz Ore +achievement.CertusQuartz=Find Certus Quartz Ore achievement.CertusQuartz.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus/Tceti// achievement.Graphite=Find Graphite Ore achievement.Graphite.desc=Height: 5-20, Chance: 40, Overworld/Twilight-Forest/Phobos/Ganymed/Mercury/Titan/Miranda/Proteus/Pluto/KuiperBelt/BarnardF// @@ -240,7 +240,7 @@ achievement.Olivine=Find Olivine Ore achievement.Olivine.desc=Height: 10-40, Chance: 60, Twilight-Forest/Makemake/Haumea/BarnardE// achievement.Apatite=Find Apatite Ore achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forest/Tceti// -achievement.TricalciumPhosphate=Find TricalciumPhosphate Ore +achievement.TricalciumPhosphate=Find Tricalcium Phosphate Ore achievement.TricalciumPhosphate.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forest/Tceti// achievement.Phosphate=Find Phosphate Ore achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forest/Tceti// @@ -304,13 +304,13 @@ achievement.Kaolinite=Find Kaolinite Ore achievement.Kaolinite.desc=Height: 50-70, Chance: 60, Overworld// achievement.Zeolite=Find Zeolite Ore achievement.Zeolite.desc=Height: 50-70, Chance: 60, Overworld// -achievement.GlauconiteSand=Find Glauconite Sand Ore +achievement.GlauconiteSand=Find Glauconite Sand achievement.GlauconiteSand.desc=Height: 50-70, Chance: 60, Overworld// achievement.Kyanite=Find Kyanite Ore achievement.Kyanite.desc=Height: 20-40, Chance: 20, Overworld// achievement.Mica=Find Mica Ore achievement.Mica.desc=Height: 20-40, Chance: 20, Overworld// -achievement.CassiteriteSand=Find Cassiterite Sand Ore +achievement.CassiteriteSand=Find Cassiterite Sand achievement.CassiteriteSand.desc=Height: 20-60, Chance: 20, Overworld// achievement.Pollucite=Find Pollucite Ore achievement.Pollucite.desc=Height: 20-40, Chance: 20, Overworld// @@ -322,7 +322,7 @@ achievement.Trona=Find Trona Ore achievement.Trona.desc=Height: 150-250, Chance: 40, Overworld// achievement.Andradite=Find Andradite Ore achievement.Andradite.desc=Height: 150-250, Chance: 40, Overworld// -achievement.GarnetSand=Find Garnet Sand Ore +achievement.GarnetSand=Find Garnet Sand achievement.GarnetSand.desc=Height: 20-60, Chance: 80, Overworld/Haumea/VegaB/BarnardsE/Tceti// achievement.Asbestos=Find Asbestos Ore achievement.Asbestos.desc=Height: 50-60, Chance: 80, Overworld// @@ -444,7 +444,7 @@ achievement.Naquadria=Naquadria Ore achievement.Naquadria.desc=Height: 5-15, Chance: 100, DeepDarkDim// achievement.DraconiumAwakened=Awakened Draconium achievement.DraconiumAwakened.desc=Height: 175-185, Chance: 100, DeepDarkDim// -achievement.Bedrockium=Bedrokium Ore +achievement.Bedrockium=Bedrockium Ore achievement.Bedrockium.desc=Height: 175-185, Chance: 100, DeepDarkDim// achievement.Cobalt=Cobalt Ore achievement.Cobalt.desc=Height: 170-180, Chance: 100, DeepDarkDim// @@ -466,19 +466,19 @@ achievement.flintpick.desc=Craft a flint pick achievement.crops=Farming achievement.crops.desc=Craft Crops achievement.havestlead=Harvest Lead -achievement.havestlead.desc=Get Plumbilia Leafs +achievement.havestlead.desc=Get Plumbilia Leaves achievement.havestcopper=Harvest Copper achievement.havestcopper.desc=Get Coppon Fiber achievement.havesttin=Harvest Tin achievement.havesttin.desc=Get Tine Twig achievement.havestoil=Harvest Oil -achievement.havestoil.desc=Get Oilberrys +achievement.havestoil.desc=Get Oilberries achievement.havestiron=Harvest Iron -achievement.havestiron.desc=Get Ferru Leafs +achievement.havestiron.desc=Get Ferru Leaves achievement.havestgold=Harvest Gold -achievement.havestgold.desc=Get Aurelia Leafs +achievement.havestgold.desc=Get Aurelia Leaves achievement.havestsilver=Harvest Silver -achievement.havestsilver.desc=Get Argentia Leafs +achievement.havestsilver.desc=Get Argentia Leaves achievement.havestemeralds=Harvest Emeralds achievement.havestemeralds.desc=Get Bobs yer uncle Berries achievement.tools=More Tools @@ -500,7 +500,7 @@ achievement.recycling.desc=Craft an Arc Furnace achievement.crushed=Crushed achievement.crushed.desc=Crush Ores with a Hammer achievement.cleandust=Clean -achievement.cleandust.desc=Clean a dust in a cauldron +achievement.cleandust.desc=Clean some dust in a cauldron achievement.washing=Washing achievement.washing.desc=Get purified crushed ores achievement.spinit=Spin it @@ -517,8 +517,8 @@ achievement.simplyeco=Simply Eco achievement.simplyeco.desc=Craft a Solar Boiler achievement.firststeam=First Steam achievement.firststeam.desc=Craft a Bronze Boiler -achievement.alloysmelter=Alloysmelter -achievement.alloysmelter.desc=Craft a Steam Alloysmelter +achievement.alloysmelter=Alloy Smelter +achievement.alloysmelter.desc=Craft a Steam Alloy Smelter achievement.macerator=Macerator achievement.macerator.desc=Craft a Steam Macerator achievement.extract=Extract @@ -526,21 +526,21 @@ achievement.extract.desc=Craft a Steam Extractor achievement.smallparts=Tubes achievement.smallparts.desc=Craft a Vacuum Tube achievement.gtbasiccircuit=Basic Circuit -achievement.gtbasiccircuit.desc=Craft a Electronic Circuit +achievement.gtbasiccircuit.desc=Craft an Electronic Circuit achievement.bettercircuits=Better Circuits achievement.bettercircuits.desc=Get Good Circuits achievement.stepforward=Step forward achievement.stepforward.desc=Obtain Advanced Circuits -achievement.gtmonosilicon=Monocrystaline Silicon Ingot -achievement.gtmonosilicon.desc=Produce a Monocrystaline Silicon Ingot +achievement.gtmonosilicon=Monocrystaline Silicon Boule +achievement.gtmonosilicon.desc=Produce a Monocrystaline Silicon Boule achievement.gtlogicwafer=Logic Circuit Wafer achievement.gtlogicwafer.desc=Produce a Logic Circuit Wafer achievement.gtlogiccircuit=Integrated Logic Circuit achievement.gtlogiccircuit.desc=Produce a Integrated Logic Circuit achievement.gtcleanroom=Cleanroom -achievement.gtcleanroom.desc=Craft a Cleanroomcontroller -achievement.gtquantumprocessor=Quantumprocessor -achievement.gtquantumprocessor.desc=Get Quantumprocessors +achievement.gtcleanroom.desc=Craft a Cleanroom Controller +achievement.gtquantumprocessor=Quantum Processor +achievement.gtquantumprocessor.desc=Get Quantum Processors achievement.energyflow=Nanoprocessor achievement.energyflow.desc=Get Nanoprocessors achievement.gtcrystalprocessor=Crystalprocessor @@ -554,9 +554,9 @@ achievement.orbs.desc=Get a Lapotronic Energy Orb achievement.thatspower=That is Power achievement.thatspower.desc=Get a Lapotronic Energy Orb Cluster achievement.datasaving=Datasaving -achievement.datasaving.desc=Get a Dataorb -achievement.superbuffer=Superbuffer -achievement.superbuffer.desc=Craft a LV Superbuffer +achievement.datasaving.desc=Get a Data Orb +achievement.superbuffer=Super Buffer +achievement.superbuffer.desc=Craft an LV Super Buffer achievement.newstorage=New Storage achievement.newstorage.desc=Craft a Quantum Chest achievement.whereistheocean=Where is the Ocean? @@ -564,7 +564,7 @@ achievement.whereistheocean.desc=Build a Quantum Tank achievement.luck=Real Luck achievement.luck.desc=Find a Zero Point Module in a Jungle Temple achievement.steel=Steel -achievement.steel.desc=Produce Steel in a Bronze Blast Furnace +achievement.steel.desc=Produce Steel in a Bricked Blast Furnace achievement.highpressure=High Pressure achievement.highpressure.desc=Craft a High Pressure Boiler achievement.extremepressure=Extreme Pressure @@ -575,10 +575,10 @@ achievement.complexalloys=Complex Alloys achievement.complexalloys.desc=Produce a Blue Steel Ingot achievement.magneticiron=Magnetic Iron achievement.magneticiron.desc=Craft a Magnetic Iron Rod with 4 Redstone -achievement.lvmotor=Low Voltage Motor -achievement.lvmotor.desc=Craft a Low Voltage Motor +achievement.lvmotor=LV Motor +achievement.lvmotor.desc=Craft an LV Motor achievement.pumpcover=Pump -achievement.pumpcover.desc=Craft a LV Pump +achievement.pumpcover.desc=Craft an LV Pump achievement.closeit=Close it! achievement.closeit.desc=Get a Shutter Cover achievement.slurp=Slurp @@ -592,15 +592,15 @@ achievement.buffer.desc=Craft a LV Chest Buffer achievement.complexmachines=Complex Machines achievement.complexmachines.desc=Craft a LV Robot Arm achievement.avengers=Avengers Assemble -achievement.avengers.desc=Craft a LV Assembler +achievement.avengers.desc=Craft a LV Assembling Machine achievement.filterregulate=Filter and Regulate achievement.filterregulate.desc=Get an Item Filter -achievement.steampower=Steampower +achievement.steampower=Steam Power! achievement.steampower.desc=Craft a Basic Steam Turbine achievement.batterys=Batteries achievement.batterys.desc=Craft a Battery Buffer achievement.badweather=Bad Weather -achievement.badweather.desc=Forget to build a Roof above your Machines +achievement.badweather.desc=Forgot to build a Roof above your Machines? achievement.electricproblems=Electric Problems achievement.electricproblems.desc=Lose a Machine due to Overvoltage achievement.ebf=Electric Blast Furnace @@ -640,15 +640,15 @@ achievement.tungsten.desc=Cool down a Hot Tungsten Ingot achievement.osmium=Osmium achievement.osmium.desc=Cool down a Hot Osmium Ingot achievement.hightech=Hightech -achievement.hightech.desc=Craft a Field Generator Tier 1 +achievement.hightech.desc=Craft a Tier 1 Field Generator achievement.amplifier=Amplifier achievement.amplifier.desc=Craft an Amp Fab achievement.scanning=Scanning achievement.scanning.desc=Complete an Element Scan achievement.alienpower=Alien Power -achievement.alienpower.desc=Craft a Naquadah Generator Mark I +achievement.alienpower.desc=Craft a Mark I Naquadah Generator achievement.universal=Universal -achievement.universal.desc=Craft a Mass Fab +achievement.universal.desc=Craft a Mass Fabricator achievement.replication=Replication achievement.replication.desc=Craft a Replicator achievement.tungstensteel=Tungstensteel @@ -686,11 +686,11 @@ achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot achievement.denseaspossible=As Dense As Possible achievement.denseaspossible.desc=Produce Neutronium achievement.zpmage=Energy Module -achievement.zpmage.desc=Craft a Energy Module +achievement.zpmage.desc=Craft an Energy Module achievement.uvage=Energy Cluster -achievement.uvage.desc=Craft a Energy Cluster +achievement.uvage.desc=Craft an Energy Cluster achievement.whatnow=What now? -achievement.whatnow.desc=Craft a Ultimate Battery +achievement.whatnow.desc=Craft an Ultimate Battery achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI @@ -1045,4 +1045,4 @@ gregtech.speedAccelerated=Accelerated gregtech.lifeBlink=Blink gregtech.lifeEon=Eon -entity.gregtech.GT_Entity_Arrow.name= a GregTech arrow \ No newline at end of file +entity.gregtech.GT_Entity_Arrow.name= a GregTech arrow -- cgit From f6d73cd25aab6ed26b7980a7eeaa2f21de1bf3cb Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 17 Jan 2021 15:32:27 -0800 Subject: Remove assets --- src/main/resources/assets/gregtech/lang/en_US.lang | 13 ------------- src/main/resources/assets/gregtech/lang/zh_CN.lang | 13 ------------- .../gregtech/textures/items/modulararmor_boots.png | Bin 518 -> 0 bytes .../gregtech/textures/items/modulararmor_chestplate.png | Bin 504 -> 0 bytes .../gregtech/textures/items/modulararmor_helmet.png | Bin 469 -> 0 bytes .../gregtech/textures/items/modulararmor_leggings.png | Bin 466 -> 0 bytes .../gregtech/textures/items/modularelectric1_boots.png | Bin 593 -> 0 bytes .../textures/items/modularelectric1_chestplate.png | Bin 544 -> 0 bytes .../gregtech/textures/items/modularelectric1_helmet.png | Bin 574 -> 0 bytes .../textures/items/modularelectric1_leggings.png | Bin 482 -> 0 bytes .../gregtech/textures/items/modularelectric2_boots.png | Bin 668 -> 0 bytes .../textures/items/modularelectric2_chestplate.png | Bin 596 -> 0 bytes .../gregtech/textures/items/modularelectric2_helmet.png | Bin 576 -> 0 bytes .../textures/items/modularelectric2_leggings.png | Bin 542 -> 0 bytes .../textures/models/armor/basic_helmet_chest.png | Bin 1215 -> 0 bytes .../textures/models/armor/basic_leggings_boots.png | Bin 493 -> 0 bytes .../gregtech/textures/models/armor/e1_helmet_chest.png | Bin 1528 -> 0 bytes .../gregtech/textures/models/armor/e1_leggings_boots.png | Bin 588 -> 0 bytes .../gregtech/textures/models/armor/e2_helmet_chest.png | Bin 1792 -> 0 bytes .../gregtech/textures/models/armor/e2_leggings_boots.png | Bin 750 -> 0 bytes 20 files changed, 26 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modulararmor_helmet.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modulararmor_leggings.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric1_helmet.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric2_helmet.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 5979ca680d..9d89ababc0 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -77,19 +77,6 @@ GT5U.multiblock.problems=Problems GT5U.multiblock.mei=Max Energy Income GT5U.multiblock.usage=Probably uses -item.gregtech:modulararmor_helmet.name=Basic Modular Armor Helmet -item.gregtech:modulararmor_chestplate.name=Basic Modular Armor Chestplate -item.gregtech:modulararmor_leggings.name=Basic Modular Armor Leggings -item.gregtech:modulararmor_boots.name=Basic Modular Armor Boots -item.gregtech:modularelectric1_helmet.name=Modular Exoskeleton Helmet -item.gregtech:modularelectric1_chestplate.name=Modular Exoskeleton Chestplate -item.gregtech:modularelectric1_leggings.name=Modular Exoskeleton Leggings -item.gregtech:modularelectric1_boots.name=Modular Exoskeleton Boots -item.gregtech:modularelectric2_helmet.name=Modular Nanosuit Helmet -item.gregtech:modularelectric2_chestplate.name=Modular Nanosuit Chestplate -item.gregtech:modularelectric2_leggings.name=Modular Nanosuit Leggings -item.gregtech:modularelectric2_boots.name=Modular Nanosuit Boots - achievement.Naquadah=Find Naquadah Ore achievement.Naquadah.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto/KuiperBelt/VegaB/BarnardE/BarnardF// achievement.NaquadahEnriched=Find Enriched Naquadah Ore diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index 870dba96a5..a77d59f0eb 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -77,19 +77,6 @@ GT5U.multiblock.problems=问题 GT5U.multiblock.mei=最大输入 GT5U.multiblock.usage=大概功率 -item.gregtech:modulararmor_helmet.name=基础模块化装甲头盔 -item.gregtech:modulararmor_chestplate.name=基础模块化装甲胸甲 -item.gregtech:modulararmor_leggings.name=基础模块化装甲护腿 -item.gregtech:modulararmor_boots.name=基础模块化装甲靴子 -item.gregtech:modularelectric1_helmet.name=模块化动力外骨骼头盔 -item.gregtech:modularelectric1_chestplate.name=模块化动力外骨骼胸甲 -item.gregtech:modularelectric1_leggings.name=模块化动力外骨骼护腿 -item.gregtech:modularelectric1_boots.name=模块化动力外骨骼靴子 -item.gregtech:modularelectric2_helmet.name=模块化纳米套装头盔 -item.gregtech:modularelectric2_chestplate.name=模块化纳米套装胸甲 -item.gregtech:modularelectric2_leggings.name=模块化纳米套装护腿 -item.gregtech:modularelectric2_boots.name=模块化纳米套装靴子 - achievement.Naquadah=找到硅岩矿石 achievement.Naquadah.desc=高度:10-90,几率:10,小行星/金星/土卫六/天卫四/冥王星/柯伊伯带/织女一B/巴德纳E/巴德纳F// achievement.NaquadahEnriched=找到富集硅岩矿石 diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png deleted file mode 100644 index 7b52d92dec..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png deleted file mode 100644 index 13f6818a37..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_helmet.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_helmet.png deleted file mode 100644 index 3ce1283aca..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_leggings.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_leggings.png deleted file mode 100644 index 6fa1775967..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_leggings.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png deleted file mode 100644 index 2ab5d64cd7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png deleted file mode 100644 index 25f89678d6..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_helmet.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_helmet.png deleted file mode 100644 index 81ced7f3f3..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png deleted file mode 100644 index de6df23dff..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png deleted file mode 100644 index 4dc9d4cc11..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png deleted file mode 100644 index ac560c1841..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_helmet.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_helmet.png deleted file mode 100644 index 48865fc947..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png deleted file mode 100644 index 6cdda7024f..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png deleted file mode 100644 index 6048db9ddb..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png deleted file mode 100644 index 841a7cbba6..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png deleted file mode 100644 index 287b037fff..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png deleted file mode 100644 index 83333001b7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png deleted file mode 100644 index b03c26c716..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png deleted file mode 100644 index 8c37fe80c2..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png and /dev/null differ -- cgit From df1ccb70a7591e97591aae4b38c367f937d1b363 Mon Sep 17 00:00:00 2001 From: repo_alt Date: Tue, 19 Jan 2021 18:11:02 +0300 Subject: ME output bus --- .../textures/blocks/iconsets/OVERLAY_ME_HATCH.png | Bin 0 -> 199 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ME_HATCH.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ME_HATCH.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ME_HATCH.png new file mode 100644 index 0000000000..ba901a1a25 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ME_HATCH.png differ -- cgit From 868dc9d8458c2b753414496a55f8e9322ae6484c Mon Sep 17 00:00:00 2001 From: KiloJoel Date: Fri, 29 Jan 2021 22:04:46 +0000 Subject: added shadow block texture --- .../gregtech/textures/blocks/iconsets/BLOCK_SHADOW.png | Bin 0 -> 353 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SHADOW.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SHADOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SHADOW.png new file mode 100644 index 0000000000..4de4960e0e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SHADOW.png differ -- cgit From d0fd780d7be32c705d334484b6ac87442345fb6f Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Mon, 1 Feb 2021 21:13:18 +0100 Subject: allow autoclave to have fluid out in recipe --- .../textures/gui/basicmachines/Autoclave.png | Bin 10220 -> 10335 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png index 87ca283f6c..08eaf21e84 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png differ -- cgit From b05f9e268a4b318f1af10cddc2dab7ee507dcef0 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Tue, 16 Feb 2021 17:30:31 +0100 Subject: feat(render): tile ambient occlusion Render smooth lighting ambient occlusion on all Gregtech tiles: - Ores - Machines - Pipes, Cables, Wires, Frames Add new Client-side configuration entry in Gregtech.cfg. If false, the flat lighting rendering of older versions is used. ```yml render { B:TileAmbientOcclusion_true=true } ``` --- .../blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png | Bin 737 -> 683 bytes .../blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png | Bin 737 -> 683 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png index 27e88f3851..9bd796c361 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png index f8b164b50e..9bd796c361 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png differ -- cgit From ae75be34340463832a847c9b31ef1c80d7b90550 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Wed, 24 Mar 2021 13:23:24 +0100 Subject: feat(cover): hide covers when holding a soldering-iron --- .../gregtech/textures/blocks/iconsets/HIDDEN_FACE.png | Bin 0 -> 118 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png new file mode 100644 index 0000000000..c2a9ed5cf0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png differ -- cgit From 5143f1ee981ebdc5bc017ef1844fe0a249228603 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Wed, 24 Mar 2021 18:59:23 +0100 Subject: impr(textures): harminise cable insulations fix insulation texture was darker on cable ends than on cable sides --- .../gregtech/textures/blocks/iconsets/HIDDEN_FACE.png | Bin 118 -> 113 bytes .../textures/blocks/iconsets/INSULATION_FULL.png | Bin 935 -> 793 bytes .../textures/blocks/iconsets/INSULATION_HUGE.png | Bin 838 -> 880 bytes .../textures/blocks/iconsets/INSULATION_LARGE.png | Bin 1147 -> 885 bytes .../textures/blocks/iconsets/INSULATION_MEDIUM.png | Bin 779 -> 850 bytes .../blocks/iconsets/INSULATION_MEDIUM_PLUS.png | Bin 1147 -> 884 bytes .../textures/blocks/iconsets/INSULATION_SMALL.png | Bin 758 -> 833 bytes .../textures/blocks/iconsets/INSULATION_TINY.png | Bin 748 -> 818 bytes 8 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png index c2a9ed5cf0..a9c630ccf5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_FULL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_FULL.png index 2ad68dca74..e9cffc1ec1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_FULL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_FULL.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_HUGE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_HUGE.png index 9bb208adac..5b57738b6c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_HUGE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_HUGE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png index 7f896a09f0..e572d7c37a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM.png index 242e41dc2b..823363d223 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png index 666d51b82f..fd0c3a9647 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_SMALL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_SMALL.png index 68194b369b..57e94bf13b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_SMALL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_SMALL.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_TINY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_TINY.png index a5730989f0..b237e8e873 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_TINY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_TINY.png differ -- cgit From 8ab359f64d112e4d82baa74b6f1b4f9a9ba35104 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Tue, 27 Apr 2021 22:36:36 +0200 Subject: tidy(json): all .mcmeta and .info Normalise all these json files with jq Used Linux shell ```sh find ./src -type f \( -iname '*.mcmeta' -o -iname '*.info' \) -execdir bash -c ' for f; do if jq "." "$f" >/tmp/a.json; then cat /tmp/a.json >"$f"; fi; done; rm -f -- /tmp/a.json ' _ {} +; ``` --- .../basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png.mcmeta | 8 ++++---- .../basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png.mcmeta | 8 ++++---- .../basicmachines/centrifuge/OVERLAY_TOP_ACTIVE.png.mcmeta | 8 ++++---- .../electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png.mcmeta | 8 ++++---- .../laser_engraver/OVERLAY_FRONT_ACTIVE.png.mcmeta | 8 ++++---- .../basicmachines/macerator/OVERLAY_TOP_ACTIVE.png.mcmeta | 8 ++++---- .../blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png.mcmeta | 9 ++++----- .../blocks/basicmachines/mixer/OVERLAY_FRONT_ACTIVE.png.mcmeta | 8 ++++---- .../blocks/basicmachines/mixer/OVERLAY_SIDE_ACTIVE.png.mcmeta | 8 ++++---- .../blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png.mcmeta | 8 ++++---- .../basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png.mcmeta | 8 ++++---- .../basicmachines/sifter/OVERLAY_FRONT_ACTIVE.png.mcmeta | 8 ++++---- .../gregtech/textures/blocks/fluids/fluid.air.png.mcmeta | 8 ++++---- .../gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta | 8 ++++---- .../gregtech/textures/blocks/fluids/fluid.berylium.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.bioethanol.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.biomass.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.calcium.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.calciumcarbonate.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.chlorine.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.creosote.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.dyes.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.fieryblood.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.fishoil.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.fluorine.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.for.honey.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.fuel.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.glyceryl.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.heliumplasma.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.holywater.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.hotfryingoil.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.hydrochloricacid.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.ice.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.indigo.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.indiumconcentrate.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.iron3chloride.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.leadzincsolution.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.lifeessence.png.mcmeta | 8 ++++---- .../blocks/fluids/fluid.liquid_cracked_heavy_fuel.png.mcmeta | 10 +++++----- .../blocks/fluids/fluid.liquid_cracked_light_fuel.png.mcmeta | 10 +++++----- .../blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta | 10 +++++----- .../blocks/fluids/fluid.liquid_epichlorhydrin.png.mcmeta | 10 +++++----- .../blocks/fluids/fluid.liquid_extra_heavy_oil.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.liquid_heavy_fuel.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.liquid_heavy_oil.png.mcmeta | 10 +++++----- .../blocks/fluids/fluid.liquid_hydricsulfur.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.liquid_light_fuel.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.liquid_light_oil.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.liquid_lpg.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.liquid_medium_oil.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.liquid_naphtha.png.mcmeta | 10 +++++----- .../blocks/fluids/fluid.liquid_nitrationmixture.png.mcmeta | 2 +- .../blocks/fluids/fluid.liquid_sufluriclight_fuel.png.mcmeta | 10 +++++----- .../blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png.mcmeta | 10 +++++----- .../blocks/fluids/fluid.liquid_sulfuricnaphtha.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.liquid_toluene.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.liquidair.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.liquidnitrogen.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.lithium.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.lubricant.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.mcguffium.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.mercury.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.methane.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.milk.png.mcmeta | 10 +++++----- .../blocks/fluids/fluid.molten.autogenerated.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.molten.blaze.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.molten.concrete.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.molten.glass.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.molten.redstone.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.nitricacid.png.mcmeta | 2 +- .../textures/blocks/fluids/fluid.nitrocoalfuel.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.nitrofuel.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.nitrogen.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.nitrogendioxide.png.mcmeta | 10 +++++----- .../textures/blocks/fluids/fluid.nitrogenplasma.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.oil.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.oxygen.png.mcmeta | 10 +++++----- .../blocks/fluids/fluid.plasma.autogenerated.png.mcmeta | 10 +++++----- .../gregtech/textures/blocks/fluids/fluid.potassium.png.mcmeta | 10 +++++----- .../textures/block