diff --git a/config/brandon3055/contributors.json b/config/brandon3055/contributors.json index cdb14fa3c..76a80c2e9 100644 --- a/config/brandon3055/contributors.json +++ b/config/brandon3055/contributors.json @@ -1 +1 @@ -["041f02c98a21c3eb2592e371322c07ca9a07e6d753f8a5e0a6b4f9345256fcd9","9e2f166ac6fea050859bdcc555cb638b9e9a34c34f4681c4dbba46279f85a9f3","63d667e96448c276efec3ea4e19ed79f6809174ddcc7ef1f10690ee1b915cedc","5981488e26bd1bd6706ef6eaacc544006acaad43462042a59ee815e0439b5c11","f807c14d869ead007510f0b9453c625225dd78efcc591eff9d3f479e1461e82a","a9645f82983c05182f4f51c907e3520ab45371b2659d84d5796d9e1f4a557d9e","63d323df6496411b37890b111f753cdc1c96a32d217ccd92510cf635a47e5890","069df1941befb2f46ba22f32e63074a14c0cdadfaf965e9d29b7518a2a42123a","94385cd18f0d4195b9930b7e983174bce1e2dcbe0bdf8a8d839d23d1bd7a4319","e00bf6890e876225dc92134791c0a691d6a4d1966d32023274217af3bfd02e3c","d78f2d69b608158c676d1704ee9c52972f590a65ebda7a0c49f1fde969379e54","07460531e735903317e7c07b8f6597ab5e2ce4036135eeca8c7b4d51a808ce98","ab4dab0b88c494a221be4a6dc8801ce71ffeac0228298e8b1e07f8d054b301d7","21998fc28c1d11b33580ffa4c2cf485c69997b6218ba9a8fbe6eae9a0f1ac7d6","be76a6bd5096891c698bedf1eeef31d9dad565efe83d5df9fe42a18c9a77d8c3","f54881455690e420c6a176bad0c6350cbbf6dafb83cf111ef09c514adc8a5537","eb221a8c5fd263549a4e6d10e9016a42f8655bbae7f9b916fe9b5e8b0fcb1e44","93d24a810e76c706d6a3d5cb32fde82d34cd5cd09843819b7e64ca2674835422","79725f245b86586d34c110c40419018cb876788f281c92bd58fbd320f9b6501d","8b12d1920ec39a2010685e4e58d04a69c56c3ae2de15116c67f83070c7297fba","7acffae15e2c0f6ac465fe783abfdb59246cd6655f6c72eebda8f86fe2f62768","28623c94b2f5a5d48377b82888ef54b04fc5a9d946b8346d2bc28e0e2916dec0","3cc3d4ec20d84793a62eb2d4639bde3ed63af343f814ae0e24747e8d00bcc00e","6c416b82dfbd050ea2279038e98175373b06193ee635bd019c043faaf9a3785e","787edc979351b7cdfbe358315eb55347eec4c13c93d149b496f1c8de68fb6537","f8ad1c502438b021db3676b269fb93304734689e9f9c0732fe76f0b45aae3758","32e5e69be372a33254e62df047bace8755ff4e357ab8a0360189512893c4c5c9","362b5d40051bd8cc43b46719c4a39719976802b7610722804441fd6f97c86eaf","8c8ecab48bc80303805eb36d3c1c631102a4e4673f32a432fc20fa35d83f7521","79e3f618e0f5afdbb870ca882019b009905bc8eab35a7c0d45197b61d8b71182","4e7e0c3673ebfca490bf03000c01e51dc61b5d42fd6090caa36cbe87991f5be8","d951af64c40ffd5126c3ab4ef7b1f56784572d543cd734c39e5290046f2a1be5","ffc9a1afb2074747bc50b54dcb41bfc61627e0fefeb55f831b3824ec562bd81a","d5c079d8dffd890788e6766ac923eb37e9659e1098b1fe8fa1e9fda07b5c4db6","2c89dd32fd2c3b6c695ccc90663ba1b2cc7d50b3380359961642158ca3b27d12","c805a309fd836f8528afa77f6cac206725c485d034bf5da836a3c3d822b7c8e5","b3cf3bea939b7da60cedfb441e1a6e805593deaf5caa0ce5c6eb1ac0d01eaeb3","73f2dcefa02d5f6e2db17ef04776e19680d865e1df4739eb0a1cecdd88e6b8d2","94a19f54ed1b7dff2c09845a618b9a2ec8e937509d1101e2d53e06eae9efb8fe","edfe4886bf3ba43fcc059570ebc7ac27102620dfffea6a6e04042611dee466b5","8e79d352978119de8f7e06562b3193250b0ec7506899f40d4044e97f04fc95f8","f3520fe0088fc0a6c7508de1301b6ed7ae039ab780c1355e8f7af62521c770be","2350a1fd620dc82af2c8369c489cebc1866dd054585983ec00ccb47555d2a521","13592073ea5dc108b3106de1a007c620275b0c5713dbcb6f74a2861726105b2a","d2681c1eb9dad4913a9442acbfd1f4f069aca2622d875c85d8889909d3c07755","52108645bc48f696cd2714c2b6a904e3e1aa08e2eaa5a259a26270940223673a","e3b76ae442f222754501cd961a9432dac86f33ed564904f52093c380acbb79a1","7276b0d338784dd3a503b6baacbd8322ff8642ca693fdfccb97d638e158e5fd2","e0d0093fdc1e4b73c6fd278bb8c0be2b9b0894f00aedeb7879d326dfb1f255a0","e1d9a4f9991d66ca0dd3d3d965df788a5b370ce15c276291b2b7493836f9ecca","31b66cd6f15ac2c19ecdaccaa9e704404471f979fee19fe46200581bac467151","ddeb29bf4dd48bbfe3deb9953dd7cb5548f1e971b63c8924f12868e2e310873b","5a524ea8d4120f6c498f9e94e61653367a495f4a859e7a0a1df06ff8fb3b86d8","1bc14332ee3ef13e9bd0c7249ae986a2f9ee164ac51464af6fda6eb956b347e6","7115d45e5b25cff740b9c18d2cbe19e86442042c28d16b8d00d79e76569adb93","14c7f499c2877b49a3c53180acbe0fc8324b0cd9b47d57b6ce57315c1ea1b1c9","6b0e636a61daa9e85e3d2e7e6b1fa4443c44650cc0683090600ebb1fb7e7e674","36fee80ed3a8b7ed533992627abfd6d3ec86b70c4d970e79d549306029887b24","91a2a96bd5d2a40d436821bf36961059590851abae19b2a7311a20dcb05bbb10","632494a85c38345deedb2ca51e69cf1ded894334ab06a5624f3ccc7f52048901","54ff2b25ca2dd2700ffcbea72334aeec56474d90cf14939d92b928f88608770a","d8f5cb072e1e1d62364937c42ad7f9aa92f8cfcc7d7c4385b1c7150c32eda39d","e951cd4917916c22d52ccaff96c48f06da23c13766311f5d9db02bfc6532d67d","761f6f8454b54654689ecb6c7c6745c9f98b708301a9173303f25e215c876e91","c0bf2143e9d8921fc9e6577de6122b6379b47271d0ad260a4d73c4236457d8ca","2f8c5ac3db79db16268f9ca3b9658edab4bf94dd787f789da4e3fb6d87d40ed6","69bc7b2be40547bce68290ba1a318a1ff8515c50437ea9b0d569a92859365119","2ec46d1f88c1bd782a4ea81fa3b735accee1cf592bb3bc95c83174618c162717","d1d243d46f8ea9f71b4ef6e8109f47eb5d75cf908ba6203dd22e0551b2bca0e4","64d335c843620233790a60d6343f9132f2600d65893ec98060460c2ed87a8ba5","a93b3073bd9f4403f8b8efe40c3575296eb504ffa60d70fec0c09523a86d62cf","253eec1d7885b7eac2fe23cddacfbdd6b20a1bb6d600f060bf77176486eed1aa","22abb37d8a71dc9afa77505f3ab1501059c7a7b04d9fa58d7cb39841642e082e","97f7722b9f5eac117b4fcd0d519f351b3c5015827838f45aa96ddb38b9c4ab95","bce3bbc81d0a3fab0408cabc00acf87def3a03ed2817928a6b129c683928c2e2","1b9bfae341f9973cbc865fb54b4a713fb98b5e14c41cb6761a91f8abfd62f861","af88774fa80726bb8285baeed72a24e8d951a5248fb6fe765d3d6a4a34b3f6a3","a0c03eefd6236c70d20ff225a4e9dd13440bd368747b40285cfe7a8c78a58b8e","ce4f84fff873fb31f22fccd2efaefaee176c5577ac06ee763c0a9854ee1cb656","f7bc6f33e63bbb5798df6f68a76b9467531855ca1d88c6d6c00d6cb2896cc61b","dec4e445be81a5d0918838392e56d3c06a3bf812202d6e99554b932f7bda4818","ad46d33d478913f570cff15ea53011bee0514c501353bf3a014444da9fa3dbe5"] \ No newline at end of file +["041f02c98a21c3eb2592e371322c07ca9a07e6d753f8a5e0a6b4f9345256fcd9","9e2f166ac6fea050859bdcc555cb638b9e9a34c34f4681c4dbba46279f85a9f3","63d667e96448c276efec3ea4e19ed79f6809174ddcc7ef1f10690ee1b915cedc","5981488e26bd1bd6706ef6eaacc544006acaad43462042a59ee815e0439b5c11","f807c14d869ead007510f0b9453c625225dd78efcc591eff9d3f479e1461e82a","a9645f82983c05182f4f51c907e3520ab45371b2659d84d5796d9e1f4a557d9e","63d323df6496411b37890b111f753cdc1c96a32d217ccd92510cf635a47e5890","069df1941befb2f46ba22f32e63074a14c0cdadfaf965e9d29b7518a2a42123a","94385cd18f0d4195b9930b7e983174bce1e2dcbe0bdf8a8d839d23d1bd7a4319","e00bf6890e876225dc92134791c0a691d6a4d1966d32023274217af3bfd02e3c","d78f2d69b608158c676d1704ee9c52972f590a65ebda7a0c49f1fde969379e54","07460531e735903317e7c07b8f6597ab5e2ce4036135eeca8c7b4d51a808ce98","ab4dab0b88c494a221be4a6dc8801ce71ffeac0228298e8b1e07f8d054b301d7","21998fc28c1d11b33580ffa4c2cf485c69997b6218ba9a8fbe6eae9a0f1ac7d6","be76a6bd5096891c698bedf1eeef31d9dad565efe83d5df9fe42a18c9a77d8c3","f54881455690e420c6a176bad0c6350cbbf6dafb83cf111ef09c514adc8a5537","eb221a8c5fd263549a4e6d10e9016a42f8655bbae7f9b916fe9b5e8b0fcb1e44","93d24a810e76c706d6a3d5cb32fde82d34cd5cd09843819b7e64ca2674835422","79725f245b86586d34c110c40419018cb876788f281c92bd58fbd320f9b6501d","8b12d1920ec39a2010685e4e58d04a69c56c3ae2de15116c67f83070c7297fba","e4ebc3220221e7e1c63ea1277a8faa26b1d6394bbd54dfaa5659d02fcaeca137","7acffae15e2c0f6ac465fe783abfdb59246cd6655f6c72eebda8f86fe2f62768","28623c94b2f5a5d48377b82888ef54b04fc5a9d946b8346d2bc28e0e2916dec0","3cc3d4ec20d84793a62eb2d4639bde3ed63af343f814ae0e24747e8d00bcc00e","6c416b82dfbd050ea2279038e98175373b06193ee635bd019c043faaf9a3785e","787edc979351b7cdfbe358315eb55347eec4c13c93d149b496f1c8de68fb6537","f8ad1c502438b021db3676b269fb93304734689e9f9c0732fe76f0b45aae3758","32e5e69be372a33254e62df047bace8755ff4e357ab8a0360189512893c4c5c9","362b5d40051bd8cc43b46719c4a39719976802b7610722804441fd6f97c86eaf","8c8ecab48bc80303805eb36d3c1c631102a4e4673f32a432fc20fa35d83f7521","79e3f618e0f5afdbb870ca882019b009905bc8eab35a7c0d45197b61d8b71182","4e7e0c3673ebfca490bf03000c01e51dc61b5d42fd6090caa36cbe87991f5be8","d951af64c40ffd5126c3ab4ef7b1f56784572d543cd734c39e5290046f2a1be5","ffc9a1afb2074747bc50b54dcb41bfc61627e0fefeb55f831b3824ec562bd81a","d5c079d8dffd890788e6766ac923eb37e9659e1098b1fe8fa1e9fda07b5c4db6","2c89dd32fd2c3b6c695ccc90663ba1b2cc7d50b3380359961642158ca3b27d12","c805a309fd836f8528afa77f6cac206725c485d034bf5da836a3c3d822b7c8e5","b3cf3bea939b7da60cedfb441e1a6e805593deaf5caa0ce5c6eb1ac0d01eaeb3","73f2dcefa02d5f6e2db17ef04776e19680d865e1df4739eb0a1cecdd88e6b8d2","94a19f54ed1b7dff2c09845a618b9a2ec8e937509d1101e2d53e06eae9efb8fe","edfe4886bf3ba43fcc059570ebc7ac27102620dfffea6a6e04042611dee466b5","8e79d352978119de8f7e06562b3193250b0ec7506899f40d4044e97f04fc95f8","f3520fe0088fc0a6c7508de1301b6ed7ae039ab780c1355e8f7af62521c770be","2350a1fd620dc82af2c8369c489cebc1866dd054585983ec00ccb47555d2a521","13592073ea5dc108b3106de1a007c620275b0c5713dbcb6f74a2861726105b2a","d2681c1eb9dad4913a9442acbfd1f4f069aca2622d875c85d8889909d3c07755","52108645bc48f696cd2714c2b6a904e3e1aa08e2eaa5a259a26270940223673a","e3b76ae442f222754501cd961a9432dac86f33ed564904f52093c380acbb79a1","7276b0d338784dd3a503b6baacbd8322ff8642ca693fdfccb97d638e158e5fd2","e0d0093fdc1e4b73c6fd278bb8c0be2b9b0894f00aedeb7879d326dfb1f255a0","e1d9a4f9991d66ca0dd3d3d965df788a5b370ce15c276291b2b7493836f9ecca","31b66cd6f15ac2c19ecdaccaa9e704404471f979fee19fe46200581bac467151","ddeb29bf4dd48bbfe3deb9953dd7cb5548f1e971b63c8924f12868e2e310873b","5a524ea8d4120f6c498f9e94e61653367a495f4a859e7a0a1df06ff8fb3b86d8","1bc14332ee3ef13e9bd0c7249ae986a2f9ee164ac51464af6fda6eb956b347e6","7115d45e5b25cff740b9c18d2cbe19e86442042c28d16b8d00d79e76569adb93","14c7f499c2877b49a3c53180acbe0fc8324b0cd9b47d57b6ce57315c1ea1b1c9","6b0e636a61daa9e85e3d2e7e6b1fa4443c44650cc0683090600ebb1fb7e7e674","36fee80ed3a8b7ed533992627abfd6d3ec86b70c4d970e79d549306029887b24","91a2a96bd5d2a40d436821bf36961059590851abae19b2a7311a20dcb05bbb10","632494a85c38345deedb2ca51e69cf1ded894334ab06a5624f3ccc7f52048901","54ff2b25ca2dd2700ffcbea72334aeec56474d90cf14939d92b928f88608770a","d8f5cb072e1e1d62364937c42ad7f9aa92f8cfcc7d7c4385b1c7150c32eda39d","e951cd4917916c22d52ccaff96c48f06da23c13766311f5d9db02bfc6532d67d","761f6f8454b54654689ecb6c7c6745c9f98b708301a9173303f25e215c876e91","c0bf2143e9d8921fc9e6577de6122b6379b47271d0ad260a4d73c4236457d8ca","2f8c5ac3db79db16268f9ca3b9658edab4bf94dd787f789da4e3fb6d87d40ed6","69bc7b2be40547bce68290ba1a318a1ff8515c50437ea9b0d569a92859365119","2ec46d1f88c1bd782a4ea81fa3b735accee1cf592bb3bc95c83174618c162717","d1d243d46f8ea9f71b4ef6e8109f47eb5d75cf908ba6203dd22e0551b2bca0e4","64d335c843620233790a60d6343f9132f2600d65893ec98060460c2ed87a8ba5","a93b3073bd9f4403f8b8efe40c3575296eb504ffa60d70fec0c09523a86d62cf","253eec1d7885b7eac2fe23cddacfbdd6b20a1bb6d600f060bf77176486eed1aa","22abb37d8a71dc9afa77505f3ab1501059c7a7b04d9fa58d7cb39841642e082e","97f7722b9f5eac117b4fcd0d519f351b3c5015827838f45aa96ddb38b9c4ab95","bce3bbc81d0a3fab0408cabc00acf87def3a03ed2817928a6b129c683928c2e2","1b9bfae341f9973cbc865fb54b4a713fb98b5e14c41cb6761a91f8abfd62f861","af88774fa80726bb8285baeed72a24e8d951a5248fb6fe765d3d6a4a34b3f6a3","a0c03eefd6236c70d20ff225a4e9dd13440bd368747b40285cfe7a8c78a58b8e","ce4f84fff873fb31f22fccd2efaefaee176c5577ac06ee763c0a9854ee1cb656","f7bc6f33e63bbb5798df6f68a76b9467531855ca1d88c6d6c00d6cb2896cc61b","dec4e445be81a5d0918838392e56d3c06a3bf812202d6e99554b932f7bda4818","ad46d33d478913f570cff15ea53011bee0514c501353bf3a014444da9fa3dbe5","73a272350e332992cd455d482d57af45d69d9f4786c46bcdb626ecf5f26081ac"] \ No newline at end of file diff --git a/config/brandon3055/contributors.json.etag b/config/brandon3055/contributors.json.etag index 363e24ed4..c1634b9fd 100644 --- a/config/brandon3055/contributors.json.etag +++ b/config/brandon3055/contributors.json.etag @@ -1 +1 @@ -"f81f71c0-82" \ No newline at end of file +"883d4211-84" \ No newline at end of file diff --git a/config/fancymenu/options.txt b/config/fancymenu/options.txt index c2ba8699d..0f656493e 100644 --- a/config/fancymenu/options.txt +++ b/config/fancymenu/options.txt @@ -7,6 +7,7 @@ B:force_fullscreen = 'false'; ##[customization] +B:modpack_mode = 'false'; B:show_customization_overlay = 'false'; B:advanced_customization_mode = 'false'; diff --git a/config/ftbquests/quests/chapters/dependency_chain.snbt b/config/ftbquests/quests/chapters/dependency_chain.snbt index b5d07452b..fc06bfdc0 100644 --- a/config/ftbquests/quests/chapters/dependency_chain.snbt +++ b/config/ftbquests/quests/chapters/dependency_chain.snbt @@ -81,6 +81,5 @@ y: -1.5d } ] - subtitle: [] title: "dependencies" } diff --git a/config/ftbquests/quests/chapters/end_game.snbt b/config/ftbquests/quests/chapters/end_game.snbt index 566fe10a5..40108f844 100644 --- a/config/ftbquests/quests/chapters/end_game.snbt +++ b/config/ftbquests/quests/chapters/end_game.snbt @@ -2296,7 +2296,7 @@ "" "The data model you place in the input bus will &2have a fixed 30% chance of producing Pristine matter regardless of its tier. &eOverclocking does not alter the chances of pristines&r: those come at fixed rates per iteration." "" - "As a &9Creative Tier&r structure, it is rather expensive to make. However, it is an investment that will easily pay for itself as you progress through the endgame. You should strongly consider making one of these with your second &9Heart of a Universe&r." + "As a &9Creative Tier&r structure, it is rather expensive to make. However, it is an investment that will easily pay for itself as you progress through the endgame. You should strongly consider making one of these with your first batch of &9Matter Processor Mainframes&r." ] icon: "gtceu:simulation_supercomputer" id: "5A70898C99B828E3" @@ -3070,7 +3070,7 @@ "" "One of these structures can perform the equivalent work of hundreds of individual Loot Fabricators more efficiently. This will make it far easier to generate said &6Dragon Lair Data&r from all that pristine matter you now have. " "" - "As a &9Creative Tier&r structure, it is rather expensive to make. However, it is an investment that will easily pay for itself as you progress through the endgame. You should strongly consider making one of these with your third &9Heart of a Universe&r." + "As a &9Creative Tier&r structure, it is rather expensive to make. However, it is an investment that will easily pay for itself as you progress through the endgame. You should strongly consider making one of these with your second batch of &9Matter Processor Mainframes&r." ] icon: "gtceu:loot_superfabricator" id: "161F61C28DBC5941" @@ -3165,23 +3165,21 @@ y: -10.75d } { - dependencies: [ - "281DE48E7260BC8E" - "2D9A95AC50CCB988" - ] - description: ["Now, you could make this before you get tank, it's perfectly do-able, but there's nothing that really needs it."] + dependencies: ["4155AEBF760C42E8"] + description: ["[MISSING DESCRIPTION]"] id: "7C4E04E3EA603000" tasks: [{ id: "528FBBDEA6B0FB36" - item: "kubejs:omnium_coil_block" + item: "kubejs:omnic_matrix_coil_block" type: "item" }] - title: "&9Omnium Coil" - x: 32.5d + title: "&9Omnic Matrix Coil" + x: 35.5d y: -6.75d } { dependencies: ["7C4E04E3EA603000"] + description: ["This highly advanced alloy will require you to extensively process Ancient Debris and combine the results with a few other items in an Omnic Forge."] id: "113E9543ADB1666B" tasks: [{ id: "25D96E6575B38623" @@ -3194,16 +3192,16 @@ } { dependencies: ["2D9A95AC50CCB988"] - description: [""] + description: ["The &bSubatomic Digital Assembler &fcan be used to produce some creative items from the required data and computational power, the first of which is the &dCreative Quantum Tank."] id: "4261BDA34D716EC8" size: 1.0d - subtitle: "Not just for tanks anymore!" + subtitle: "The Pinnacle of Energy-To-Mass Conversion" tasks: [{ id: "567872742E26A724" item: "gtceu:subatomic_digital_assembler" type: "item" }] - title: "&9Matter Replicator" + title: "Subatomic Digital Assembler" x: 35.5d y: -9.25d } @@ -3459,6 +3457,27 @@ x: 40.5d y: -13.5d } + { + dependencies: [ + "281DE48E7260BC8E" + "2D9A95AC50CCB988" + ] + description: [ + "&fThe Omnic Forge will allow you to produce post-tank coils and casings. It is also part of the Netherite processing line." + "Note that Omnic Matrix Machine Casings are twice as expensive when crafted using the Assembler, so make sure to use your first Omnic Forge to build any extra ones." + "" + "Now, you could make this before you get tank, it's perfectly do-able, but there's nothing that really needs it." + ] + id: "4155AEBF760C42E8" + subtitle: "Wow, that's a lot of omnium!" + tasks: [{ + id: "1EBD17D9B6A27E1C" + item: "gtceu:omnic_forge" + type: "item" + }] + x: 32.5d + y: -6.75d + } ] subtitle: [ "Getting overhauled!" diff --git a/config/ftbquests/quests/chapters/progression.snbt b/config/ftbquests/quests/chapters/progression.snbt index 64f01c382..6f086a163 100644 --- a/config/ftbquests/quests/chapters/progression.snbt +++ b/config/ftbquests/quests/chapters/progression.snbt @@ -1790,6 +1790,7 @@ dependencies: [ "591A1B8B279DFCC9" "3650EF39B5AB4A7D" + "1A30472430354F1E" ] description: [ "Your first &6Tier Two Circuits&r will require three &6Tier One Circuits&r plus two &6Diodes&r." @@ -2801,6 +2802,33 @@ x: 4.0d y: 6.5d } + { + dependencies: ["23A57C125DC0F948"] + description: ["[MISSING DESCRIPTION]"] + id: "6DF2C1E88BE7CE5F" + shape: "hexagon" + tasks: [{ + id: "6E9EDE045B0C0B3E" + item: "gtceu:omnium_ingot" + type: "item" + }] + x: 20.0d + y: 2.0d + } + { + dependencies: ["6DF2C1E88BE7CE5F"] + description: ["[MISSING DESCRIPTION]"] + id: "59C70B40D865995D" + shape: "hexagon" + tasks: [{ + id: "08BB95F9BF15FF55" + item: "kubejs:omnic_matrix_coil_block" + type: "item" + }] + title: "Omnic Matrix Coils" + x: 18.5d + y: 3.5d + } ] title: "Progression" } diff --git a/config/jade/plugins.json b/config/jade/plugins.json index 95b99bbf1..e3eb49ad5 100644 --- a/config/jade/plugins.json +++ b/config/jade/plugins.json @@ -83,6 +83,9 @@ "telepastries": { "bites": true }, + "lootr": { + "info": true + }, "monazite": { "maintenance_info": true, "auto_output_info": true, diff --git a/config/lootr-common.toml b/config/lootr-common.toml new file mode 100644 index 000000000..dc5045878 --- /dev/null +++ b/config/lootr-common.toml @@ -0,0 +1,85 @@ +#whether or not the entire forge:chests/wooden tag should be added to the conversion list for structures (if they are backed by RandomizableContainerBlockEntity) +convert_wooden_chests = true +#list of loot tables which will decay (default blank, meaning no chests decay, in the format of (in the format of ["modid:loot_table", "othermodid:other_loot_table"]) +decay_loot_tables = [] +#a list of additional chests that should be converted (in the format of ["modid:name", "modid:other_name"], must be a tile entity instance of RandomizableContainerBlockEntity) +additional_chests = [] +#list of mod IDs whose loot tables will decay (default blank, meaning no chests decay, in the format ["modid", "othermodid"]) +decay_modids = [] +#list of modids whose loot tables shouldn't be converted (in the format of ["modid", "other_modid"]) +loot_modid_blacklist = [] +#allows fake players to destroy Lootr chests without having to sneak, overrides the `disable_break` option for fake players +enable_fake_player_break = false +#a list of additional trapped chests that should be converted (in the format of ["modid:name", "modid:other_name"], must be a tile entity instance of RandomizableContainerBlockEntity) +additional_trapped_chests = [] +#lootr chests cannot be destroyed by any explosion +blast_immune = false +#list of dimensions (to the exclusion of all others) that loot chest should be replaced in (default: blank, allowing all dimensions, e.g., ["minecraft:overworld", "minecraft:the_end"]) +dimension_whitelist = [] +#disables styling of breaking, decaying and refreshing messages sent to players +disable_message_styles = false +#list of dimensions where loot chests should automatically decay (default: blank, e.g., ["minecraft:the_nether", "minecraft:the_end"]) +decay_dimensions = [] +#whether or not the entire forge:chests/trapped tag should be added to the conversion list for structures (if they are backed by RandomizableContainerBlockEntity +convert_trapped_chests = true +#list of structures in which loot chests should automatically decay (in the format of ["modid:structure_name", "modid:other_structure_name"]) +decay_structures = [] +#lootr will automatically log all unresolved tables (i.e., for containers that have a loot table associated with them but, for whatever reason, the lookup for this table returns empty). setting this option to true additionally informs players when they open containers. +report_unresolved_tables = false +#list of dimensions by modid that loot chests should not be replaced in (default: blank, allowing all modids, format e.g., ["minecraft +#othermod"]) +modid_dimension_blacklist = [] +#list of loot tables which shouldn't be converted (in the format of ["modid:loot_table", "othermodid:other_loot_table"]) +loot_table_blacklist = [] +#list of dimensions where loot chests should automatically refresh (default: blank, e.g., ["minecraft:overworld", "othermod:otherdimension"]) +refresh_dimensions = [] +#list of mod IDs whose loot tables will refresh (default blank, meaning no chests refresh, in the format of ["modid", "othermodid"]) +refresh_modids = [] +#determine whether or not loot generated is the same for all players using the provided seed, or randomised per player +randomise_seed = true +#when true, custom inventories will act like trapped chests when opened +trapped_custom = false +#how long (in ticks) a decaying loot containers should take to decay (default 5 minutes = 5 * 60 * 20) +#Range: > 0 +decay_value = 6000 +#list of loot tables which will refresh (default blank, meaning no chests refresh, in the format of ["modid:loot_table", "othermodid:loot_table"]) +refresh_loot_tables = [] +#whether or not the Elytra item frame should be converted into a standard loot chest with a guaranteed elytra +convert_elytras = true +#list of dimensions by modid that loot chest should be replaced in (default: blank, allowing all modids, format e.g., ["minecraft +#othermod"]) +modid_dimension_whitelist = [] +#prevent notifications of decaying or refreshed chests +disable_notifications = false +#overriding refresh_loot_tables, refresh_modids and refresh_dimensions: all chests will refresh after being opened for the first time +refresh_all = false +#overriding decay_loot_tables, decay_modids and decay_dimensions: all chests will decay after being opened for the first time +decay_all = false +#lootr chests cannot be destroyed by creeper or TNT explosions +blast_resistant = false +#list of dimensions that loot chests should not be replaced in (default: blank, allowing all dimensions, format e.g., ["minecraft:overworld", "minecraft:the_end"]) +dimension_blacklist = [] +#allow the destruction of Lootr chests regardless. overrides `disable_break` +enable_break = false +#the maximum age for containers; entries above this age will be discarded [default: 60 * 20 * 15, fifteen minutes] [note: the value 6000 will be corrected to 18000. if you wish to use 6000, please use 6001 or 5999.] +#Range: > 0 +max_age = 18000 +#prevent the destruction of Lootr chests except while sneaking in creative mode +disable_break = false +#whether or not mineshaft chest minecarts should be converted to standard loot chests +convert_mineshafts = true +#when true, comparators on Lootr containers will give an output of 1; when false, they will give an output of 0 +power_comparators = true +#maximum time (in ticks) remaining on a chest before a notification for refreshing or decaying is sent to a player (default 30 seconds, -1 for no delay) +#Range: > -1 +notification_delay = 600 +#if true, no chests will be converted +disable = false +#how long (in ticks) a refreshing loot containers should take to refresh their contents (default 20 minutes = 20 * 60 * 20) +#Range: > 0 +refresh_value = 24000 +#disregard chests and chunks that are outside of the world border; enable this option if you are using a world border and are suffering consistent TPS issues; if you change the world border, you will need to restart your client +check_world_border = false +#list of structures in which loot chests should automatically refresh (in the format of ["modid:structure_name", "othermodid:other_structure_name"]) +refresh_structures = [] + diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json index ffebb32c0..1e0971be1 100644 --- a/kubejs/assets/kubejs/lang/en_us.json +++ b/kubejs/assets/kubejs/lang/en_us.json @@ -39,5 +39,5 @@ "item.kubejs.microminer_t9": "§dEternium Plated Micro Sun Eater [Tier Nine]", "item.kubejs.microminer_t9.desc": "§7§oCollapses microverse stars and harvests their delicious neutronium cores.", "item.kubejs.microminer_t10": "§dNeutronium Plated Micro Universe Harvester [Tier Ten]", - "item.kubejs.microminer_t10.desc": "§7§oCollapses an entire microverse and harvests it whole. Try to aim for uninhabited ones." + "item.kubejs.microminer_t10.desc": "§7§oCollapses an entire microverse and harvests it whole. Try to aim for uninhabited ones.", } \ No newline at end of file diff --git a/kubejs/assets/kubejs/textures/block/omnium/coil.png b/kubejs/assets/kubejs/textures/block/omnium/coil.png index f1a1bba15..bfff84c87 100644 Binary files a/kubejs/assets/kubejs/textures/block/omnium/coil.png and b/kubejs/assets/kubejs/textures/block/omnium/coil.png differ diff --git a/kubejs/assets/kubejs/textures/block/omnium/coil_ctm.png b/kubejs/assets/kubejs/textures/block/omnium/coil_ctm.png index 771b3df01..089138772 100644 Binary files a/kubejs/assets/kubejs/textures/block/omnium/coil_ctm.png and b/kubejs/assets/kubejs/textures/block/omnium/coil_ctm.png differ diff --git a/kubejs/server_scripts/Netherite.js b/kubejs/server_scripts/Netherite.js index 94f1095d5..629b7c88b 100644 --- a/kubejs/server_scripts/Netherite.js +++ b/kubejs/server_scripts/Netherite.js @@ -70,7 +70,7 @@ ServerEvents.recipes(event => { event.remove({ input: "minecraft:netherite_scrap" }) event.recipes.gtceu.large_material_press('inert_nether_compound_ingot') - .itemInputs('gtceu:hot_europium_ingot', '32x hostilenetworks:nether_prediction', '4x gtceu:dark_soularium_dust', '4x kubejs:primal_mana') + .itemInputs('gtceu:hot_europium_ingot', '16x armorplus:wither_bone', '4x gtceu:dark_soularium_dust', '4x kubejs:primal_mana') .itemOutputs('kubejs:inert_nether_compound_ingot') .duration(600) .EUt(16380) diff --git a/kubejs/server_scripts/gregtech/microverse_recipes.js b/kubejs/server_scripts/gregtech/microverse_recipes.js index 9d17e1707..56c246bb0 100644 --- a/kubejs/server_scripts/gregtech/microverse_recipes.js +++ b/kubejs/server_scripts/gregtech/microverse_recipes.js @@ -92,7 +92,7 @@ ServerEvents.recipes(event => { .EUt(7500) event.recipes.gtceu.advanced_microverse('kubejs:t_six_first') - .itemInputs('kubejs:microminer_t3', '16x kubejs:quantum_flux', '32x kubejs:stabilized_uranium', '16x kubejs:wither_realm_data') + .itemInputs('kubejs:microminer_t6', '16x kubejs:quantum_flux', '32x kubejs:stabilized_uranium', '16x kubejs:wither_realm_data') .itemOutputs('64x gtceu:uraninite_ore', '64x gtceu:uraninite_ore', '64x gtceu:uraninite_ore', '64x gtceu:uraninite_ore', '64x gtceu:osmiridiumyes_ore', '64x gtceu:osmiridiumyes_ore', '64x gtceu:osmiridiumyes_ore', '64x gtceu:iridosmineyes_ore', '64x gtceu:iridosmineyes_ore') .duration(1250) .EUt(18750) @@ -108,6 +108,13 @@ ServerEvents.recipes(event => { .itemOutputs('32x minecraft:dragon_egg') .duration(1250) .EUt(18750) + + //Post-Tank + event.recipes.gtceu.advanced_microverse('kubejs:t_three_third') + .itemInputs('kubejs:microminer_t3', '16x kubejs:quantum_flux', '32x kubejs:wither_realm_data') + .itemOutputs('16x minecraft:ancient_debris', '64x kubejs:dense_nether_quartz_ore') + .duration(600) + .EUt(7500) }) diff --git a/kubejs/server_scripts/gregtech/omnic_forge.js b/kubejs/server_scripts/gregtech/omnic_forge.js index 1461bab3e..ed5bc0393 100644 --- a/kubejs/server_scripts/gregtech/omnic_forge.js +++ b/kubejs/server_scripts/gregtech/omnic_forge.js @@ -1,5 +1,4 @@ ServerEvents.recipes(event => { - event.recipes.extendedcrafting.shaped_table( 'gtceu:omnic_forge', [ 'ASESA', @@ -26,6 +25,12 @@ ServerEvents.recipes(event => { event.recipes.gtceu.omnic_forge('kubejs:omnic_matrix_machine_casing_forge') .itemInputs('6x gtceu:omnium_plate', 'gtceu:crystal_matrix_frame', 'gtceu:zpm_field_generator', '#gtceu:circuits/uv') .itemOutputs('2x kubejs:omnic_matrix_machine_casing') - .duration(4000) + .duration(2000) + .EUt(65520) + + event.recipes.gtceu.omnic_forge('kubejs:omnic_matrix_coil') + .itemInputs('8x gtceu:omnium_double_wire', '8x gtceu:crystal_matrix_foil') + .itemOutputs('2x kubejs:omnic_matrix_coil_block') + .duration(2000) .EUt(65520) }) diff --git a/kubejs/server_scripts/gregtech/tank_fabricator.js b/kubejs/server_scripts/gregtech/tank_fabricator.js index 1999495fe..b7bbc3ef1 100644 --- a/kubejs/server_scripts/gregtech/tank_fabricator.js +++ b/kubejs/server_scripts/gregtech/tank_fabricator.js @@ -1,17 +1,21 @@ ServerEvents.recipes(event => { - event.shaped( + event.recipes.extendedcrafting.shaped_table( 'gtceu:subatomic_digital_assembler', [ - 'EFE', - 'GCG', - 'LUL' + 'ECFCE', + 'CALAC', + 'GLRLG', + 'CALAC', + 'ECUCE' ], { - E: 'gtceu:zpm_emitter', - F: 'gtceu:luv_field_generator', - G: 'gtceu:zpm_field_generator', - L: '#gtceu:circuits/luv', - C: 'gtceu:atomic_casing', - U: 'gtceu:uv_field_generator' - } + E: 'gtceu:zpm_emitter', + C: 'ae2:controller', + F: 'gtceu:luv_field_generator', + A: 'gtceu:atomic_casing', + L: '#gtceu:circuits/luv', + G: 'gtceu:zpm_field_generator', + R: 'gtceu:research_station', + U: 'gtceu:uv_field_generator' + }, 2 ).id('kubejs:shaped/subatomic_digital_assembler') event.recipes.gtceu.subatomic_digital_assembly('kubejs:creative_tank') diff --git a/kubejs/startup_scripts/Block_Registry.js b/kubejs/startup_scripts/Block_Registry.js index b01c84975..a8fb324bb 100644 --- a/kubejs/startup_scripts/Block_Registry.js +++ b/kubejs/startup_scripts/Block_Registry.js @@ -142,7 +142,7 @@ StartupEvents.registry("block", event => { .material('metal') .textureOverrideRenderer('minecraft:block/cube_all', {'all': new ResourceLocation('kubejs', 'block/omnium/casing')}) - event.create('omnium_coil_block', 'gtceu:coil') + event.create('omnic_matrix_coil_block', 'gtceu:coil') .temperature(12500) .level(24) .energyDiscount(16) diff --git a/kubejs/startup_scripts/material_registry/endgame.js b/kubejs/startup_scripts/material_registry/endgame.js index 6e650d9a0..2200f5177 100644 --- a/kubejs/startup_scripts/material_registry/endgame.js +++ b/kubejs/startup_scripts/material_registry/endgame.js @@ -19,7 +19,7 @@ GTCEuStartupEvents.registry('gtceu:material', event => { .ingot().fluid() .color(0x66ffff) .iconSet('shiny') - .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_FRAME); // yeah you can smash the plates + .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_FOIL, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_FRAME); // yeah you can smash the plates event.create("omnium") .ingot()