From 55a6ac375cd21584aef3d38e4770d9961f2bddb3 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Tue, 27 Aug 2024 22:24:31 +0100 Subject: Bartworks cleaning (#2951) * Remove added by bartworks from every single item * Fix germanglish * Works * Clean up a little * Ok, spiralled a little but hopefully worth it... * Spotless * Less "added by" * Clean up tooltips somewhat * more cleanups * Bit more cleaning * Spotless * Reduce random glass crap * Get rid of destructopack (useless) * Magneto work * Further refactor/cleanup * Move Boro tags to materials * Attempt fix * No longer needed * Go away * Rename * Remove dead recipes * Spotless apply for branch bartTooltips for #2951 (#2952) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Add warded glass to HV * remove ignored --------- Co-authored-by: Connor Colenso Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz Co-authored-by: boubou19 --- src/main/resources/assets/bartworks/lang/de_DE.lang | 2 +- src/main/resources/assets/bartworks/lang/en_US.lang | 5 ++--- .../textures/items/gt.bwMetaGeneratedItem0/10.png | Bin 337 -> 0 bytes .../textures/items/gt.bwMetaGeneratedItem0/11.png | Bin 367 -> 0 bytes .../textures/items/gt.bwMetaGeneratedItem0/12.png | Bin 433 -> 0 bytes .../textures/items/gt.bwMetaGeneratedItem0/13.png | Bin 401 -> 0 bytes .../textures/items/gt.bwMetaGeneratedItem0/14.png | Bin 859 -> 0 bytes .../gregtech/textures/items/gt.bwMetaGeneratedItem0/4.png | Bin 222 -> 0 bytes .../gregtech/textures/items/gt.bwMetaGeneratedItem0/5.png | Bin 344 -> 0 bytes .../gregtech/textures/items/gt.bwMetaGeneratedItem0/6.png | Bin 347 -> 0 bytes .../gregtech/textures/items/gt.bwMetaGeneratedItem0/7.png | Bin 331 -> 0 bytes .../gregtech/textures/items/gt.bwMetaGeneratedItem0/8.png | Bin 331 -> 0 bytes .../gregtech/textures/items/gt.bwMetaGeneratedItem0/9.png | Bin 378 -> 0 bytes 13 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/10.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/11.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/12.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/13.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/14.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/4.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/5.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/6.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/7.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/8.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/9.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/bartworks/lang/de_DE.lang b/src/main/resources/assets/bartworks/lang/de_DE.lang index 23edaf6124..e235b69987 100644 --- a/src/main/resources/assets/bartworks/lang/de_DE.lang +++ b/src/main/resources/assets/bartworks/lang/de_DE.lang @@ -110,7 +110,7 @@ tooltip.tile.acidgen.0.name=Ein Säure Generator tooltip.tile.acidgen.1.name=Creates Power from Chemical Energy Potentials. tooltip.tile.biolab.0.name=The BioLab, a Multi-Use Bioengineering Station tooltip.tile.diode.0.name=A Simple diode that will allow Energy Flow in only one direction. -tooltip.tile.energydistributor.0.name=Splits Amperage into several Sides. +tooltip.tile.energydistributor.0.name=Splits Amperage into several sides. tooltip.tile.lesu.0.name=Controller Block for the GT2-Styled L.E.S.U.;Size: ANY tooltip.tile.lesu.1.name=Storage per LESU Casing: tooltip.tile.lesu.2.name=Output EU: LESU Casings amount;Input EU: Next Voltage Tier to Output EU;Input/Output Amps can be configured via 4 Circuits in GUI;Output Side has a dot on it. diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang index d46308df23..30d4a0b7ab 100644 --- a/src/main/resources/assets/bartworks/lang/en_US.lang +++ b/src/main/resources/assets/bartworks/lang/en_US.lang @@ -67,7 +67,7 @@ BW_GlasBlocks.14.name=Cosmic Neutronium Reinforced Borosilicate Glass Block BW_GlasBlocks.15.name=Infinity Reinforced Borosilicate Glass Block BW_GlasBlocks2.0.name=Transcendentally Reinforced Borosilicate Glass Block -tooltip.glas.0.name=Glass-Tier: +tooltip.glass_tier.0.name=Glass-Tier: tooltip.LESU.0.name=Maximum Capacity! tooltip.LESU.1.name=Multiple Controllers! @@ -95,7 +95,6 @@ tooltip.bw.tier.name=Tier: tooltip.bw.kg.0.name=kg tooltip.bw.kg.1.name=kgs tooltip.bw.empty.name=Empty -tooltip.bw.via.name=Added by %s§7 via §2BartWorks tooltip.bw.mb_via.name=%s§7 via §2BartWorks tooltip.teslastaff.0.name=No warranty! @@ -127,7 +126,7 @@ tooltip.tile.tiereddsc.1.name=Amperage IN: tooltip.tile.tiereddsc.2.name=Amperage OUT: tooltip.tile.tiereddsc.3.name=Capacity: tooltip.tile.diode.0.name=A Simple diode that will allow Energy Flow in only one direction. -tooltip.tile.energydistributor.0.name=Splits Amperage into several Sides. +tooltip.tile.energydistributor.0.name=Splits Amperage into several sides. tooltip.tile.biolab.0.name=The BioLab, a Multi-Use Bioengineering Station tooltip.tile.radhatch.0.name=Radioactive Item Chamber for Multiblocks tooltip.tile.radhatch.1.name=Use a screwdriver to set the containment level diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/10.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/10.png deleted file mode 100644 index 38429ed78d..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/10.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/11.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/11.png deleted file mode 100644 index 3901815927..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/11.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/12.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/12.png deleted file mode 100644 index c97ec3384c..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/12.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/13.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/13.png deleted file mode 100644 index 40e5c92817..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/13.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/14.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/14.png deleted file mode 100644 index 10c6f20de0..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/14.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/4.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/4.png deleted file mode 100644 index 86411e18bd..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/4.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/5.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/5.png deleted file mode 100644 index 57a7c7a932..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/5.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/6.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/6.png deleted file mode 100644 index 9f68371247..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/6.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/7.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/7.png deleted file mode 100644 index 7a322b76c0..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/7.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/8.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/8.png deleted file mode 100644 index 9fe039db81..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/8.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/9.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/9.png deleted file mode 100644 index 457a51b7a1..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/9.png and /dev/null differ -- cgit