From 8b077c28bea7bcc046be1e4b8485d69b4c245a43 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 20 Jul 2024 15:35:26 +0100 Subject: Beamline (#2619) * Beamline * Remove hardcoded dreamcraft items and spotless * Remove logs and fix auto structure check * Remove logs and fix auto structure check * Fix typo and synchrotron high MF scaling * sa (cherry picked from commit b2796d95538a1b683b4a98bf6cb0f8fe21404fbd) * Add multi textures, add structuredesc info, remove test TC input, add synchrotron/input/output recipes * Spotless * Prevent mob spawning on casings * Fix LINAC glass requirement, make synchrotron structure less ugly, add last recipe * Spotless * Add placeholder particle textures * Add some mask recipes I missed * Spotless apply for branch lanth-beamline for #2619 (#2630) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Add further error messages to LINAC and Synchrotron, fix MM & LaB6 recipes * Spotless apply for branch lanth-beamline for #2619 (#2648) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Minor changes, add more multi error messages & 9x U-238 SC recipe * Spotless apply for branch lanth-beamline for #2619 (#2651) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Missed a change * Spotless apply for branch lanth-beamline for #2619 (#2652) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Update beamline desc * Remove comments, move coolant fluid check to Util class * Spotless * Spotless apply for branch lanth-beamline for #2619 (#2666) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Fix Mu-Metal recipe output amount, tool stats for MM & LaB6 * Spotless * Fix multi hatch textures * Spotless apply for branch lanth-beamline for #2619 (#2676) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Increase Synchrotron output rate eut & antenna tier scaling, in general improve output rates, buff all TC recipes' processing time * Fix misleading BL tooltip * update * remove import * Buff higher-tier wafer recipes for each IC, from a 4x to 3x increase of recipe amount per two wafer tier increases * Remove RA1 calls in beamline (#2716) * Spotless apply for branch lanth-beamline for #2619 (#2717) spotlessApply Co-authored-by: GitHub GTNH Actions <> * fix * Spotless apply for branch lanth-beamline for #2619 (#2733) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: unknown Co-authored-by: Elisis Co-authored-by: Martin Robertz Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../assets/gtnhlanth/textures/items/photomask/asoc.png | Bin 0 -> 1977 bytes .../assets/gtnhlanth/textures/items/photomask/blank1.png | Bin 0 -> 910 bytes .../assets/gtnhlanth/textures/items/photomask/blank2.png | Bin 0 -> 910 bytes .../assets/gtnhlanth/textures/items/photomask/blank3.png | Bin 0 -> 910 bytes .../assets/gtnhlanth/textures/items/photomask/cpu.png | Bin 0 -> 1862 bytes .../assets/gtnhlanth/textures/items/photomask/hpic.png | Bin 0 -> 2069 bytes .../assets/gtnhlanth/textures/items/photomask/ilc.png | Bin 0 -> 1757 bytes .../assets/gtnhlanth/textures/items/photomask/lpic.png | Bin 0 -> 2051 bytes .../assets/gtnhlanth/textures/items/photomask/nand.png | Bin 0 -> 1603 bytes .../assets/gtnhlanth/textures/items/photomask/ncpu.png | Bin 0 -> 2047 bytes .../assets/gtnhlanth/textures/items/photomask/nor.png | Bin 0 -> 1674 bytes .../assets/gtnhlanth/textures/items/photomask/npic.png | Bin 0 -> 2071 bytes .../assets/gtnhlanth/textures/items/photomask/pic.png | Bin 0 -> 2012 bytes .../assets/gtnhlanth/textures/items/photomask/ppic.png | Bin 0 -> 2054 bytes .../assets/gtnhlanth/textures/items/photomask/qbit.png | Bin 0 -> 2019 bytes .../assets/gtnhlanth/textures/items/photomask/qpic.png | Bin 0 -> 2062 bytes .../assets/gtnhlanth/textures/items/photomask/ram.png | Bin 0 -> 1758 bytes .../assets/gtnhlanth/textures/items/photomask/soc.png | Bin 0 -> 2063 bytes .../assets/gtnhlanth/textures/items/photomask/ssoc.png | Bin 0 -> 2194 bytes .../assets/gtnhlanth/textures/items/photomask/uhpic.png | Bin 0 -> 2069 bytes .../assets/gtnhlanth/textures/items/photomask/ulpic.png | Bin 0 -> 2035 bytes 21 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/asoc.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/blank1.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/blank2.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/blank3.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/cpu.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/hpic.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/ilc.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/lpic.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/nand.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/ncpu.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/nor.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/npic.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/pic.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/ppic.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/qbit.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/qpic.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/ram.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/soc.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/ssoc.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/uhpic.png create mode 100644 src/main/resources/assets/gtnhlanth/textures/items/photomask/ulpic.png (limited to 'src/main/resources/assets/gtnhlanth/textures/items/photomask') diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/asoc.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/asoc.png new file mode 100644 index 0000000000..cbb39abb60 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/asoc.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/blank1.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/blank1.png new file mode 100644 index 0000000000..561e64860a Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/blank1.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/blank2.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/blank2.png new file mode 100644 index 0000000000..561e64860a Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/blank2.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/blank3.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/blank3.png new file mode 100644 index 0000000000..561e64860a Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/blank3.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/cpu.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/cpu.png new file mode 100644 index 0000000000..fbce1c288c Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/cpu.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/hpic.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/hpic.png new file mode 100644 index 0000000000..b2ee8eec84 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/hpic.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/ilc.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ilc.png new file mode 100644 index 0000000000..109432abf3 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ilc.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/lpic.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/lpic.png new file mode 100644 index 0000000000..d297990869 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/lpic.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/nand.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/nand.png new file mode 100644 index 0000000000..388d8494d6 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/nand.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/ncpu.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ncpu.png new file mode 100644 index 0000000000..c76e03744d Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ncpu.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/nor.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/nor.png new file mode 100644 index 0000000000..c5526b530d Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/nor.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/npic.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/npic.png new file mode 100644 index 0000000000..1a3d2866f2 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/npic.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/pic.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/pic.png new file mode 100644 index 0000000000..ce29d88643 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/pic.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/ppic.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ppic.png new file mode 100644 index 0000000000..4431df6b03 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ppic.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/qbit.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/qbit.png new file mode 100644 index 0000000000..b4668e9887 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/qbit.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/qpic.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/qpic.png new file mode 100644 index 0000000000..c421ebe38b Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/qpic.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/ram.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ram.png new file mode 100644 index 0000000000..569fc38d75 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ram.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/soc.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/soc.png new file mode 100644 index 0000000000..931c2a4f47 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/soc.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/ssoc.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ssoc.png new file mode 100644 index 0000000000..10209d8c63 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ssoc.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/uhpic.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/uhpic.png new file mode 100644 index 0000000000..54b0d412bb Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/uhpic.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/photomask/ulpic.png b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ulpic.png new file mode 100644 index 0000000000..a3274605e5 Binary files /dev/null and b/src/main/resources/assets/gtnhlanth/textures/items/photomask/ulpic.png differ -- cgit