diff options
| author | Martin Robertz <dream-master@gmx.net> | 2022-09-01 07:06:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-01 07:06:50 +0200 |
| commit | 88c85d87946a2a0664afe0115dc6762238fa3670 (patch) | |
| tree | 0a470c127104438641b4da525ccfb882e63f44f9 /src/main/resources/assets/gregtech/textures/blocks/fluids | |
| parent | e6275c61c08f5fcc03ae234b4d68b2a74644b2e7 (diff) | |
| download | GT5-Unofficial-88c85d87946a2a0664afe0115dc6762238fa3670.tar.gz GT5-Unofficial-88c85d87946a2a0664afe0115dc6762238fa3670.tar.bz2 GT5-Unofficial-88c85d87946a2a0664afe0115dc6762238fa3670.zip | |
Sodium potassium (#1322)
* Add a new way get Sodium Potassium
Add Fluid Sodium to gt
* spotless
remove old NAk and Helium cell recipes
* derp
* add liquid sodium texture
(cherry picked from commit bd050330f91e0306e156f6a130783e867661338a)
* add liquid sodium cells
(cherry picked from commit 45f988cf3bbca43abf3f07a0a8e7ba891b8727a3)
* move recipe to core mod
(cherry picked from commit 7db15cd792136abac6fb88c9a7fa9d05f1f0619e)
* add a heater recipe without a input fluid
* Revert "move recipe to core mod"
This reverts commit 9d5ff875a00e59c6edb52336b7d9c20889d9bd9b.
* use fluid heater recipe without input fluid
* Spotless apply for branch Sodium-Potassium for #1322 (#1328)
* Two slots wiremill (#1324)
* add a circuit slot to wiremil
* add circuits to wire recipes
* add 2 input slots to Wiremil
* exchange circuit and material slot
* add 2x-16x wires to wiremil
* add missing 12x wires
* add slot migration code (#1326)
* spotlessApply (#1327)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* spotlessApply
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Revert "Spotless apply for branch Sodium-Potassium for #1322 (#1328)"
This reverts commit 5bf31ffddfeddd1c4d161d434abb8402939ec9d6.
* spotless
* make fluid heater working with <1 fluid
(cherry picked from commit 8045cf6f03d0ce030b8e7b2fa6c70dca6d9ccc5d)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Diffstat (limited to 'src/main/resources/assets/gregtech/textures/blocks/fluids')
2 files changed, 5 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sodium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sodium.png Binary files differnew file mode 100644 index 0000000000..9095310faf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sodium.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sodium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sodium.png.mcmeta new file mode 100644 index 0000000000..0645f48c62 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sodium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} |
