From b2cbfcf522d9dd13ce89a38d8a5767a8a64cecd8 Mon Sep 17 00:00:00 2001 From: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Date: Tue, 2 Jul 2024 00:15:24 +0200 Subject: Add Dimensional Convergence, a new DTPF mode (#2669) * store astral arrays internally * save to item nbt * initial implementation * uncap running time and add syncer for convergence status * adjust tooltips and add localisation * add comments * this should not be here * small text adjustments * Add bonus for using higher tier CoAl casings (#2668) * add bonus for higher tier casings * add tooltip info * Fix a vat recipe conflict (#2677) add circuit * update * Fix EBF & multi smelter scanner info (#2681) fix * Put some sanity in GT_MetaGenerated_Item_01 (#2649) * set coin ids in enum * extract coin shapeless recipes * Arrows * splitting more * mold shapes * big split * split behaviors * spotless * enumerated shapes * more enum work * continuing enum work * new batch of enum work * last enum work * Sort enum by IDs * move enum into its own class * public field * Put some sanity in GT_MetaGenerated_Item_02/03 and in GT_MetaGenerated_Tool_01 (#2659) * enum work * sorting the class * extracting the enum in its own class * initial enum work for GT_MetaGenerated_Item_03 * split * finished enum work * extract enum in its own class * migrate to enum * remove duplicated recipes * sorted enums * extracted enum in its own class * spotless * fix compilation errors * spotless * fix mistake * Add oredict for LV and HV circuits (try no 2) (#2682) * blacklist ic2 ciruits from unificator * fix 2 circuit oredicts * move cleanroom assembler recipe * remove unittest that needs nhcoremod to work * fix electronic circuit recipe * move recipe to better place and avoid duplicates * move fluid filter recipe * Clean crafting achievements (#2662) * clean up crafting achievements * spotless * make crop tooltip appropriate (#2684) change tooltip * Move some mixins to hodgepodge (#2633) * Move some mixins to hodgepodge * store astral arrays internally * save to item nbt * initial implementation * uncap running time and add syncer for convergence status * adjust tooltips and add localisation * add comments * this should not be here * small text adjustments * add transdimensional alignment matrix * add recipe * require alignment matrix * capital c * fix catalyst tier being off by one * swap some items around * update aligment matrix tooltip --------- Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: Martin Robertz Co-authored-by: HoleFish <48403212+HoleFish@users.noreply.github.com> Co-authored-by: boubou19 Co-authored-by: Jason Mitchell --- src/main/resources/assets/gregtech/lang/en_US.lang | 8 +++++++- .../assets/gregtech/textures/items/gt.metaitem.03/758.png | Bin 0 -> 471 bytes .../gregtech/textures/items/gt.metaitem.03/758.png.mcmeta | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/758.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/758.png.mcmeta (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 055724277c..e0f13820f7 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -68,6 +68,12 @@ GT5U.LHE.steam=(in steam) GT5U.LHE.superheated=Superheated GT5U.LHE.threshold=threshold +GT5U.DTPF.convergencebutton=Allow Convergence +GT5U.DTPF.convergencebuttontooltip.0=Requires Transdimensional Aligment Matrix in controller slot +GT5U.DTPF.convergencebuttontooltip.1=Right Click to open catalyst selection menu +GT5U.DTPF.catalysttier=Catalyst Tier +GT5U.DTPF.catalystinfotooltip=Tier of additional catalyst to use for recipes without catalyst in them, from 1-Crude to 5-Stellar + GT5U.fusion.req=EU Required GT5U.fusion.plasma=Plasma Output @@ -1432,7 +1438,7 @@ fluid.Monomethylhydrazine=Monomethylhydrazine fluid.binnibacteriafluid=binnibacteriafluid fluid.barnadafisarboriatorisfluid=barnadafisarboriatorisfluid fluid.GelatinMixture=GelatinMixture -fluid.sludge=Sludge +fluid.sludge=sludge fluid.Formaldehyde=Formaldehyde fluid.tcetieisfucusserratusfluid=tcetieisfucusserratusfluid fluid.MeatExtract=MeatExtract diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/758.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/758.png new file mode 100644 index 0000000000..1ad5bc5e05 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/758.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/758.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/758.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/758.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}} \ No newline at end of file -- cgit