diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2022-10-31 15:55:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 16:55:31 +0100 |
| commit | ec0469d5e0673b509af793c8d7456571339f7382 (patch) | |
| tree | 2b5f5ec3f947cd2693239105abf46411658b5eca /src/main/resources/assets/gregtech/textures | |
| parent | 17c8befe0e69580a2e71bb20d7b080fb8372ba7f (diff) | |
| download | GT5-Unofficial-ec0469d5e0673b509af793c8d7456571339f7382.tar.gz GT5-Unofficial-ec0469d5e0673b509af793c8d7456571339f7382.tar.bz2 GT5-Unofficial-ec0469d5e0673b509af793c8d7456571339f7382.zip | |
Add solenoid coils for cyclotron (#1494)
* Add solenoid coils for cyclotron.
* Fix?
* Push
* Spotless apply for branch cyclotron_coils for #1494 (#1495)
* Change stack size (#1484)
* Replace TSS Coils with Titanium-Platinum Ones (#1211)
* Replace TSS Coils with Titanium-Platinum Ones
- Created a new material, TPV-Alloy, made from Titanium, Platinum and Vanadium (3/3/1);
- Replaced the Tungstensteel Coil Block with a TPV one, to make it properly included in EV while adding a Platinum sink in that tier;
* Simplified Metal Proportion for TPV
* change tpv ebf temp to 3k to be even with TSS
(cherry picked from commit 52dda9f666d8e1b2d220a0b2d9e24513ad8a4490)
* add TPV mixer recipe
(cherry picked from commit 30b6cf62c14165add271a1ecc4a322ab0ce609d1)
* add tpv as metal via tag
(cherry picked from commit 75dba7283e26b6e2f717a3230d6369e4cbe20c8e)
* Spotless apply for branch EV_Coil_Change for #1211 (#1482)
* Remove convert gendustry bees code (#1187)
* Remove convert gendustry bees code
* fix derp. run BS update
Co-authored-by: Martin Robertz <dream-master@gmx.net>
* Added check to API if the block should drop its inventory on break (#1479)
* Added check to API if the block should drop its inventory on break
* Apply spotless
* Changed should drop flag to take index argument
* spotlessApply
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* move TSS and TPV to ev (Mixer recipe)
(cherry picked from commit 74dc0da61db49102cc3e073f5c506e8c494c508f)
* add info to Nei
* Spotless apply for branch EV_Coil_Change for #1211 (#1483)
* Remove convert gendustry bees code (#1187)
* Remove convert gendustry bees code
* fix derp. run BS update
Co-authored-by: Martin Robertz <dream-master@gmx.net>
* Added check to API if the block should drop its inventory on break (#1479)
* Added check to API if the block should drop its inventory on break
* Apply spotless
* Changed should drop flag to take index argument
* spotlessApply
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Maxim <maxim235@gmx.de>
* Recipe fixes 2022/10/25 (#1489)
* Fix quad input hatch voiding (#1487)
fixes https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11728
* Add constructor for Energy Hatch with inventory (#1488)
* Force Industrial Apiary to suck 4 amps (#1492)
* Fixed annoying cover message bug (#1490)
* Fixed annoying cover message bug
* Spotless
* make the cleanroom to accept 2 doors so alastor is happy (#1493)
* spotlessApply
Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Guinea Wheek <guineawheek@users.noreply.github.com>
Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
Co-authored-by: johnch18 <42650497+johnch18@users.noreply.github.com>
Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com>
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Random magic numbers
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Guinea Wheek <guineawheek@users.noreply.github.com>
Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
Co-authored-by: johnch18 <42650497+johnch18@users.noreply.github.com>
Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com>
Diffstat (limited to 'src/main/resources/assets/gregtech/textures')
22 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EV_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EV_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..b03f0e3450 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EV_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EV_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EV_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..598bf2b785 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EV_TOP_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/HV_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HV_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..d22bf46a17 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HV_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/HV_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HV_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..3062fd1f4c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HV_TOP_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/IV_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/IV_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..ab9465dd7c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/IV_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/IV_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/IV_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..258e46bdcb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/IV_TOP_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LuV_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LuV_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..86e691c2c8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LuV_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LuV_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LuV_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..406536b1ff --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LuV_TOP_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MV_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MV_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..4fb6518480 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MV_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MV_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MV_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..9d9a9b6142 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MV_TOP_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UEV_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UEV_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..0e8726987e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UEV_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UEV_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UEV_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..9a81179614 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UEV_TOP_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UHV_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UHV_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..c472b03bb1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UHV_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UHV_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UHV_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..270d5c0f1c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UHV_TOP_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UIV_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UIV_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..e84a018d89 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UIV_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UIV_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UIV_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..b990970531 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UIV_TOP_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UMV_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UMV_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..a5c2d6969c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UMV_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UMV_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UMV_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..fc7d2810dd --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UMV_TOP_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..50be3683cb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..4770d81261 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_TOP_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/ZPM_SIDE_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ZPM_SIDE_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..c5c2701b95 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ZPM_SIDE_CYCLOTRON_SOLENOID.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/ZPM_TOP_CYCLOTRON_SOLENOID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ZPM_TOP_CYCLOTRON_SOLENOID.png Binary files differnew file mode 100644 index 0000000000..9c4a8a54b2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ZPM_TOP_CYCLOTRON_SOLENOID.png |
