From f185448ac0452b6d88319b27d91706f45cb7a09b Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Thu, 27 Jan 2022 07:20:41 +0000 Subject: Add new circuit tiers (#895) * New circuits * Fix last tier ore dict * Colorfull tier tooltips (#898) * Make Repellator stop slimes spawning (#896) * Add special tooltip handling, requested by Colen Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman --- .../gregtech/textures/items/gt.metaitem.03/154.png | Bin 0 -> 608 bytes .../gregtech/textures/items/gt.metaitem.03/155.png | Bin 0 -> 635 bytes .../gregtech/textures/items/gt.metaitem.03/156.png | Bin 0 -> 1850 bytes .../gregtech/textures/items/gt.metaitem.03/157.png | Bin 0 -> 4526 bytes .../gregtech/textures/items/gt.metaitem.03/166.png | Bin 0 -> 2607 bytes .../gregtech/textures/items/gt.metaitem.03/167.png | Bin 0 -> 2801 bytes .../gregtech/textures/items/gt.metaitem.03/168.png | Bin 0 -> 1836 bytes .../gregtech/textures/items/gt.metaitem.03/169.png | Bin 0 -> 23119 bytes .../gregtech/textures/items/gt.metaitem.03/170.png | Bin 0 -> 2538 bytes .../gregtech/textures/items/gt.metaitem.03/171.png | Bin 0 -> 2745 bytes .../gregtech/textures/items/gt.metaitem.03/172.png | Bin 0 -> 1826 bytes .../gregtech/textures/items/gt.metaitem.03/173.png | Bin 0 -> 22854 bytes .../gregtech/textures/items/gt.metaitem.03/174.png | Bin 0 -> 815 bytes .../textures/items/gt.metaitem.03/174.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.03/175.png | Bin 0 -> 1005 bytes .../textures/items/gt.metaitem.03/175.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.03/176.png | Bin 0 -> 3331 bytes .../textures/items/gt.metaitem.03/176.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.03/177.png | Bin 0 -> 18422 bytes .../textures/items/gt.metaitem.03/177.png.mcmeta | 7 +++++++ 20 files changed, 28 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/154.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/155.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/156.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/157.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/166.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/167.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/168.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/169.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/170.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/171.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/172.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/173.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/174.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/174.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/175.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/175.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/176.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/176.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/177.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/177.png.mcmeta (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/154.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/154.png new file mode 100644 index 0000000000..d9a3c69a98 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/154.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/155.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/155.png new file mode 100644 index 0000000000..166b70636a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/155.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/156.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/156.png new file mode 100644 index 0000000000..27e17024f8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/156.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/157.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/157.png new file mode 100644 index 0000000000..105d2adde9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/157.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/166.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/166.png new file mode 100644 index 0000000000..32268beac2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/166.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/167.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/167.png new file mode 100644 index 0000000000..6273e9099f Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/167.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/168.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/168.png new file mode 100644 index 0000000000..fca0df8cbb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/168.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/169.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/169.png new file mode 100644 index 0000000000..16acebbeac Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/169.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/170.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/170.png new file mode 100644 index 0000000000..498bd4362a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/170.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/171.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/171.png new file mode 100644 index 0000000000..00cce1a49c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/171.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/172.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/172.png new file mode 100644 index 0000000000..169588ebd3 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/172.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/173.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/173.png new file mode 100644 index 0000000000..3179b357c8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/173.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/174.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/174.png new file mode 100644 index 0000000000..99d1057b16 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/174.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/174.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/174.png.mcmeta new file mode 100644 index 0000000000..1f1b5fe80e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/174.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,10,1,2,3,4,5,6,7,8,9,10] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/175.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/175.png new file mode 100644 index 0000000000..f14932409c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/175.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/175.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/175.png.mcmeta new file mode 100644 index 0000000000..1f1b5fe80e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/175.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,10,1,2,3,4,5,6,7,8,9,10] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/176.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/176.png new file mode 100644 index 0000000000..4f846c60a1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/176.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/176.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/176.png.mcmeta new file mode 100644 index 0000000000..1f1b5fe80e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/176.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,10,1,2,3,4,5,6,7,8,9,10] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/177.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/177.png new file mode 100644 index 0000000000..f635446dc0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/177.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/177.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/177.png.mcmeta new file mode 100644 index 0000000000..1f1b5fe80e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/177.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,10,1,2,3,4,5,6,7,8,9,10] +} +} \ No newline at end of file -- cgit