diff options
| author | Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2022-01-28 20:14:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-28 21:14:17 +0100 |
| commit | 3d2640eab73e1ecb17cff4700d8aa83fb324ee37 (patch) | |
| tree | 8f357eef9d15f16ba54b9462eb53707055920d55 /src/main/resources/assets/gregtech/textures | |
| parent | bba8933048adf109d7b1f2bfa42517b2a9fbd5cf (diff) | |
| download | GT5-Unofficial-3d2640eab73e1ecb17cff4700d8aa83fb324ee37.tar.gz GT5-Unofficial-3d2640eab73e1ecb17cff4700d8aa83fb324ee37.tar.bz2 GT5-Unofficial-3d2640eab73e1ecb17cff4700d8aa83fb324ee37.zip | |
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 <fredcraft00@gmail.com>
* 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 <fredcraft00@gmail.com>
Diffstat (limited to 'src/main/resources/assets/gregtech/textures')
87 files changed, 60 insertions, 4 deletions
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 Binary files differindex 452fdbd87e..c698b0be17 100644 --- 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 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 Binary files differindex d516e76bba..86292d73c9 100644 --- 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 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 Binary files differindex be9952df16..3de2e3c1e7 100644 --- 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 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 Binary files differindex 2cfc24f4f8..b9674846e9 100644 --- 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 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 Binary files differindex 6d5eff86a8..8e0e0a558c 100644 --- 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 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 Binary files differindex 9f0d070db1..fa3b20b25a 100644 --- 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 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 Binary files differindex 7ace139cc4..36a00dedd8 100644 --- 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 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 Binary files differindex b936c410ed..0e11895229 100644 --- 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 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 Binary files differindex 2bc949a1a8..755cc5f6a7 100644 --- 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 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 Binary files differindex d027a62ce5..56a4713a5d 100644 --- 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 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 Binary files differindex 93584b1f2b..2ced6b9a2c 100644 --- 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 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 Binary files differindex 44af026386..103dd59642 100644 --- 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 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 Binary files differindex c8cd7cf25d..2a5fa09333 100644 --- 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 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 Binary files differindex 27fd4ead79..a6c3473c9d 100644 --- 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 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 Binary files differindex d62a662bfc..f935cc2235 100644 --- 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 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 Binary files differindex 20d5fac031..777f75e09b 100644 --- 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 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 Binary files differindex eb1b41e9b2..492d227b06 100644 --- 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 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 Binary files differindex 3bca68c714..60dd273504 100644 --- 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 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 Binary files differindex 2b5d59280a..d20f5fcaf7 100644 --- 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 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 Binary files differindex 511615ff81..43d56e6f5a 100644 --- 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 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 Binary files differindex eb4b39895c..1764de0a54 100644 --- 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 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 Binary files differindex 111e668210..108527d096 100644 --- 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 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 Binary files differindex 014e9e9e02..d72bc57b5f 100644 --- 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 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 Binary files differindex f1759e81cc..e9215f7784 100644 --- 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 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 Binary files differindex caac3a49ed..651cd61b6b 100644 --- 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 |
