diff options
author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2022-06-22 23:03:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-23 00:03:38 +0200 |
commit | ba6bc0844281558f35cce72b54267064f6d86208 (patch) | |
tree | 92577639d247cd6f255865ed2462f46b0ea3ad80 /src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM | |
parent | 2b272a028ffe3c133f6d8011bb6a6b37d2c44b31 (diff) | |
download | GT5-Unofficial-ba6bc0844281558f35cce72b54267064f6d86208.tar.gz GT5-Unofficial-ba6bc0844281558f35cce72b54267064f6d86208.tar.bz2 GT5-Unofficial-ba6bc0844281558f35cce72b54267064f6d86208.zip |
Plasma forge fixes (#1086)
* Basis of changes.
* Fix item stack and fluid vanishing.
* Add new plasma forge UI, change tooltip and fix recipe map.
* Fix corrupted fluid registry.
* Fix fluids in recipes. Items still need adjusting.
* Working.
* Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly.
* Make animation of spacetime fluid slower.
* Fix recipe map (again).
* Remove screwdriver junk. Clean up code slightly.
* More cleaning.
* Comments
* Add hatch limitations and add some additional information. Also update NEI GUI.
* Add proper recipes and change SpaceTime to a fluid not a gas.
* Remove depreciated coil check (since I stole the IDs).
* Remove depreciated coil check (since I stole the IDs). Add more comments.
* Change temp of SpaceTime.
* Add catalyst recipes + support for 16:16 fusion recipes.
* Add comments.
* Scala fix maybe?
* Change plasma forge GUI.
* Uncap temperature of materials. (Short -> Int)
* Add chunkloading support (when multi is active).
* Fix NEI merge issues.
* fix used ids in kevlar
* Add fluid support for laser engraver.
* fix sh***t
(cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc)
* Add new intermediate materials to facilitate crafting. Also fix fusion typo.
* Fix heat/fluid quantity display to be formatted correctly.
* Change recipes to be more balanced.
* Change residue fluid texture.
* Restore better naming for multiblock.
* Fix recipe typo.
* Fix text not wrapping in multi controller.
* Give laser engraver internal fluid storage.
* Add IMC NEI support.
* Update material properties.
* Remove old dev comments.
* Fix NEI texture.
* Update/fix plasma forge recipes.
* Increase max hatch count.
* Increase max hatch count and fix mixing energy hatches. Plus quick check for processing time.
* Fix spacetime recipe.
* Update spacetime textures and add new item textures.
* Remove manual spacetime fluid addition.
* Add custom fluid texture override ability.
* Update infinity and spacetime to use new custom fluid override texture.
* Depreciate old recipe adding methods.
* Refactor GT NEI handler.
* Remove unnecessary import.
* Remove debug comment.
* Clean up auto generated fluid code.
* Fix NPE and add a few comments.
* Refactor GT NEI handler.
* Update NEI GUIs.
* More NEI fixes.
* Update LCR NEI GUI.
* Update error message.
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM')
40 files changed, 20 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block1.png Binary files differnew file mode 100644 index 0000000000..fe5696854b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block1.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block1.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block1.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block1.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block2.png Binary files differnew file mode 100644 index 0000000000..3c16027281 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block2.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block2.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block2.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block2.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block3.png Binary files differnew file mode 100644 index 0000000000..2039686729 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block3.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block3.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block3.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block3.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block4.png Binary files differnew file mode 100644 index 0000000000..8973d85aa6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block4.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block4.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block4.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block4.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block5.png Binary files differnew file mode 100644 index 0000000000..32064d03f2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block5.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block5.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block5.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block5.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block6.png Binary files differnew file mode 100644 index 0000000000..fe5696854b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block6.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block6.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block6.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block6.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/foil.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/foil.png Binary files differnew file mode 100644 index 0000000000..c0c56739cf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/foil.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/foil.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/foil.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/foil.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/frameGt.png Binary files differnew file mode 100644 index 0000000000..50c039685a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/frameGt.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/frameGt.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/frameGt.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/frameGt.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/ore.png Binary files differnew file mode 100644 index 0000000000..56dae97474 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/ore.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/ore.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/ore.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/ore.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/oreSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/oreSmall.png Binary files differnew file mode 100644 index 0000000000..d31c5ecbc5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/oreSmall.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/oreSmall.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/oreSmall.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/oreSmall.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeHuge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeHuge.png Binary files differnew file mode 100644 index 0000000000..faa3705e1c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeHuge.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeHuge.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeHuge.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeHuge.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeLarge.png Binary files differnew file mode 100644 index 0000000000..d2fbc52c0c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeLarge.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeLarge.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeLarge.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeLarge.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeMedium.png Binary files differnew file mode 100644 index 0000000000..90d155616b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeMedium.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeMedium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeMedium.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeMedium.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeNonuple.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeNonuple.png Binary files differnew file mode 100644 index 0000000000..ae286dcb67 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeNonuple.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeNonuple.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeNonuple.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeNonuple.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeQuadruple.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeQuadruple.png Binary files differnew file mode 100644 index 0000000000..17cc38c1ee --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeQuadruple.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeQuadruple.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeQuadruple.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeQuadruple.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSide.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSide.png Binary files differnew file mode 100644 index 0000000000..2516a0e251 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSide.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSide.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSide.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSide.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSmall.png Binary files differnew file mode 100644 index 0000000000..c32a9a6cc1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSmall.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSmall.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSmall.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSmall.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeTiny.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeTiny.png Binary files differnew file mode 100644 index 0000000000..b7bac67dd8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeTiny.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeTiny.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeTiny.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeTiny.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/void.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/void.png Binary files differnew file mode 100644 index 0000000000..a0e07617e8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/void.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/void.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/void.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/void.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/wire.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/wire.png Binary files differnew file mode 100644 index 0000000000..c29481f3d8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/wire.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/wire.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/wire.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/wire.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file |