From 3d2640eab73e1ecb17cff4700d8aa83fb324ee37 Mon Sep 17 00:00:00 2001 From: Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Fri, 28 Jan 2022 20:14:17 +0000 Subject: Texture tooltips update (#903) * 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 * Fixed github shenanigans with new tier colours. * Update A LOT of textures (mostly minor) * Remove extraneous comments. * Remove obsolete comments and update materials.java. * Add tooltips for all batteries in base GT. * Remove test case Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman --- .../gregtech/textures/items/gt.metaitem.01/17.png | Bin 1689 -> 5324 bytes .../gregtech/textures/items/gt.metaitem.01/19.png | Bin 1708 -> 1258 bytes .../gregtech/textures/items/gt.metaitem.01/20.png | Bin 5247 -> 2838 bytes .../textures/items/gt.metaitem.01/20.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.01/21.png | Bin 2109 -> 1308 bytes .../gregtech/textures/items/gt.metaitem.01/22.png | Bin 2136 -> 1301 bytes .../gregtech/textures/items/gt.metaitem.01/23.png | Bin 2128 -> 1289 bytes .../gregtech/textures/items/gt.metaitem.01/24.png | Bin 5454 -> 2961 bytes .../textures/items/gt.metaitem.01/24.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.01/25.png | Bin 1991 -> 5564 bytes .../gregtech/textures/items/gt.metaitem.01/27.png | Bin 2015 -> 1378 bytes .../gregtech/textures/items/gt.metaitem.01/28.png | Bin 5480 -> 2837 bytes .../textures/items/gt.metaitem.01/28.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.01/29.png | Bin 1894 -> 5232 bytes .../gregtech/textures/items/gt.metaitem.01/31.png | Bin 1909 -> 1194 bytes .../gregtech/textures/items/gt.metaitem.01/32.png | Bin 5145 -> 2249 bytes .../textures/items/gt.metaitem.01/32.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.01/33.png | Bin 2244 -> 1354 bytes .../gregtech/textures/items/gt.metaitem.01/35.png | Bin 2233 -> 1327 bytes .../gregtech/textures/items/gt.metaitem.01/36.png | Bin 5374 -> 2918 bytes .../textures/items/gt.metaitem.01/36.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.01/37.png | Bin 2038 -> 1416 bytes .../gregtech/textures/items/gt.metaitem.01/38.png | Bin 2050 -> 1448 bytes .../gregtech/textures/items/gt.metaitem.01/39.png | Bin 2048 -> 1405 bytes .../gregtech/textures/items/gt.metaitem.01/40.png | Bin 5790 -> 2972 bytes .../textures/items/gt.metaitem.01/40.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.01/41.png | Bin 1962 -> 1384 bytes .../gregtech/textures/items/gt.metaitem.01/42.png | Bin 2000 -> 3093 bytes .../gregtech/textures/items/gt.metaitem.01/43.png | Bin 1993 -> 1335 bytes .../gregtech/textures/items/gt.metaitem.01/44.png | Bin 5749 -> 3346 bytes .../textures/items/gt.metaitem.01/44.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.01/45.png | Bin 1888 -> 1503 bytes .../gregtech/textures/items/gt.metaitem.01/47.png | Bin 1902 -> 1493 bytes .../gregtech/textures/items/gt.metaitem.01/48.png | Bin 6626 -> 2806 bytes .../textures/items/gt.metaitem.01/48.png.mcmeta | 7 +++++++ .../gregtech/textures/items/gt.metaitem.01/640.png | Bin 413 -> 898 bytes .../gregtech/textures/items/gt.metaitem.01/641.png | Bin 425 -> 906 bytes .../gregtech/textures/items/gt.metaitem.01/642.png | Bin 410 -> 903 bytes .../gregtech/textures/items/gt.metaitem.01/643.png | Bin 394 -> 886 bytes .../gregtech/textures/items/gt.metaitem.01/644.png | Bin 411 -> 886 bytes .../gregtech/textures/items/gt.metaitem.01/645.png | Bin 438 -> 926 bytes .../gregtech/textures/items/gt.metaitem.01/646.png | Bin 435 -> 910 bytes .../gregtech/textures/items/gt.metaitem.01/647.png | Bin 455 -> 931 bytes .../gregtech/textures/items/gt.metaitem.01/648.png | Bin 457 -> 947 bytes .../gregtech/textures/items/gt.metaitem.01/649.png | Bin 2168 -> 1809 bytes .../gregtech/textures/items/gt.metaitem.01/651.png | Bin 483 -> 963 bytes .../gregtech/textures/items/gt.metaitem.01/652.png | Bin 491 -> 1384 bytes .../gregtech/textures/items/gt.metaitem.01/655.png | Bin 483 -> 967 bytes .../gregtech/textures/items/gt.metaitem.01/656.png | Bin 485 -> 968 bytes .../gregtech/textures/items/gt.metaitem.01/657.png | Bin 497 -> 981 bytes .../gregtech/textures/items/gt.metaitem.01/658.png | Bin 493 -> 985 bytes .../gregtech/textures/items/gt.metaitem.01/680.png | Bin 525 -> 1478 bytes .../gregtech/textures/items/gt.metaitem.01/681.png | Bin 565 -> 1457 bytes .../gregtech/textures/items/gt.metaitem.01/682.png | Bin 561 -> 1450 bytes .../gregtech/textures/items/gt.metaitem.01/683.png | Bin 567 -> 1060 bytes .../gregtech/textures/items/gt.metaitem.01/684.png | Bin 545 -> 1448 bytes .../gregtech/textures/items/gt.metaitem.01/685.png | Bin 549 -> 1030 bytes .../gregtech/textures/items/gt.metaitem.01/686.png | Bin 565 -> 1034 bytes .../gregtech/textures/items/gt.metaitem.01/687.png | Bin 575 -> 1461 bytes .../gregtech/textures/items/gt.metaitem.01/688.png | Bin 3219 -> 1432 bytes .../gregtech/textures/items/gt.metaitem.01/689.png | Bin 2236 -> 1407 bytes .../gregtech/textures/items/gt.metaitem.01/690.png | Bin 486 -> 1385 bytes .../gregtech/textures/items/gt.metaitem.01/691.png | Bin 513 -> 1403 bytes .../gregtech/textures/items/gt.metaitem.01/692.png | Bin 471 -> 1374 bytes .../gregtech/textures/items/gt.metaitem.01/693.png | Bin 457 -> 1374 bytes .../gregtech/textures/items/gt.metaitem.01/694.png | Bin 482 -> 1364 bytes .../gregtech/textures/items/gt.metaitem.01/695.png | Bin 509 -> 1403 bytes .../gregtech/textures/items/gt.metaitem.01/696.png | Bin 502 -> 1383 bytes .../gregtech/textures/items/gt.metaitem.01/697.png | Bin 509 -> 1387 bytes .../gregtech/textures/items/gt.metaitem.01/698.png | Bin 3164 -> 1389 bytes .../gregtech/textures/items/gt.metaitem.01/699.png | Bin 2223 -> 1967 bytes .../gregtech/textures/items/gt.metaitem.01/705.png | Bin 4051 -> 5088 bytes .../gregtech/textures/items/gt.metaitem.01/706.png | Bin 4039 -> 5031 bytes .../gregtech/textures/items/gt.metaitem.03/120.png | Bin 6682 -> 5070 bytes .../gregtech/textures/items/gt.metaitem.03/174.png | Bin 815 -> 1706 bytes .../textures/items/gt.metaitem.03/174.png.mcmeta | 2 +- .../gregtech/textures/items/gt.metaitem.03/175.png | Bin 1005 -> 2050 bytes .../textures/items/gt.metaitem.03/175.png.mcmeta | 2 +- .../gregtech/textures/items/gt.metaitem.03/176.png | Bin 3331 -> 5365 bytes .../textures/items/gt.metaitem.03/176.png.mcmeta | 2 +- .../gregtech/textures/items/gt.metaitem.03/177.png | Bin 18422 -> 23976 bytes .../textures/items/gt.metaitem.03/177.png.mcmeta | 2 +- .../gregtech/textures/items/gt.metaitem.03/88.png | Bin 4062 -> 5092 bytes .../gregtech/textures/items/gt.metaitem.03/91.png | Bin 4043 -> 5028 bytes .../gregtech/textures/items/gt.metaitem.03/95.png | Bin 4059 -> 5044 bytes .../gregtech/textures/items/gt.metaitem.03/98.png | Bin 3028 -> 1709 bytes .../gregtech/textures/items/gt.metaitem.03/99.png | Bin 3732 -> 1995 bytes 87 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png.mcmeta (limited to 'src/main/resources/assets/gregtech/textures') diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/17.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/17.png index 452fdbd87e..c698b0be17 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/17.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/17.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/19.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/19.png index d516e76bba..86292d73c9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/19.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/19.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png index be9952df16..3de2e3c1e7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png.mcmeta new file mode 100644 index 0000000000..c25849f001 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/20.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,1,2,3,4,5,6,7,8] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/21.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/21.png index 2cfc24f4f8..b9674846e9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/21.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/21.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/22.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/22.png index 6d5eff86a8..8e0e0a558c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/22.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/22.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/23.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/23.png index 9f0d070db1..fa3b20b25a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/23.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/23.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png index 7ace139cc4..36a00dedd8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png.mcmeta new file mode 100644 index 0000000000..c25849f001 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/24.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,1,2,3,4,5,6,7,8] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/25.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/25.png index b936c410ed..0e11895229 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/25.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/25.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/27.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/27.png index 2bc949a1a8..755cc5f6a7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/27.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/27.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png index d027a62ce5..56a4713a5d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png.mcmeta new file mode 100644 index 0000000000..c25849f001 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/28.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,1,2,3,4,5,6,7,8] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/29.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/29.png index 93584b1f2b..2ced6b9a2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/29.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/29.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/31.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/31.png index 44af026386..103dd59642 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/31.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/31.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png index c8cd7cf25d..2a5fa09333 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png.mcmeta new file mode 100644 index 0000000000..c25849f001 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/32.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,1,2,3,4,5,6,7,8] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/33.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/33.png index 27fd4ead79..a6c3473c9d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/33.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/33.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/35.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/35.png index d62a662bfc..f935cc2235 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/35.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/35.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png index 20d5fac031..777f75e09b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png.mcmeta new file mode 100644 index 0000000000..c25849f001 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/36.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,1,2,3,4,5,6,7,8] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/37.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/37.png index eb1b41e9b2..492d227b06 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/37.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/37.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/38.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/38.png index 3bca68c714..60dd273504 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/38.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/38.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/39.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/39.png index 2b5d59280a..d20f5fcaf7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/39.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/39.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png index 511615ff81..43d56e6f5a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png.mcmeta new file mode 100644 index 0000000000..c25849f001 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/40.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,1,2,3,4,5,6,7,8] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/41.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/41.png index eb4b39895c..1764de0a54 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/41.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/41.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/42.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/42.png index 111e668210..108527d096 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/42.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/42.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/43.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/43.png index 014e9e9e02..d72bc57b5f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/43.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/43.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png index f1759e81cc..e9215f7784 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png.mcmeta new file mode 100644 index 0000000000..c25849f001 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/44.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,1,2,3,4,5,6,7,8] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/45.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/45.png index caac3a49ed..651cd61b6b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/45.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/45.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/47.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/47.png index 3105d81408..4ba041f74d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/47.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/47.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png index 8e58f7bae9..81f787fe7e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png.mcmeta new file mode 100644 index 0000000000..c25849f001 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/48.png.mcmeta @@ -0,0 +1,7 @@ +{ +"animation": { +"interpolate": true, +"frametime": 5, +"frames":[0,1,2,3,4,5,6,7,8] +} +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/640.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/640.png index 0e6af0c1ff..e7f1b5b266 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/640.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/640.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/641.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/641.png index a5f0ff14d0..ee194c90fd 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/641.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/641.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/642.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/642.png index eb7a7b7a97..ba67d17035 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/642.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/642.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/643.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/643.png index 930b44214c..000336317b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/643.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/643.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/644.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/644.png index 051b45e6bc..2134d7a293 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/644.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/644.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/645.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/645.png index 47bc25bede..2f230840e4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/645.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/645.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/646.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/646.png index 45fe69fc68..443a8a5406 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/646.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/646.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/647.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/647.png index 617ddf2a34..e2e0bc078b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/647.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/647.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/648.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/648.png index f5e2cf1161..a2f666ed99 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/648.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/648.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/649.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/649.png index da14e263ec..28dd7ae36d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/649.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/649.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/651.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/651.png index 9a12d7c1d1..e9a747e633 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/651.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/651.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/652.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/652.png index c483adda76..0e9d3b3928 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/652.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/652.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/655.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/655.png index 3284b14a29..64d31b46a4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/655.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/655.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/656.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/656.png index 88438bc12b..ad9f1f2e22 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/656.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/656.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/657.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/657.png index 1fcb002fdc..837560c7fa 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/657.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/657.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/658.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/658.png index 014aea1f83..2d89b612e4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/658.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/658.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/680.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/680.png index 6a7af63bde..0c0701d1ae 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/680.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/680.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/681.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/681.png index ef3bafa41a..61ba336638 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/681.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/681.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/682.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/682.png index 20d2d9b1f8..3d6a0c1baa 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/682.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/682.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/683.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/683.png index 522bbb3963..edc506c2f0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/683.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/683.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/684.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/684.png index a1c2183ee8..dea0298e86 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/684.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/684.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/685.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/685.png index 476b7f1fb9..bfb121d33c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/685.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/685.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/686.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/686.png index 862a7854b5..202f592307 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/686.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/686.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/687.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/687.png index 9515966053..7d957b0b11 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/687.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/687.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 8573c22620..8ffc4e54a5 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/689.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/689.png index f8a83ab2f5..1427b6a469 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/689.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/689.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/690.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/690.png index 2841e2ab5a..9c2e006630 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/690.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/690.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/691.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/691.png index c982329b9f..28b28610ee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/691.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/691.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/692.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/692.png index 30d3029fb0..037a3fa2ce 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/692.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/692.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/693.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/693.png index 0d090c3d7b..3de7f8dc3f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/693.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/693.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/694.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/694.png index 5e4886b0f8..8c949b4036 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/694.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/694.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/695.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/695.png index 88fde9e8cd..232b44ccb8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/695.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/695.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/696.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/696.png index c1f809fc7a..7ef2ee9e88 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/696.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/696.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/697.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/697.png index 855732e3ed..f40a302ba1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/697.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/697.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 73be90cea7..02adf7a676 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 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/699.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/699.png index 7a59b8d4d3..ccb9d7fab0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/699.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/699.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/705.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/705.png index 7bdb5c7ac0..fba860b2e4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/705.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/705.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/706.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/706.png index f2ac923359..14e06a216d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/706.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/706.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png index f91bcd2f26..ac9558f3cc 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.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 index 99d1057b16..dc40f0e987 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/174.png 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 index 1f1b5fe80e..c25849f001 100644 --- 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 @@ -2,6 +2,6 @@ "animation": { "interpolate": true, "frametime": 5, -"frames":[0,10,1,2,3,4,5,6,7,8,9,10] +"frames":[0,1,2,3,4,5,6,7,8] } } \ 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 index f14932409c..bcaad2071c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/175.png 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 index 1f1b5fe80e..c25849f001 100644 --- 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 @@ -2,6 +2,6 @@ "animation": { "interpolate": true, "frametime": 5, -"frames":[0,10,1,2,3,4,5,6,7,8,9,10] +"frames":[0,1,2,3,4,5,6,7,8] } } \ 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 index 4f846c60a1..0592aea672 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/176.png 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 index 1f1b5fe80e..c25849f001 100644 --- 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 @@ -2,6 +2,6 @@ "animation": { "interpolate": true, "frametime": 5, -"frames":[0,10,1,2,3,4,5,6,7,8,9,10] +"frames":[0,1,2,3,4,5,6,7,8] } } \ 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 index f635446dc0..ca638d85cb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/177.png 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 index 1f1b5fe80e..c25849f001 100644 --- 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 @@ -2,6 +2,6 @@ "animation": { "interpolate": true, "frametime": 5, -"frames":[0,10,1,2,3,4,5,6,7,8,9,10] +"frames":[0,1,2,3,4,5,6,7,8] } } \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/88.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/88.png index 9af72bb220..cd68e05724 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/88.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/88.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/91.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/91.png index 9627adc0d2..1fe8c021b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/91.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/91.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/95.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/95.png index ad726ffedd..3edb35f5aa 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/95.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/95.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png index f53e236793..dd2a858e35 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png index 467fc0c666..4ce007930c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png differ -- cgit