aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets
diff options
context:
space:
mode:
authorMadMan310 <66886359+MadMan310@users.noreply.github.com>2022-11-29 01:50:58 -0800
committerGitHub <noreply@github.com>2022-11-29 10:50:58 +0100
commitf985e28ae553428945f3ce3841ac036c98266128 (patch)
tree278c857c13493a8d0fdaebfb9a3d9cb90d07a774 /src/main/resources/assets
parent766af258761d0cc88d44169d06ae47198218078e (diff)
downloadGT5-Unofficial-f985e28ae553428945f3ce3841ac036c98266128.tar.gz
GT5-Unofficial-f985e28ae553428945f3ce3841ac036c98266128.tar.bz2
GT5-Unofficial-f985e28ae553428945f3ce3841ac036c98266128.zip
Component Assembly Line (#102)
* Initial Commit * Added recipe generator for components LV-IV * Added recipe generator for components LuV and beyond This one took a LONG time to make work... * Added structure and recipe processing * Added Recipes for Controller and Casings * Cleanup * Assline gives proper amount same as assembler * tooltip fix * add support for BW glass and warded glass * Added proper NEI handler * spotless * Spotless apply for branch componentAssemblyLine for #102 (#103) * Update build-and-test.yml * fix missing hatch element (#92) * fix missing hatch element * spotlessApply (#93) Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix bunch of yottank issues (#94) * yot tank/hatch fix * dep * Add better naq fuel recipes to combat fusion spam (#91) * Add higher tier naq fuel recipes * Fix Hypogen (hopefully) * Spotless >:( * Slightly change tooltip on the Precise Assembler (#95) 0.03 mm changed to 7nm * fix 0 stack of nuclear rod (#98) * naq fuel change (#96) * naq fuel change * Spotless apply for branch naqfuel for #96 (#97) * Slightly change tooltip on the Precise Assembler (#95) 0.03 mm changed to 7nm * spotlessApply Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> * Naq Fuel 1,2,3 Changes (#99) * Naq Emulsion line changes * Mk1 recipe change * Fuel value changes * Mk2 fuel recipe changes * Radiation proof plate recipe changes * Fix sludge dust centrifuge amounts * Remove Hafnium recipe for now * Spotless * thorium balance change (#76) * Add implementation for tank info getter (#101) * Add void excess option to yotta fluid tank (#100) * Add void excess option to yotta fluid tank * derp * Added own localization of void excess toggle messages * Update build.gradle * update bc * spotlessApply Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> Co-authored-by: xSkewer <43712386+xSkewer@users.noreply.github.com> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: GitHub GTNH Actions <> * cleanup handler * Overhauled recipe generator, added circuit wraps, buffed output efficiency * Structure re-tiering * Gravi -> Nuclear for UHV components (due to overflowing) * spotless * added new casings * removed some debug info and added dep * Fixed magnetic samarium fluid and other autogenerations * fixed recipe tiering * Removed Nuclear Star, to be replaced by the GT5U version * spotless * fixed recipe handling Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Co-authored-by: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Co-authored-by: xSkewer <43712386+xSkewer@users.noreply.github.com> Co-authored-by: Maxim <maxim235@gmx.de>
Diffstat (limited to 'src/main/resources/assets')
-rw-r--r--src/main/resources/assets/goodgenerator/lang/en_US.lang32
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/0.pngbin0 -> 528 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/1.pngbin0 -> 522 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/10.pngbin0 -> 520 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/11.pngbin0 -> 526 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/12.pngbin0 -> 516 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/13.pngbin0 -> 514 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/2.pngbin0 -> 529 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/3.pngbin0 -> 519 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/4.pngbin0 -> 524 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/5.pngbin0 -> 527 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/6.pngbin0 -> 530 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/7.pngbin0 -> 527 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/8.pngbin0 -> 525 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/9.pngbin0 -> 525 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/gui/ComponentAssline.pngbin0 -> 2310 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/0.pngbin0 -> 748 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/1.pngbin0 -> 738 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/10.pngbin0 -> 757 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/11.pngbin0 -> 746 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/12.pngbin0 -> 755 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/13.pngbin0 -> 756 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/14.pngbin0 -> 747 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/2.pngbin0 -> 747 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/3.pngbin0 -> 750 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/4.pngbin0 -> 744 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/5.pngbin0 -> 739 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/6.pngbin0 -> 754 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/7.pngbin0 -> 790 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/8.pngbin0 -> 740 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/wraps/9.pngbin0 -> 760 bytes
31 files changed, 32 insertions, 0 deletions
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index 7817a09428..be8210803d 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -41,6 +41,21 @@ compactFusionCoil.4.name=Compact Fusion Coil MK-II Finaltype
essentiaFilterCasing.0.name=Essentia Filter Casing
essentiaOutputHatch.0.name=Essentia Output Hatch
essentiaOutputHatch_ME.0.name=Essentia Output Hatch (ME)
+componentAssemblyLineCasing.0.name=Component Assembly Line Casing (LV)
+componentAssemblyLineCasing.1.name=Component Assembly Line Casing (MV)
+componentAssemblyLineCasing.2.name=Component Assembly Line Casing (HV)
+componentAssemblyLineCasing.3.name=Component Assembly Line Casing (EV)
+componentAssemblyLineCasing.4.name=Component Assembly Line Casing (IV)
+componentAssemblyLineCasing.5.name=Component Assembly Line Casing (LuV)
+componentAssemblyLineCasing.6.name=Component Assembly Line Casing (ZPM)
+componentAssemblyLineCasing.7.name=Component Assembly Line Casing (UV)
+componentAssemblyLineCasing.8.name=Component Assembly Line Casing (UHV)
+componentAssemblyLineCasing.9.name=Component Assembly Line Casing (UEV)
+componentAssemblyLineCasing.10.name=Component Assembly Line Casing (UIV)
+componentAssemblyLineCasing.11.name=Component Assembly Line Casing (UMV)
+componentAssemblyLineCasing.12.name=Component Assembly Line Casing (UXV)
+componentAssemblyLineCasing.13.name=Component Assembly Line Casing (MAX)
+
#Items
item.radiationProtectionPlate.name=Radiation Proof Plate
@@ -121,6 +136,22 @@ item.huiCircuit.1.name=Hi-Computation Station MK-II
item.huiCircuit.2.name=Hi-Computation Station MK-III
item.huiCircuit.3.name=Hi-Computation Station MK-IV Prototype
item.huiCircuit.4.name=Hi-Computation Station MK-V Finaltype
+item.nuclearStar.name=Nuclear Star
+item.circuitWrap.0.name=Wrap of ULV Circuits
+item.circuitWrap.1.name=Wrap of LV Circuits
+item.circuitWrap.2.name=Wrap of MV Circuits
+item.circuitWrap.3.name=Wrap of HV Circuits
+item.circuitWrap.4.name=Wrap of EV Circuits
+item.circuitWrap.5.name=Wrap of IV Circuits
+item.circuitWrap.6.name=Wrap of LuV Circuits
+item.circuitWrap.7.name=Wrap of ZPM Circuits
+item.circuitWrap.8.name=Wrap of UV Circuits
+item.circuitWrap.9.name=Wrap of UHV Circuits
+item.circuitWrap.10.name=Wrap of UEV Circuits
+item.circuitWrap.11.name=Wrap of UIV Circuits
+item.circuitWrap.12.name=Wrap of UMV Circuits
+item.circuitWrap.13.name=Wrap of UXV Circuits
+item.circuitWrap.14.name=Wrap of MAX Circuits
#Crops
crops.saltroot=Salty Root
@@ -255,6 +286,7 @@ scanner.info.YOTTank.2=Current Used:
scanner.info.XHE.0=Steam Output is equal to
scanner.info.XHE.1=Overheated Threshold:
scanner.info.UX.0=Running Parallel
+scanner.info.CASS.tier=Casing Tier:
#GUI Info
gui.NeutronSensor.0=Input the value of Neutron Kinetic Energy.
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/0.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/0.png
new file mode 100644
index 0000000000..24ca2d49cd
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/0.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/1.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/1.png
new file mode 100644
index 0000000000..a7422006a5
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/1.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/10.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/10.png
new file mode 100644
index 0000000000..f87e748701
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/10.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/11.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/11.png
new file mode 100644
index 0000000000..a1f0aab3e4
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/11.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/12.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/12.png
new file mode 100644
index 0000000000..94a3241f19
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/12.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/13.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/13.png
new file mode 100644
index 0000000000..74a9f9b0d9
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/13.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/2.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/2.png
new file mode 100644
index 0000000000..d7ba583b6d
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/2.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/3.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/3.png
new file mode 100644
index 0000000000..cd2f9870df
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/3.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/4.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/4.png
new file mode 100644
index 0000000000..ec6c14210f
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/4.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/5.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/5.png
new file mode 100644
index 0000000000..6f26a6ad1b
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/5.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/6.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/6.png
new file mode 100644
index 0000000000..a1d7057330
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/6.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/7.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/7.png
new file mode 100644
index 0000000000..913bcc4e83
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/7.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/8.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/8.png
new file mode 100644
index 0000000000..3154df6ade
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/8.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/9.png b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/9.png
new file mode 100644
index 0000000000..6f933cc98e
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/compAsslineCasing/9.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/gui/ComponentAssline.png b/src/main/resources/assets/goodgenerator/textures/gui/ComponentAssline.png
new file mode 100644
index 0000000000..27bc15e8ee
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/gui/ComponentAssline.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/0.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/0.png
new file mode 100644
index 0000000000..3e9501abc1
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/0.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/1.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/1.png
new file mode 100644
index 0000000000..fe258942ae
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/1.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/10.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/10.png
new file mode 100644
index 0000000000..a10d3af767
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/10.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/11.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/11.png
new file mode 100644
index 0000000000..9757a1047e
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/11.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/12.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/12.png
new file mode 100644
index 0000000000..aac60e58fd
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/12.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/13.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/13.png
new file mode 100644
index 0000000000..893e7f3017
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/13.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/14.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/14.png
new file mode 100644
index 0000000000..1be71e3d71
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/14.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/2.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/2.png
new file mode 100644
index 0000000000..c328d738a1
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/2.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/3.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/3.png
new file mode 100644
index 0000000000..32411af565
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/3.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/4.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/4.png
new file mode 100644
index 0000000000..840b2c8b27
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/4.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/5.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/5.png
new file mode 100644
index 0000000000..052e61d09e
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/5.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/6.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/6.png
new file mode 100644
index 0000000000..8a37a18715
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/6.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/7.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/7.png
new file mode 100644
index 0000000000..8aeba93ef9
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/7.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/8.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/8.png
new file mode 100644
index 0000000000..b3850aae70
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/8.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/wraps/9.png b/src/main/resources/assets/goodgenerator/textures/items/wraps/9.png
new file mode 100644
index 0000000000..bd18dcbeda
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/wraps/9.png
Binary files differ