From ec0469d5e0673b509af793c8d7456571339f7382 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Mon, 31 Oct 2022 15:55:31 +0000 Subject: 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 * 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 Co-authored-by: Maxim 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 * 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 Co-authored-by: Maxim Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: Martin Robertz 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 * 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 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 Co-authored-by: miozune Co-authored-by: Guinea Wheek 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 Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Maxim Co-authored-by: miozune Co-authored-by: Guinea Wheek 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> --- .../blocks/iconsets/EV_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 666 bytes .../blocks/iconsets/EV_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 829 bytes .../blocks/iconsets/HV_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 448 bytes .../blocks/iconsets/HV_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 800 bytes .../blocks/iconsets/IV_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 425 bytes .../blocks/iconsets/IV_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 791 bytes .../blocks/iconsets/LuV_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 439 bytes .../blocks/iconsets/LuV_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 803 bytes .../blocks/iconsets/MV_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 588 bytes .../blocks/iconsets/MV_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 730 bytes .../blocks/iconsets/UEV_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 445 bytes .../blocks/iconsets/UEV_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 803 bytes .../blocks/iconsets/UHV_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 474 bytes .../blocks/iconsets/UHV_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 789 bytes .../blocks/iconsets/UIV_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 457 bytes .../blocks/iconsets/UIV_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 817 bytes .../blocks/iconsets/UMV_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 478 bytes .../blocks/iconsets/UMV_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 806 bytes .../blocks/iconsets/UV_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 431 bytes .../blocks/iconsets/UV_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 788 bytes .../blocks/iconsets/ZPM_SIDE_CYCLOTRON_SOLENOID.png | Bin 0 -> 402 bytes .../blocks/iconsets/ZPM_TOP_CYCLOTRON_SOLENOID.png | Bin 0 -> 762 bytes 22 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/EV_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/EV_TOP_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/HV_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/HV_TOP_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/IV_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/IV_TOP_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LuV_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LuV_TOP_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MV_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MV_TOP_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UEV_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UEV_TOP_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UHV_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UHV_TOP_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UIV_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UIV_TOP_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UMV_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UMV_TOP_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_TOP_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/ZPM_SIDE_CYCLOTRON_SOLENOID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/ZPM_TOP_CYCLOTRON_SOLENOID.png (limited to 'src/main/resources') 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 new file mode 100644 index 0000000000..b03f0e3450 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EV_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..598bf2b785 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EV_TOP_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..d22bf46a17 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HV_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..3062fd1f4c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HV_TOP_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..ab9465dd7c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/IV_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..258e46bdcb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/IV_TOP_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..86e691c2c8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LuV_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..406536b1ff Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LuV_TOP_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..4fb6518480 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MV_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..9d9a9b6142 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MV_TOP_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..0e8726987e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UEV_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..9a81179614 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UEV_TOP_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..c472b03bb1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UHV_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..270d5c0f1c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UHV_TOP_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..e84a018d89 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UIV_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..b990970531 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UIV_TOP_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..a5c2d6969c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UMV_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..fc7d2810dd Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UMV_TOP_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..50be3683cb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..4770d81261 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_TOP_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..c5c2701b95 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ZPM_SIDE_CYCLOTRON_SOLENOID.png differ 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 new file mode 100644 index 0000000000..9c4a8a54b2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/ZPM_TOP_CYCLOTRON_SOLENOID.png differ -- cgit