diff --git a/disabled/datagen/compat/EnergizedPowerRecipeGenerator.java b/disabled/datagen/compat/EnergizedPowerRecipeGenerator.java index 9f13a12e3c..964f4406d2 100644 --- a/disabled/datagen/compat/EnergizedPowerRecipeGenerator.java +++ b/disabled/datagen/compat/EnergizedPowerRecipeGenerator.java @@ -203,7 +203,7 @@ public static void addOritechAssemblerRecipes(RecipeOutput exporter) { new IngredientWithCount[]{ new IngredientWithCount(of(ItemContent.FLUX_GATE), 1), new IngredientWithCount(of(TagContent.ELECTRUM_INGOTS), 1), - new IngredientWithCount(of(ItemContent.DUBIOS_CONTAINER), 1), + new IngredientWithCount(of(ItemContent.DUBIOUS_CONTAINER), 1), new IngredientWithCount(of(ItemContent.ENERGITE_INGOT), 1)}, new ItemStack(BlockContent.SUPERCONDUCTOR.asItem()), "superconductor"); } diff --git a/src/generated/resources/.cache/15ee80397a068ab1f2bd10f8894c2ad09c6d0b88 b/src/generated/resources/.cache/15ee80397a068ab1f2bd10f8894c2ad09c6d0b88 index 6bd5a29019..4d26c71a4c 100644 --- a/src/generated/resources/.cache/15ee80397a068ab1f2bd10f8894c2ad09c6d0b88 +++ b/src/generated/resources/.cache/15ee80397a068ab1f2bd10f8894c2ad09c6d0b88 @@ -1,4 +1,4 @@ -// 26.1.2 2026-06-19T22:14:31.3078814 Tags for minecraft:fluid mod id oritech +// 26.1.2 2026-08-07T12:53:18.281871 Tags for minecraft:fluid mod id oritech e2dd9bc50a2b6f184853fa2210bd41010b2f380f data/c/tags/fluid/biodiesel.json e2dd9bc50a2b6f184853fa2210bd41010b2f380f data/c/tags/fluid/biofuel.json 90e6e62c494f72f7804930ed00bd1766efe6fa2c data/c/tags/fluid/diesel.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 957d3562b3..ca88b8a124 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 26.1.2 2026-08-01T09:43:22.8291017 Loot Tables +// 26.1.2 2026-08-07T12:53:18.2748749 Loot Tables 2deb5f4438cc29f103dceec24d82ce621d2d9a97 data/minecraft/loot_table/blocks/jungle_leaves.json 0f38535e0b2d03d37b02448fb3d0d370aced84ae data/oritech/loot_table/blocks/accelerator_motor.json 10b4a8414099f038d75d04c5b02c0a145226d10f data/oritech/loot_table/blocks/accelerator_ring.json diff --git a/src/generated/resources/.cache/7256b83764f3ef191bf6303a350b96fdc35dce31 b/src/generated/resources/.cache/7256b83764f3ef191bf6303a350b96fdc35dce31 index 06c3ae45ed..45ffef6f30 100644 --- a/src/generated/resources/.cache/7256b83764f3ef191bf6303a350b96fdc35dce31 +++ b/src/generated/resources/.cache/7256b83764f3ef191bf6303a350b96fdc35dce31 @@ -1,4 +1,4 @@ -// 26.1.2 2026-07-29T19:55:53.3490741 Oritech augment data +// 26.1.2 2026-08-07T12:53:18.268879 Oritech augment data ea7fd005bb020444c0e73420b65be1449529d80c data/oritech/oritech/augments/augment/armor.json 6027aa38f9065c54a7b508137a244a6bf3fddba9 data/oritech/oritech/augments/augment/attackdamage.json afc03914e601d3a6b56e793a4d23bc0c8ad42210 data/oritech/oritech/augments/augment/autofeeder.json diff --git a/src/generated/resources/.cache/773e2ddc0611c02f3a410069fb1282c6da109a93 b/src/generated/resources/.cache/773e2ddc0611c02f3a410069fb1282c6da109a93 index b5aa52ea68..0019f25e8f 100644 --- a/src/generated/resources/.cache/773e2ddc0611c02f3a410069fb1282c6da109a93 +++ b/src/generated/resources/.cache/773e2ddc0611c02f3a410069fb1282c6da109a93 @@ -1,4 +1,4 @@ -// 26.1.2 2026-07-29T20:15:03.80565 Model Definitions - oritech +// 26.1.2 2026-08-07T12:53:18.2768712 Model Definitions - oritech b8b37358e4d70ec779b1f47c535f8e6b29ec7bca assets/oritech/blockstates/accelerator_motor.json 930df7944fce4884e9bf6cc3db2c00f286b1647b assets/oritech/blockstates/accelerator_ring.json a0801733923625bd92b1a26db46a868174771600 assets/oritech/blockstates/accelerator_sensor.json @@ -239,7 +239,7 @@ cbdf3a2866b0d736b890691b0b113406587bd373 assets/oritech/items/deepslate_platinum 0d31d929e14a51754b9d7f9f28083409c705d18c assets/oritech/items/diamond_paint.json c78203c47a85d82c68e1c39c09334bf8b90bc60c assets/oritech/items/diamond_resource_node.json 56ef061e399e788e154eaabeefd2c5c4a194bfff assets/oritech/items/drone_port.json -1c3bd69f8f986ba45cfabc529fa4fb64d35646a7 assets/oritech/items/dubios_container.json +73277f4b78333f7ec17119aacc45f99295e613b7 assets/oritech/items/dubious_container.json 12c6b0c533c7bfe612a169ba716bec0e4c20056f assets/oritech/items/duratium.json fea0b4bc52afe004087b007f5d506a95e65f6b3e assets/oritech/items/duratium_dust.json ebe2f0cf9408b67a814cc9e0fd21076dd35463c9 assets/oritech/items/duratium_ingot.json @@ -585,7 +585,7 @@ fec5280fe44efeefb44946be9ac4d9626b060ce6 assets/oritech/models/item/copper_dust. 2e964d91a46577bf6a179afb1ded52a0d5deaaaa assets/oritech/models/item/copper_gem.json 84bc2922b2e7b64a95ec3160df10688923726be8 assets/oritech/models/item/copper_nugget.json b2128098777a7b793a8c83d3f5f3fdb1a93116c9 assets/oritech/models/item/diamond_paint.json -d7223c34ce81a014f8cda158d07979f4adb4a597 assets/oritech/models/item/dubios_container.json +fdf9a0446976d80f32eb852f18915e4ac6064aaa assets/oritech/models/item/dubious_container.json 1a1a2b1ff79d6a7d432f6842f63c36ec04632223 assets/oritech/models/item/duratium_dust.json 21a85f7686269b5fdd33e5ad42e3e09f76ace9e9 assets/oritech/models/item/duratium_ingot.json 41593ea0e8795b0c46705add04dfef917a37bb5c assets/oritech/models/item/electric_mace.json diff --git a/src/generated/resources/.cache/7986ff31a4fc29f6f8b73e7dbf5a85ee02b48fef b/src/generated/resources/.cache/7986ff31a4fc29f6f8b73e7dbf5a85ee02b48fef index 344041f467..08961209bc 100644 --- a/src/generated/resources/.cache/7986ff31a4fc29f6f8b73e7dbf5a85ee02b48fef +++ b/src/generated/resources/.cache/7986ff31a4fc29f6f8b73e7dbf5a85ee02b48fef @@ -1,4 +1,4 @@ -// 26.1.2 2026-08-01T09:43:22.8336214 Tags for minecraft:block mod id oritech +// 26.1.2 2026-08-07T12:53:18.2798707 Tags for minecraft:block mod id oritech 21cbe2cdb90402a19550a1e8446fcf0da46ea989 data/c/tags/block/budding_blocks.json db22d0db071efe480dee805390904217f01a586e data/c/tags/block/buds.json defb6e7e401af9151818226e55ea213c6737fc87 data/c/tags/block/ores.json diff --git a/src/generated/resources/.cache/79debfcf8b8a69cff9354d00f6715e8a750e20a3 b/src/generated/resources/.cache/79debfcf8b8a69cff9354d00f6715e8a750e20a3 index dd68dd2dd1..2a3670b71e 100644 --- a/src/generated/resources/.cache/79debfcf8b8a69cff9354d00f6715e8a750e20a3 +++ b/src/generated/resources/.cache/79debfcf8b8a69cff9354d00f6715e8a750e20a3 @@ -1,4 +1,4 @@ -// 26.1.2 2026-08-03T19:40:55.1994308 Tags for minecraft:item mod id oritech +// 26.1.2 2026-08-07T12:53:18.2698776 Tags for minecraft:item mod id oritech f37351511d3e439347c08017e7d7ff8b4d4cd079 data/c/tags/item/bananas.json e2c6e20d8d6d0e3e37246a13f9af75711482a721 data/c/tags/item/carbon_fibre.json 99505a8471e5d2356893d65d4cff2b3c634c266b data/c/tags/item/clumps.json diff --git a/src/generated/resources/.cache/8b306907f1eb849e61e39ac4c72da0fb19867f7a b/src/generated/resources/.cache/8b306907f1eb849e61e39ac4c72da0fb19867f7a index 0b1d0185dc..239bd80850 100644 --- a/src/generated/resources/.cache/8b306907f1eb849e61e39ac4c72da0fb19867f7a +++ b/src/generated/resources/.cache/8b306907f1eb849e61e39ac4c72da0fb19867f7a @@ -1,4 +1,4 @@ -// 26.1.2 2026-08-09T20:54:56.7075056 Oritech Recipes +// 26.1.2 2026-08-07T12:53:18.271876 Oritech Recipes 42f4dd49255f7cc579d92d894e61bb9a046bd666 data/oritech/advancement/recipes/building_blocks/carbon_plating_slab.json 494b346be668357a3d9d9a4a8117dc607e02d964 data/oritech/advancement/recipes/building_blocks/carbon_plating_stairs.json 2d4b9e39996d34c420265532b715611757f1b014 data/oritech/advancement/recipes/building_blocks/copper_reinforced_plating_slab.json @@ -87,8 +87,8 @@ ce56e399a0b8ffe9e75daf2f46db10d6a9c52c10 data/oritech/advancement/recipes/misc/c 19751555e9f07679a7ade36aafe2e46b13dbe669 data/oritech/advancement/recipes/misc/crafting/electricfurnacealt.json 536e852449efaac4de941d2097e31aaa77aba519 data/oritech/advancement/recipes/misc/crafting/energy.json ca01da145f210e9cd7ceafc8031beb3d1de801fe data/oritech/advancement/recipes/misc/crafting/energyport.json -36bd052a8c4ada4073800ea95050c3af1df5fde7 data/oritech/advancement/recipes/misc/crafting/equipmentCharger.json -db041a04075f5e5575d6676a8d6146cfa5529f2d data/oritech/advancement/recipes/misc/crafting/equipmentChargeralt.json +eb7d14673103f1cd9f9a359a23af8c5ae6b59b87 data/oritech/advancement/recipes/misc/crafting/equipmentcharger.json +06536245b48a5a49e574d524b88cb7c7de1e3472 data/oritech/advancement/recipes/misc/crafting/equipmentchargeralt.json 042644f5cf47a43f1fc2f1708f529e980da0916c data/oritech/advancement/recipes/misc/crafting/exoboostedelytra.json d842922355bffa164bd7b719a69befa38716a53b data/oritech/advancement/recipes/misc/crafting/exoboostedelytraalt.json 6488c825333171c21911decf003fe0207efcd7bd data/oritech/advancement/recipes/misc/crafting/exojetpack.json @@ -154,7 +154,7 @@ a0af3896d9005df43b92cc7f031f7884b27d2ec7 data/oritech/advancement/recipes/misc/c f06699e65b4d3002e55276692b43dd98f2c44601 data/oritech/advancement/recipes/misc/crafting/_hunter.json 674aa565fc658c4b0808f42da17564444cfa09ae data/oritech/advancement/recipes/misc/diamond_paint.json 691b2e2fe3dba1219799d75552dc50b90d01df77 data/oritech/advancement/recipes/misc/dirt_from_sand_and_biomass.json -803e726c0bdcf331711f053f57aca8b7cebd02dc data/oritech/advancement/recipes/misc/dubios_container.json +c8227f8a47f59ed3b77054ee34b5ad67b15a4b43 data/oritech/advancement/recipes/misc/dubious_container.json adb013b3d9ac8f75ecea39ce2ffbad820501e1a3 data/oritech/advancement/recipes/misc/duratiumblock.json 5c902e863a6cf8248ce86a4cd86db197af744f41 data/oritech/advancement/recipes/misc/duratiumblockinv.json cca196e922fb4d2d134dc7a699bb83b122d554eb data/oritech/advancement/recipes/misc/duratium_ingot_from_blasting_duratium_dust.json @@ -312,51 +312,51 @@ e05c181f3c0e23e889add908f9918b738a4629b4 data/oritech/recipe/adamantblockinv.jso 8230a0865d2c843c516bdd276f8775cb3558355d data/oritech/recipe/adamant_ingot.json 76274c8f4f8bf89009768e31c83b440dd6667d1e data/oritech/recipe/adamant_ingot_from_blasting_adamant_dust.json 40d37e406c226d500ad78e0d98f30f4e6522a170 data/oritech/recipe/adamant_ingot_from_smelting_adamant_dust.json -f1f5e8a1457e7e9c078b3d750055fefb3ac1747a data/oritech/recipe/addon_splicer.json +b6a05844db1da5c7e1aa035a05ead056e9dc1deb data/oritech/recipe/addon_splicer.json f9f2e8f3b86e2aef5c9ba826d0d625fef10e55e2 data/oritech/recipe/advanced_battery.json -5182016daa8bc5d695770c5093d159e8799180f3 data/oritech/recipe/assembler/amethystbud.json -8248b2369c93caefe81ca61a79afc4af3e7f5a2f data/oritech/recipe/assembler/battery.json -e1209d03abfb7d0d51e82f345decc7d191fc2801 data/oritech/recipe/assembler/batterybetter.json -fdd5b06b9a81120f9b8c3462dabe9b7199f0aab4 data/oritech/recipe/assembler/blazerod.json -9789b79f4d7ec0e125c3faaeff54c60549642f3b data/oritech/recipe/assembler/book.json -36e4dd2a22bbe5bc266fad776b8a886ff73824ad data/oritech/recipe/assembler/claybeads.json -f3cf99ea787a05ebf4a6a44cd7e75b6770487506 data/oritech/recipe/assembler/enderlens.json -79d2a736a789f2b70f4dbca1a7793520a16bfa12 data/oritech/recipe/assembler/fireball.json -7b986c124e1a6814dcfb8faf76e4779fb40f3d15 data/oritech/recipe/assembler/fluxgate.json -39f36e042da12ae9a61bd14f7eab226dbf9fc262 data/oritech/recipe/assembler/ionthruster.json -c6c1c63dec381f78119c93e677325320421832bf data/oritech/recipe/assembler/magnet.json -09850d246dcdcba4d454d8b80be66e5e11210c9b data/oritech/recipe/assembler/motor.json -52672065e41dde2e0f68084b010743bd78f977fa data/oritech/recipe/assembler/plating.json -3bef64161eb1ba3428920416694e260c8e200f11 data/oritech/recipe/assembler/platingcarbon.json -f1948cab11a08c0807fc568a1b64d6fd6ac8edf4 data/oritech/recipe/assembler/platingiron.json -d4e026edab3df37a319cae06c040230de0e5cced data/oritech/recipe/assembler/platingnickel.json -58b7cee2063298c777649e8f99a08fbb4b032ed6 data/oritech/recipe/assembler/plutoniumpelletbasic.json -8898ed08dc57df3d0143f47b65c7ab1dc4746d7b data/oritech/recipe/assembler/plutoniumpelletbetter.json -9e0b93c29143905c255bff8a721f32e76bc53aaa data/oritech/recipe/assembler/plutoniumpelletult.json -00458c8bf753b3afcd8f7d2ec6175ad4cd1c3353 data/oritech/recipe/assembler/processingunit.json -1bfd3716c367d0e2e8954e70909bab71237bd7b3 data/oritech/recipe/assembler/reactorplatingalt.json -595b45a91bd47543746cefd070f1e2feb6af31ff data/oritech/recipe/assembler/shroomlight.json -3e4c0c88d0d6631e5ec45a7c7464fe6ffdceedfe data/oritech/recipe/assembler/slime.json -518cea7f61cc39d2438bbfd4ed77e04777081ab0 data/oritech/recipe/assembler/solidbiofuel.json -041508f5358cde358f36794ceda20410a44ba875 data/oritech/recipe/assembler/superconductor.json -ccfe6885d173f569815ca9d08cbac6d3f70359e2 data/oritech/recipe/assembler/uranpelletbasic.json -2e2399d136f653df587f9d5a0168ff08419c7a02 data/oritech/recipe/assembler/uranpelletbetter.json -5e35bfff6fbcb2ee9e4e0020ab36ea745eeac245 data/oritech/recipe/assembler/uranpelletult.json -b48f67bc611d34c030425a8b9489a9e1c5f1b2bd data/oritech/recipe/atomicforge/advcomputer.json -421f8fecb23fd7914a1376b14b1fb35bbf547199 data/oritech/recipe/atomicforge/aicomputer.json -34603d7af0fe4388d325ba56262f8095e46066d6 data/oritech/recipe/atomicforge/compensator.json -b31750609d32a27b328a2c1726ee82d79a2af00e data/oritech/recipe/atomicforge/compensatoralt.json -d35bffbdc16ebfbea6a1118b32562ec4bf7af5a7 data/oritech/recipe/atomicforge/duratium.json -279cea66b83f377a1eaf0df28fd4d31c05af123e data/oritech/recipe/atomicforge/dust/copper.json -c627a2836d70215f06f1215ccc4b7c85ff9a5f26 data/oritech/recipe/atomicforge/dust/gold.json -071217f0063a70ffe1e4af6ed67fd7b0dd994906 data/oritech/recipe/atomicforge/dust/iron.json -a6404ed2763eff97a31117a8d78791a5d0fff86b data/oritech/recipe/atomicforge/dust/nickel.json -a5db23daeb29612cf5edd4be72a8fabdb06c8861 data/oritech/recipe/atomicforge/dust/platinum.json -9b75a3dd854e638260e5317512cdd9b163ba585c data/oritech/recipe/atomicforge/prometheum.json -d48bae5c734e5d680dd52b9efd7a3717f1e76d21 data/oritech/recipe/atomicforge/reinfdeepslate.json -db28238a3b8028b4ac368bbb186a6bc3e51c1e19 data/oritech/recipe/atomicforge/urandust.json -148a6ce38e011a0d0f868a2b072aa29435c6584c data/oritech/recipe/atomicforge/urandustgem.json -710f5b245450d422b03d8f36fe3eaa02df49eb32 data/oritech/recipe/atomicforge/wafer.json +16901751469380b89ec1320c70c7fcdeca5480b6 data/oritech/recipe/assembler/amethystbud.json +3111ab3e631cc150250502e1e0ba34196c93b020 data/oritech/recipe/assembler/battery.json +afc30578f5d1918a85dbc15f50df31ac9739a9c9 data/oritech/recipe/assembler/batterybetter.json +3780b1d62d3ed35b4e68e9b47a200fe94dd78c1b data/oritech/recipe/assembler/blazerod.json +ed6cbde515e22aa5725fe640f4c22c8ab23f72d2 data/oritech/recipe/assembler/book.json +e4896ad90bcd6094c5736acfd18a690255aed67b data/oritech/recipe/assembler/claybeads.json +29967258d1bd63479f60b9ec8595f322d25ed6eb data/oritech/recipe/assembler/enderlens.json +153c9c452e1532d6ba3639e3700bd20f85a6394b data/oritech/recipe/assembler/fireball.json +70ac5b91ab8d59f4a433ec200a02b9ccdc1ce103 data/oritech/recipe/assembler/fluxgate.json +a21dbf0e693a71a098e349bde68c7387b93235cf data/oritech/recipe/assembler/ionthruster.json +55ff9301a339b7d7f8676474b58fe5573f25a837 data/oritech/recipe/assembler/magnet.json +dd4e3591874151cb1889fb8b25df34c4198b6d03 data/oritech/recipe/assembler/motor.json +256b70c638a33d173cc6faa5be1b30d13d4f1414 data/oritech/recipe/assembler/plating.json +089d974e58c61b052ac0eeb4fe62b93ea651ae75 data/oritech/recipe/assembler/platingcarbon.json +2875bf625deb80c1f6726f7d2738f95d3d9ce04d data/oritech/recipe/assembler/platingiron.json +6dfb570e2eb005577d1daffc432b337729e83bd8 data/oritech/recipe/assembler/platingnickel.json +229683a5f1b468b5ffe916411a4c97cfaab55023 data/oritech/recipe/assembler/plutoniumpelletbasic.json +9d713df99c2339ad0909d36fa44e56dd64e97fd6 data/oritech/recipe/assembler/plutoniumpelletbetter.json +257a3b7719d1042e059a5d693fd68887ecee7eed data/oritech/recipe/assembler/plutoniumpelletult.json +2e6c49b97f86a0c168b50da8f3da6a507d8becf3 data/oritech/recipe/assembler/processingunit.json +c285f65fa4f8b007431857e44527fb4334211655 data/oritech/recipe/assembler/reactorplatingalt.json +d8373877734993da502b5f7e2ed22162dfd5ad2e data/oritech/recipe/assembler/shroomlight.json +5a2d886c511b2b3881191d10bf02e524ae2fbc84 data/oritech/recipe/assembler/slime.json +beaa81776d748cdcb8ece69c7da05aed407866ce data/oritech/recipe/assembler/solidbiofuel.json +5e085150dc4a564d98674d3254e100bbbe6fb08e data/oritech/recipe/assembler/superconductor.json +c457824623749eb047a5d276caa95a9f02293d4b data/oritech/recipe/assembler/uranpelletbasic.json +0aff5e6e78c0677fb8d7e8cd6561a4b97a9ff6af data/oritech/recipe/assembler/uranpelletbetter.json +426d9e502508382238a3d71f695759939f2bdf6a data/oritech/recipe/assembler/uranpelletult.json +3b93141f83b58010a867a93e21c2f1429522e8a9 data/oritech/recipe/atomicforge/advcomputer.json +dc314903687b0344950a807631ff2d55440f3d39 data/oritech/recipe/atomicforge/aicomputer.json +82baa25f420619a5c2e779f84e0d5571ce1257ca data/oritech/recipe/atomicforge/compensator.json +d42e2e648aa95748533395a85e8d3956486ec68d data/oritech/recipe/atomicforge/compensatoralt.json +03a485673ccfb15d54573e881ae9958fbd905daa data/oritech/recipe/atomicforge/duratium.json +8c140b63519c6e0560ba1ada977282cbc21dc87e data/oritech/recipe/atomicforge/dust/copper.json +58b9c448416911aed97eb5d5f32d0b3d3cbc8829 data/oritech/recipe/atomicforge/dust/gold.json +e75df8152fd0f0fa638f290f17819a6f279939bc data/oritech/recipe/atomicforge/dust/iron.json +ea6f9e852610eea29a1141327b5ce12cbafafb7e data/oritech/recipe/atomicforge/dust/nickel.json +f1ba8f3b5ea1ef4fb28f58715fe8949a628c9efd data/oritech/recipe/atomicforge/dust/platinum.json +b1b81b3e797076d68da4e0f19337cfdeb997d900 data/oritech/recipe/atomicforge/prometheum.json +5094518709ed4d6f8e732033bbff1e1b6680445c data/oritech/recipe/atomicforge/reinfdeepslate.json +17a8da3ee5e4deac5491464a761c7cb8ec5c899c data/oritech/recipe/atomicforge/urandust.json +4cb89dd94ee736365e924e54c1c5a6c8c3d673d3 data/oritech/recipe/atomicforge/urandustgem.json +f0eaea4f74f0a61e2efa032d942da9039159825b data/oritech/recipe/atomicforge/wafer.json ebb633e12a3aff90e1ce573b0f664135d0e2c151 data/oritech/recipe/basic_battery.json f797184b024a7a216cec1d78f77a5685f08f7de4 data/oritech/recipe/biogen/biomass.json 6ea91cbf506723393818caca118dc8fc38eeaa4b data/oritech/recipe/biogen/biomassblock.json @@ -376,42 +376,42 @@ b33f7aed7f3070a986766ce0b8da7b4bb5cf4be3 data/oritech/recipe/carbon_plating.json 44d1717736f0a4b8af3b439b9b530839f8ca1071 data/oritech/recipe/carbon_plating_pressure_plate.json 2084e07474fbf6962e1afe572bd2c58b43a78cba data/oritech/recipe/carbon_plating_slab.json e0d28bd10bdbd69ee3d71e508dcf34a7ed267d5f data/oritech/recipe/carbon_plating_stairs.json -f3a31b6c303434c993645be8cd60fdd35bde9f25 data/oritech/recipe/centrifuge/carbon.json -85f1d87250cbeb421465a0ea5777f169c6900361 data/oritech/recipe/centrifuge/clump/copper.json -4ede6bedae2bca0b04f4a3f35537ea3549a6108b data/oritech/recipe/centrifuge/clump/gold.json -0bbfa8a09081032c32e2224975a84cab37d9bd44 data/oritech/recipe/centrifuge/clump/iron.json -ed7da27b0d0ffba33cc10a2f4524656f2517a83e data/oritech/recipe/centrifuge/clump/nickel.json -97c6fc98f7b1ad695f929b7c51dae336f8072032 data/oritech/recipe/centrifuge/clump/platinum.json -1ea2ad08438264c789ba1afe4ae0c8b00b8c177a data/oritech/recipe/centrifuge/endericsculk.json -e62d891084ff0c48c819750551d7bf1896f3691a data/oritech/recipe/centrifuge/fluid/advbatteryacid.json -8a7122bf3467491bf61fd4edc9079c5dccd9dcfa data/oritech/recipe/centrifuge/fluid/batteryacid.json -e2793525a7eeef1619e1ab6a51feadd827898ed5 data/oritech/recipe/centrifuge/fluid/biofuel.json -a051c05fd4043f276ea8f0831794f6203410991b data/oritech/recipe/centrifuge/fluid/biopolymer.json -99c490dcd75893485d1d93343f4e769d09e72b4c data/oritech/recipe/centrifuge/fluid/biopolymer_bioblock.json -043a322417e6e6c4f964a82dbc566fbf9507ed11 data/oritech/recipe/centrifuge/fluid/biopolymer_biomass.json -8ed9c35d8b7318b45db0fe2d63120fd39355b9dc data/oritech/recipe/centrifuge/fluid/clay.json -e00fe97ec0532f04bad8f76d8e6745ce70cf74b5 data/oritech/recipe/centrifuge/fluid/clumpacid/copper.json -61c3da211646fdc72c0f3a985e7117062535ca61 data/oritech/recipe/centrifuge/fluid/clumpacid/gold.json -7adf1ffe061bc45ac82eff54cbcae0c46ff654a9 data/oritech/recipe/centrifuge/fluid/clumpacid/iron.json -235276d587c96ef16f20df4990477828910f8700 data/oritech/recipe/centrifuge/fluid/clumpacid/nickel.json -1f354ddf7e001f293b1298f5d95e74e42287c6a7 data/oritech/recipe/centrifuge/fluid/clumpacid/platinum.json -2ed66f2f5a1853c06720023ded92fc5ed950b16e data/oritech/recipe/centrifuge/fluid/clump/copper.json -fbd6c085dbd89fbfcb9957e7ae7aaa0d858e8a65 data/oritech/recipe/centrifuge/fluid/clump/gold.json -2dde772fb87e9bd661ad8309ba6692152100dd93 data/oritech/recipe/centrifuge/fluid/clump/iron.json -26a73b0b0d4e36150f20a3aaa90f947d346998de data/oritech/recipe/centrifuge/fluid/clump/nickel.json -02dee541a86f235f00a48ade8d65fd516e1db5f3 data/oritech/recipe/centrifuge/fluid/clump/platinum.json -810e9e826097b33f85428b9202b3294b2e394381 data/oritech/recipe/centrifuge/fluid/fuel.json -d7b702a1c32f92856241b898f1bc4c1d84a95ce5 data/oritech/recipe/centrifuge/fluid/naptharesin.json -ea4daaf5911f0c1dba00d80bff478add9c572013 data/oritech/recipe/centrifuge/fluid/plasticbio.json -bfbd502deb85085cc7f33a685e7a40b1862f5f3a data/oritech/recipe/centrifuge/fluid/plasticbiobetter.json -458915e22172438e6ca6d789c0896f0bdd069a19 data/oritech/recipe/centrifuge/fluid/plasticoil.json -1e6426d4c65171c6cfdcc3dc97d287e7cf43521d data/oritech/recipe/centrifuge/fluid/plasticoilbetter.json -b4fa105b4ec9ba13af5f916a7b2fa8e48b0af96b data/oritech/recipe/centrifuge/fluid/polymerresin.json -b1a4a56568f90c52cffe55d1a04679b7645f4b06 data/oritech/recipe/centrifuge/fluid/siliconwafers.json -7496e6802290ca2174b4e252cca7fbe54573d65c data/oritech/recipe/centrifuge/fluid/siliconwash.json -45dd44f8da877171be2355186842379dbabdd2ec data/oritech/recipe/centrifuge/fluid/siliconwashbad.json -3f1d3f197adcfb90d792f0b7cb4694d3815b64c5 data/oritech/recipe/centrifuge/fluid/unholyai.json -8fb485b7f5b12fb89378d8870b5d8e1ce9835281 data/oritech/recipe/centrifuge/redstoneuran.json +02049f87ea645e88131b771a66bc6df34e88d5de data/oritech/recipe/centrifuge/carbon.json +ffefdef668d391ee53cc8cd513d0172d9d07face data/oritech/recipe/centrifuge/clump/copper.json +f4618776d1cdd5447cceeaa4a4399fcba579f553 data/oritech/recipe/centrifuge/clump/gold.json +70f53768e45fe506afc4150be598a9502a17aee2 data/oritech/recipe/centrifuge/clump/iron.json +29fa43954ff16c8fdc91a91d55b3bd16bfc9d821 data/oritech/recipe/centrifuge/clump/nickel.json +83b6061879fdb4dca7abd4443c11d48cc724b0bb data/oritech/recipe/centrifuge/clump/platinum.json +b6c63be286bbcb35f93518e137071826249365ff data/oritech/recipe/centrifuge/endericsculk.json +110e2dfe136472ebf49b99af8effd1c78ba4a53c data/oritech/recipe/centrifuge/fluid/advbatteryacid.json +5de7b0910c0f6b099c407b40c947eb455227f064 data/oritech/recipe/centrifuge/fluid/batteryacid.json +51e5bd5dce4f06536f8f4e69a05c084decb46fdf data/oritech/recipe/centrifuge/fluid/biofuel.json +725899aede2050c6ddfe5cbcabca404e812267e5 data/oritech/recipe/centrifuge/fluid/biopolymer.json +b8ccd7c68c345e510f0b0e41df9b4716e3ef1cdf data/oritech/recipe/centrifuge/fluid/biopolymer_bioblock.json +eb7c93ede36b0f4dca703f39f894eeb026929be6 data/oritech/recipe/centrifuge/fluid/biopolymer_biomass.json +a555bde70c52ffa6253ac1f2bed830595193e997 data/oritech/recipe/centrifuge/fluid/clay.json +60400dc284a62a25e06bd16cc835efe484d3df8d data/oritech/recipe/centrifuge/fluid/clumpacid/copper.json +f483f6d626487d45c3883fd4117727eb42e18260 data/oritech/recipe/centrifuge/fluid/clumpacid/gold.json +a02267b83dc1ff15d9264a24eb26156eefb894c8 data/oritech/recipe/centrifuge/fluid/clumpacid/iron.json +40791991fdd8b415cfda8a3cf584eb13aea8abb9 data/oritech/recipe/centrifuge/fluid/clumpacid/nickel.json +5d4e9454404cddcc006259ba8baf38c30f776cdf data/oritech/recipe/centrifuge/fluid/clumpacid/platinum.json +f3919801c507b15d2239efe7d2c34e8d314cda11 data/oritech/recipe/centrifuge/fluid/clump/copper.json +50a263bd1b475e17af472b041f50eef2e9acf7de data/oritech/recipe/centrifuge/fluid/clump/gold.json +8cd9a466e7332ce6ad2e91e5eabdf35ed2f3fc06 data/oritech/recipe/centrifuge/fluid/clump/iron.json +da63e675dd39e47e8435518eaa19d688ec401d74 data/oritech/recipe/centrifuge/fluid/clump/nickel.json +87428090a614fccf495cb9a838959737c9526f2f data/oritech/recipe/centrifuge/fluid/clump/platinum.json +2460dfebb7f10cf9da088f62a894c7f5a26b4e4c data/oritech/recipe/centrifuge/fluid/fuel.json +281777349cfbbf845a9ead457b7af3b644684eb3 data/oritech/recipe/centrifuge/fluid/naptharesin.json +b44fdbadcddcbd4ae4e8bfbb32b79b3f4a101f34 data/oritech/recipe/centrifuge/fluid/plasticbio.json +33d2f411ee35986ded58213c57e192ff40ac64bb data/oritech/recipe/centrifuge/fluid/plasticbiobetter.json +b3a624e31b8451b21c75d19e60b5eb1bbd18a9de data/oritech/recipe/centrifuge/fluid/plasticoil.json +4bc5cd763fae6d9cff821f301c2afd2db605da7c data/oritech/recipe/centrifuge/fluid/plasticoilbetter.json +459bb1f20cedc49ceb5ffe2ea879605f1dd40cf9 data/oritech/recipe/centrifuge/fluid/polymerresin.json +a2c8ffa87a61883c338b654ed0592aa815e0c17f data/oritech/recipe/centrifuge/fluid/siliconwafers.json +b5fd7df4ba9fa042b4671a85fcf576baa5fa25a1 data/oritech/recipe/centrifuge/fluid/siliconwash.json +08a8c37d8c4c4046afcbe01e5d2b057d84672c27 data/oritech/recipe/centrifuge/fluid/siliconwashbad.json +ec4131c3f72edede97bb29c6ed19a7805f696349 data/oritech/recipe/centrifuge/fluid/unholyai.json +4e4ec728a4c82b2b9fed66ede4077b00c25e99e3 data/oritech/recipe/centrifuge/redstoneuran.json cd1b52ebd4850273ae64a9d4d1b64f89b3f9a4ed data/oritech/recipe/chainsaw.json da4ff740a56bd8a79b72e7dec1bd13ac512cc71c data/oritech/recipe/clay_catalyst_beads.json 513c4fe529ee10998e5aca11b70c2d1fb77a29b5 data/oritech/recipe/copper_ingot_from_blasting_copper_dust.json @@ -446,13 +446,13 @@ a92bba235c824c73cb73cd93208ba4258a2c7666 data/oritech/recipe/crafting/addon/ulti a919e7ecae9b4551d9603222005e0e13d0f9acc5 data/oritech/recipe/crafting/assembleralt.json 74798c941a6f5b1f697101bb0ef1a2f4d207d135 data/oritech/recipe/crafting/atomicforge.json b395784cd560dc46eac748204d2e1ccec5b1a3e2 data/oritech/recipe/crafting/augment/advanced.json -6d46f155a25fa36c739d6d2891c96242c186a35d data/oritech/recipe/crafting/augment/applicator.json +a1eb798667f536dd90bdfb6f95f268331ea646b7 data/oritech/recipe/crafting/augment/applicator.json aabd9ed05ee196c2f57bc8fd2322b51997b1c250 data/oritech/recipe/crafting/augment/arcane.json 653c99aa021a088c875676b7a861ca786cd7626f data/oritech/recipe/crafting/augment/basic.json 99bfbd8ed46bdd452b6aec980c11c5012d4fb687 data/oritech/recipe/crafting/basicgen.json 3193f4511c5cc49c03c758e03ef8a8c6b7e380cc data/oritech/recipe/crafting/basicjetpack.json d041dcfacc480fe8b987e00160969f0d0a7a28d1 data/oritech/recipe/crafting/basicjetpackalt.json -db6604d3f9d3b73a6d2d50f2b3a3472e565361d6 data/oritech/recipe/crafting/bigstorage.json +c2bfceb970ec885cbf73892dbc179036d7ea689f data/oritech/recipe/crafting/bigstorage.json 0c548e3c8091ef666a6da574fbe8da0e7b6e3300 data/oritech/recipe/crafting/biogen.json 14cffbca1924294fb8634d9921acd351429bcc4f data/oritech/recipe/crafting/boostedelytra.json a911ba75403b978f3d97476a3fae1b3d95f95847 data/oritech/recipe/crafting/catalyst.json @@ -468,7 +468,7 @@ a565b6e3e1bae2ee4c648c48777ec22abb94705e data/oritech/recipe/crafting/core2.json cc75461083094ec4e271a0a655b62873c23f11c1 data/oritech/recipe/crafting/core3alt.json 82e6d5409f2bec302ec45a6e2451bf67936d2152 data/oritech/recipe/crafting/core4.json f6c23b2c31f0e61c57caa4e2ecabe201c27a6a5d data/oritech/recipe/crafting/core5.json -d2d8f5ad0a87030e4958aaa722e28e993d326135 data/oritech/recipe/crafting/core6.json +bb9323be6f8efd6eaf0f3cb03c941b5ec4632c03 data/oritech/recipe/crafting/core6.json aff4aafdf737c4fcdd1e5e7209423ec564df69a9 data/oritech/recipe/crafting/core7.json 65ca32b5cf71309f2395b88cd6cf47175f810bd0 data/oritech/recipe/crafting/crusher.json 6a62d5b815ab16035d76fecdc6106a9a9827b419 data/oritech/recipe/crafting/deepdrill.json @@ -479,8 +479,8 @@ b84f8ca5cd6c231d9aa8217ea589c29ff8a42cd2 data/oritech/recipe/crafting/electricfu f9268adeb3ee93f42407cbadbbe3f6265c8726bd data/oritech/recipe/crafting/electricfurnacealt.json a4f7f11b3ba3a22a667fafd745819b2dac148d60 data/oritech/recipe/crafting/energy.json 98090451aade069e538afeb6768877f34706af8d data/oritech/recipe/crafting/energyport.json -a6c96267d133fe25fdc24c887cde461683d2ab34 data/oritech/recipe/crafting/equipmentCharger.json -e2a8f1fd2a8554c09e7e5d9c43020442ccc86a0c data/oritech/recipe/crafting/equipmentChargeralt.json +a6c96267d133fe25fdc24c887cde461683d2ab34 data/oritech/recipe/crafting/equipmentcharger.json +e2a8f1fd2a8554c09e7e5d9c43020442ccc86a0c data/oritech/recipe/crafting/equipmentchargeralt.json a9d73bb12539f6e53c128334ceba00d5f1131c9a data/oritech/recipe/crafting/exoboostedelytra.json edd220b1ec83ebdf8789cda1b32857a602390acd data/oritech/recipe/crafting/exoboostedelytraalt.json a007060d3a7bb7b68d83aee68cc4e2a0deea98b1 data/oritech/recipe/crafting/exojetpack.json @@ -557,7 +557,7 @@ f254369a63c9a67abe7524ed38eb1c3d93b28dae data/oritech/recipe/deepdrill/redstone. 07870f9f195f2e4d5cdfd66591bec5a6ca872a53 data/oritech/recipe/deepdrill/uranium.json 096b54f2196cac7bac22a0f7ab4675c66cdace68 data/oritech/recipe/diamond_paint.json 45a483b0edf6d1bbe554bf84853f8117e0767507 data/oritech/recipe/dirt_from_sand_and_biomass.json -8c7ed7246f9fa0c89aa1cc61acb6657b0063e185 data/oritech/recipe/dubios_container.json +80acc963d164327487c9385b1db27ce4df317869 data/oritech/recipe/dubious_container.json ec566f4e815b59ae66b14c49e5cbe6161112718d data/oritech/recipe/duratiumblock.json 09f5a7cb6dd2190c4c7bab477cbd792b4f96f24a data/oritech/recipe/duratiumblockinv.json b7571d6954fe81a0bea9a7b7261a27507fe5060d data/oritech/recipe/duratium_ingot_from_blasting_duratium_dust.json @@ -701,11 +701,11 @@ d4db07c85ba41d76c6fdb1fef0f0c9adac94f918 data/oritech/recipe/iron_plating_slab.j c74fd04348a9c2861b215ea3b3e315672a4c2bbd data/oritech/recipe/iron_plating_stairs.json 4b1e81b2628ad0fb52cfc6843d8b997cb8d8dc53 data/oritech/recipe/item_pipe.json e2bbbbf3202be3fd07f7a7f136d7eae9514eff09 data/oritech/recipe/item_pipe_duct.json -f614dabe2dddc2590b63b1180763420a154281a9 data/oritech/recipe/laser/fluxite.json -bb8895235d2fe79e4abb7a611ac6ef76031c3229 data/oritech/recipe/laser/plutoniumdust.json -b52e2564490a9eb11654016eb72b68f1b1faa59b data/oritech/recipe/lavagen/lava.json -26f62ae16d08c2a4c354c4c76501ef58475af91c data/oritech/recipe/lavagen/sheolfire.json -7c50139aa6df545c8e665975fe10812d587ad584 data/oritech/recipe/low_yield_nuclear_explosion_device.json +6bbb92bb12862cc2a2289cd840162c703c8a89bd data/oritech/recipe/laser/fluxite.json +23605268ec6f0ae0fdaf95d28f42303fe5cf6b66 data/oritech/recipe/laser/plutoniumdust.json +35f6e4ff387a13359c641df18236731bd2c27909 data/oritech/recipe/lavagen/lava.json +5e42e6887556f44c306c7f00cdc7b8c1dbc09cc2 data/oritech/recipe/lavagen/sheolfire.json +b9359c3df19d1943d44fb994f490671574abdf16 data/oritech/recipe/low_yield_nuclear_explosion_device.json fe03ea7d4780c0d58534a96523581e1d3dea8aaa data/oritech/recipe/machine_extender.json 3e9c6903b36396b3626625d0f780f2d54f576217 data/oritech/recipe/machine_frame.json d93e6f707e596157fcd24e27940f64030b8b6535 data/oritech/recipe/magnetic_coil.json diff --git a/src/generated/resources/.cache/ce49a8e3a57764f6f86a4a2c2b8041e1808b6359 b/src/generated/resources/.cache/ce49a8e3a57764f6f86a4a2c2b8041e1808b6359 index e5db8c76b9..54685083c7 100644 --- a/src/generated/resources/.cache/ce49a8e3a57764f6f86a4a2c2b8041e1808b6359 +++ b/src/generated/resources/.cache/ce49a8e3a57764f6f86a4a2c2b8041e1808b6359 @@ -1,2 +1,2 @@ -// 26.1.2 2026-06-19T22:15:34.0715417 Tags for minecraft:entity_type mod id oritech +// 26.1.2 2026-08-07T12:53:18.281871 Tags for minecraft:entity_type mod id oritech e00f2931577049b9a4400a87ed9c249373be376c data/oritech/tags/entity_type/spawner_blacklist.json diff --git a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f index d66b5ff217..732803fced 100644 --- a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f +++ b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f @@ -1,2 +1,2 @@ -// 26.1.2 2026-07-31T15:28:06.8959298 Data Maps +// 26.1.2 2026-08-07T12:53:18.2708713 Data Maps 15214347255d11eb7a3bcb7091904a6117f51873 data/neoforge/data_maps/item/compostables.json diff --git a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 index 92b19f359a..c1aa38c112 100644 --- a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 +++ b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 @@ -1,4 +1,4 @@ -// 26.1.2 2026-07-31T15:01:55.6124407 Advancements +// 26.1.2 2026-08-07T12:53:18.281871 Advancements b7e74f406f93be9e4d12380a7b89777a4256c151 data/minecraft/advancement/oritech/ai.json cb7678be902015d4395ab3a4580c0136e30329e4 data/minecraft/advancement/oritech/assembler.json dadc19aea4506321a8516adac6a9a3fa2b931861 data/minecraft/advancement/oritech/atomicforge.json diff --git a/src/generated/resources/.cache/ef8b6ed5b9206f7d8b5d358995c27bf6f25f14c3 b/src/generated/resources/.cache/ef8b6ed5b9206f7d8b5d358995c27bf6f25f14c3 index d562c06ccb..af53c09d9c 100644 --- a/src/generated/resources/.cache/ef8b6ed5b9206f7d8b5d358995c27bf6f25f14c3 +++ b/src/generated/resources/.cache/ef8b6ed5b9206f7d8b5d358995c27bf6f25f14c3 @@ -1,4 +1,4 @@ -// 26.1.2 2026-07-29T20:13:14.9626335 oritech geckolib item models +// 26.1.2 2026-08-07T12:53:18.280871 oritech geckolib item models 1fbb92f099976f8fafdd8d869107fc1305de387f assets/oritech/items/addon_splicer.json dab1edc22bb5e8b6a6eae17134b4369e75011a7e assets/oritech/items/arcane_catalyst.json 5d755d63dc77c10d9ecb799f1fb697b77a2fea3f assets/oritech/items/assembler.json diff --git a/src/generated/resources/assets/oritech/items/dubios_container.json b/src/generated/resources/assets/oritech/items/dubious_container.json similarity index 52% rename from src/generated/resources/assets/oritech/items/dubios_container.json rename to src/generated/resources/assets/oritech/items/dubious_container.json index aea6738026..1c8278ce4f 100644 --- a/src/generated/resources/assets/oritech/items/dubios_container.json +++ b/src/generated/resources/assets/oritech/items/dubious_container.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "oritech:item/dubios_container" + "model": "oritech:item/dubious_container" } } \ No newline at end of file diff --git a/src/generated/resources/assets/oritech/models/item/dubios_container.json b/src/generated/resources/assets/oritech/models/item/dubious_container.json similarity index 57% rename from src/generated/resources/assets/oritech/models/item/dubios_container.json rename to src/generated/resources/assets/oritech/models/item/dubious_container.json index 1b829707c6..730f83315a 100644 --- a/src/generated/resources/assets/oritech/models/item/dubios_container.json +++ b/src/generated/resources/assets/oritech/models/item/dubious_container.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oritech:item/dubios_container" + "layer0": "oritech:item/dubious_container" } } \ No newline at end of file diff --git a/src/generated/resources/data/oritech/advancement/recipes/misc/crafting/equipmentCharger.json b/src/generated/resources/data/oritech/advancement/recipes/misc/crafting/equipmentCharger.json index f3deca87b6..a28ea5e21e 100644 --- a/src/generated/resources/data/oritech/advancement/recipes/misc/crafting/equipmentCharger.json +++ b/src/generated/resources/data/oritech/advancement/recipes/misc/crafting/equipmentCharger.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "oritech:crafting/equipmentCharger" + "recipe": "oritech:crafting/equipmentcharger" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "oritech:crafting/equipmentCharger" + "oritech:crafting/equipmentcharger" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/oritech/advancement/recipes/misc/crafting/equipmentChargeralt.json b/src/generated/resources/data/oritech/advancement/recipes/misc/crafting/equipmentChargeralt.json index 8a1a7be87b..e3f0be1260 100644 --- a/src/generated/resources/data/oritech/advancement/recipes/misc/crafting/equipmentChargeralt.json +++ b/src/generated/resources/data/oritech/advancement/recipes/misc/crafting/equipmentChargeralt.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "oritech:crafting/equipmentChargeralt" + "recipe": "oritech:crafting/equipmentchargeralt" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "oritech:crafting/equipmentChargeralt" + "oritech:crafting/equipmentchargeralt" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/oritech/advancement/recipes/misc/dubios_container.json b/src/generated/resources/data/oritech/advancement/recipes/misc/dubious_container.json similarity index 68% rename from src/generated/resources/data/oritech/advancement/recipes/misc/dubios_container.json rename to src/generated/resources/data/oritech/advancement/recipes/misc/dubious_container.json index d1923bfe69..ef9db1d433 100644 --- a/src/generated/resources/data/oritech/advancement/recipes/misc/dubios_container.json +++ b/src/generated/resources/data/oritech/advancement/recipes/misc/dubious_container.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dubios_container": { + "has_dubious_container": { "conditions": { "items": [ { - "items": "oritech:dubios_container" + "items": "oritech:dubious_container" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "oritech:dubios_container" + "recipe": "oritech:dubious_container" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_dubios_container" + "has_dubious_container" ] ], "rewards": { "recipes": [ - "oritech:dubios_container" + "oritech:dubious_container" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/oritech/recipe/addon_splicer.json b/src/generated/resources/data/oritech/recipe/addon_splicer.json index 0c27194267..c6b6307ef1 100644 --- a/src/generated/resources/data/oritech/recipe/addon_splicer.json +++ b/src/generated/resources/data/oritech/recipe/addon_splicer.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "c": "oritech:still_strange_matter_bucket", - "p": "oritech:dubios_container", + "p": "oritech:dubious_container", "s": "oritech:superconductor" }, "pattern": [ diff --git a/src/generated/resources/data/oritech/recipe/assembler/superconductor.json b/src/generated/resources/data/oritech/recipe/assembler/superconductor.json index 5ea3cdca08..e72da9eff3 100644 --- a/src/generated/resources/data/oritech/recipe/assembler/superconductor.json +++ b/src/generated/resources/data/oritech/recipe/assembler/superconductor.json @@ -3,7 +3,7 @@ "itemInputs": [ "oritech:flux_gate", "#c:ingots/electrum", - "oritech:dubios_container", + "oritech:dubious_container", "oritech:energite_ingot" ], "itemResults": [ diff --git a/src/generated/resources/data/oritech/recipe/centrifuge/fluid/advbatteryacid.json b/src/generated/resources/data/oritech/recipe/centrifuge/fluid/advbatteryacid.json index 56c901c1eb..9d942cb493 100644 --- a/src/generated/resources/data/oritech/recipe/centrifuge/fluid/advbatteryacid.json +++ b/src/generated/resources/data/oritech/recipe/centrifuge/fluid/advbatteryacid.json @@ -5,7 +5,7 @@ "ingredient": "#c:sulfuric_acid" }, "itemInputs": [ - "oritech:dubios_container" + "oritech:dubious_container" ], "itemResults": [ { diff --git a/src/generated/resources/data/oritech/recipe/centrifuge/fluid/unholyai.json b/src/generated/resources/data/oritech/recipe/centrifuge/fluid/unholyai.json index c4b98f7057..0dc8012429 100644 --- a/src/generated/resources/data/oritech/recipe/centrifuge/fluid/unholyai.json +++ b/src/generated/resources/data/oritech/recipe/centrifuge/fluid/unholyai.json @@ -5,7 +5,7 @@ "ingredient": "oritech:still_strange_matter" }, "itemInputs": [ - "oritech:dubios_container" + "oritech:dubious_container" ], "itemResults": [ { diff --git a/src/generated/resources/data/oritech/recipe/crafting/augment/applicator.json b/src/generated/resources/data/oritech/recipe/crafting/augment/applicator.json index 6b83a2ce94..7ab84c0100 100644 --- a/src/generated/resources/data/oritech/recipe/crafting/augment/applicator.json +++ b/src/generated/resources/data/oritech/recipe/crafting/augment/applicator.json @@ -4,7 +4,7 @@ "key": { "b": "#oritech:plating", "c": "minecraft:chest", - "f": "oritech:dubios_container", + "f": "oritech:dubious_container", "m": "oritech:motor", "s": "#c:carbon_fibre" }, diff --git a/src/generated/resources/data/oritech/recipe/crafting/bigstorage.json b/src/generated/resources/data/oritech/recipe/crafting/bigstorage.json index be575388a9..3a447fc403 100644 --- a/src/generated/resources/data/oritech/recipe/crafting/bigstorage.json +++ b/src/generated/resources/data/oritech/recipe/crafting/bigstorage.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "b": "oritech:advanced_battery", - "c": "oritech:dubios_container", + "c": "oritech:dubious_container", "f": "oritech:magnetic_coil", "m": "#c:ingots/steel", "s": "oritech:flux_gate" diff --git a/src/generated/resources/data/oritech/recipe/crafting/core6.json b/src/generated/resources/data/oritech/recipe/crafting/core6.json index ebd4c1acfe..043472b58d 100644 --- a/src/generated/resources/data/oritech/recipe/crafting/core6.json +++ b/src/generated/resources/data/oritech/recipe/crafting/core6.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "c": "oritech:dubios_container", + "c": "oritech:dubious_container", "s": "oritech:duratium_ingot" }, "pattern": [ diff --git a/src/generated/resources/data/oritech/recipe/dubios_container.json b/src/generated/resources/data/oritech/recipe/dubious_container.json similarity index 86% rename from src/generated/resources/data/oritech/recipe/dubios_container.json rename to src/generated/resources/data/oritech/recipe/dubious_container.json index d064bf5f05..390b0d6db6 100644 --- a/src/generated/resources/data/oritech/recipe/dubios_container.json +++ b/src/generated/resources/data/oritech/recipe/dubious_container.json @@ -12,6 +12,6 @@ "wcw" ], "result": { - "id": "oritech:dubios_container" + "id": "oritech:dubious_container" } } \ No newline at end of file diff --git a/src/generated/resources/data/oritech/recipe/low_yield_nuclear_explosion_device.json b/src/generated/resources/data/oritech/recipe/low_yield_nuclear_explosion_device.json index 13cf8e5cb9..3791d11ad5 100644 --- a/src/generated/resources/data/oritech/recipe/low_yield_nuclear_explosion_device.json +++ b/src/generated/resources/data/oritech/recipe/low_yield_nuclear_explosion_device.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "redstone", "key": { - "a": "oritech:dubios_container", + "a": "oritech:dubious_container", "c": "minecraft:tnt", "e": "oritech:uranium_pellet" }, diff --git a/src/main/java/rearth/oritech/datagen/RecipeGenerator.java b/src/main/java/rearth/oritech/datagen/RecipeGenerator.java index 61256232f7..2cd0165ad2 100644 --- a/src/main/java/rearth/oritech/datagen/RecipeGenerator.java +++ b/src/main/java/rearth/oritech/datagen/RecipeGenerator.java @@ -288,7 +288,7 @@ private void addFluidProcessing(RecipeOutput exporter) { // adv battery in centrifuge with sulfuric acid new CentrifugeFluidRecipeBuilder(this.registries) - .input(ItemContent.DUBIOS_CONTAINER) + .input(ItemContent.DUBIOUS_CONTAINER) .fluidInput(TagContent.SULFURIC_ACID) .result(ItemContent.ADVANCED_BATTERY, 8) .timeMultiplier(2f) @@ -328,7 +328,7 @@ private void addFluidProcessing(RecipeOutput exporter) { // dubious container and strange matter in centrifuge new CentrifugeFluidRecipeBuilder(this.registries) - .input(ItemContent.DUBIOS_CONTAINER) + .input(ItemContent.DUBIOUS_CONTAINER) .fluidInput(FluidContent.STILL_STRANGE_MATTER.get()) .result(ItemContent.UNHOLY_INTELLIGENCE, 1) .timeMultiplier(8f) @@ -473,13 +473,13 @@ private void addMachines(RecipeOutput exporter) { offerGeneratorRecipe(exporter, BlockContent.BIG_SOLAR_PANEL.asItem(), of(BlockContent.BASIC_GENERATOR.asItem()), of(ItemContent.FLUX_GATE), of(ItemContent.ADVANCED_BATTERY), of(ItemContent.FLUXITE), "solar"); // equipmentCharger - offerAtomicForgeRecipe(exporter, BlockContent.EQUIPMENT_CHARGER.asItem(), of(cItemTag("chests/wooden")), of(BlockContent.ENERGY_PIPE), of(cItemTag("storage_blocks/redstone")), of(Items.DISPENSER), of(TagContent.STEEL_INGOTS), "equipmentCharger"); - offerAtomicForgeRecipe(exporter, BlockContent.EQUIPMENT_CHARGER.asItem(), of(cItemTag("chests/wooden")), of(BlockContent.ENERGY_PIPE), of(ItemContent.PROCESSING_UNIT), of(Items.DISPENSER), of(TagContent.STEEL_INGOTS), "equipmentChargeralt"); + offerAtomicForgeRecipe(exporter, BlockContent.EQUIPMENT_CHARGER.asItem(), of(cItemTag("chests/wooden")), of(BlockContent.ENERGY_PIPE), of(cItemTag("storage_blocks/redstone")), of(Items.DISPENSER), of(TagContent.STEEL_INGOTS), "equipmentcharger"); + offerAtomicForgeRecipe(exporter, BlockContent.EQUIPMENT_CHARGER.asItem(), of(cItemTag("chests/wooden")), of(BlockContent.ENERGY_PIPE), of(ItemContent.PROCESSING_UNIT), of(Items.DISPENSER), of(TagContent.STEEL_INGOTS), "equipmentchargeralt"); // small storage offerAtomicForgeRecipe(exporter, BlockContent.PORTABLE_ENERGY_STORAGE.asItem(), of(ItemContent.BASIC_BATTERY), of(TagContent.SILICON), of(ItemContent.MAGNETIC_COIL), of(TagContent.NICKEL_INGOTS), of(TagContent.NICKEL_INGOTS), "smallstorage"); // large storage - offerAtomicForgeRecipe(exporter, BlockContent.LARGE_STORAGE.asItem(), of(ItemContent.ADVANCED_BATTERY), of(TagContent.STEEL_INGOTS), of(ItemContent.DUBIOS_CONTAINER), of(ItemContent.FLUX_GATE), of(ItemContent.MAGNETIC_COIL), "bigstorage"); + offerAtomicForgeRecipe(exporter, BlockContent.LARGE_STORAGE.asItem(), of(ItemContent.ADVANCED_BATTERY), of(TagContent.STEEL_INGOTS), of(ItemContent.DUBIOUS_CONTAINER), of(ItemContent.FLUX_GATE), of(ItemContent.MAGNETIC_COIL), "bigstorage"); // unstable container offerAtomicForgeRecipe(exporter, ItemContent.SCHRODINGERS_SAFE.asItem(), of(ItemContent.FLUXITE), of(ItemContent.DURATIUM_INGOT), of(BlockContent.LARGE_STORAGE), of(ItemContent.FLUX_GATE), of(ItemContent.SUPER_AI_CHIP), "unstablecontainer"); @@ -571,7 +571,7 @@ private void addMachines(RecipeOutput exporter) { offerEnergyTransmissionPoleRecipe(exporter, BlockContent.ENERGY_TRANSMISSION_POLE.asItem(), of(ItemContent.MAGNETIC_COIL), of(TagContent.ELECTRUM_INGOTS), of(BlockContent.PORTABLE_ENERGY_STORAGE), of(ItemContent.CARBON_FIBRE_STRANDS), "_pole"); // addon_splicer - offerTankRecipe(exporter, BlockContent.ADDON_SPLICER.asItem(), of(ItemContent.DUBIOS_CONTAINER), of(FluidContent.STILL_STRANGE_MATTER_BUCKET.get()), of(BlockContent.SUPERCONDUCTOR), "addon_splicer"); + offerTankRecipe(exporter, BlockContent.ADDON_SPLICER.asItem(), of(ItemContent.DUBIOUS_CONTAINER), of(FluidContent.STILL_STRANGE_MATTER_BUCKET.get()), of(BlockContent.SUPERCONDUCTOR), "addon_splicer"); // particle accelerator // motor @@ -614,7 +614,7 @@ private void addMachines(RecipeOutput exporter) { offerMachineCoreRecipe(exporter, BlockContent.MACHINE_CORE_3.asItem(), of(TagContent.NICKEL_INGOTS), of(cItemTag("dusts/redstone")), "core3alt"); offerMachineCoreRecipe(exporter, BlockContent.MACHINE_CORE_4.asItem(), of(TagContent.PLATING_BLOCKS), of(ItemContent.ENDERIC_COMPOUND), "core4"); offerMachineCoreRecipe(exporter, BlockContent.MACHINE_CORE_5.asItem(), of(ItemContent.ADAMANT_INGOT), of(ItemContent.ADVANCED_COMPUTING_ENGINE), "core5"); - offerMachineCoreRecipe(exporter, BlockContent.MACHINE_CORE_6.asItem(), of(ItemContent.DURATIUM_INGOT), of(ItemContent.DUBIOS_CONTAINER), "core6"); + offerMachineCoreRecipe(exporter, BlockContent.MACHINE_CORE_6.asItem(), of(ItemContent.DURATIUM_INGOT), of(ItemContent.DUBIOUS_CONTAINER), "core6"); offerMachineCoreRecipe(exporter, BlockContent.MACHINE_CORE_7.asItem(), of(ItemContent.PROMETHEUM_INGOT), of(BlockContent.SUPERCONDUCTOR.asItem()), "core7"); // machine extender @@ -622,7 +622,7 @@ private void addMachines(RecipeOutput exporter) { // augmenter // machine itself - offerAtomicForgeRecipe(exporter, BlockContent.CYBERNETIC_AUGMENTATION_CENTER.asItem(), of(TagContent.PLATING_BLOCKS), of(ItemContent.MOTOR), of(Items.CHEST), of(TagContent.CARBON_FIBRE), of(ItemContent.DUBIOS_CONTAINER), "augment/applicator"); + offerAtomicForgeRecipe(exporter, BlockContent.CYBERNETIC_AUGMENTATION_CENTER.asItem(), of(TagContent.PLATING_BLOCKS), of(ItemContent.MOTOR), of(Items.CHEST), of(TagContent.CARBON_FIBRE), of(ItemContent.DUBIOUS_CONTAINER), "augment/applicator"); // basic station offerGeneratorRecipe(exporter, BlockContent.CYBERNETIC_RESEARCH_STATION.asItem(), of(Items.BREWING_STAND), of(TagContent.PLATING_BLOCKS), of(cItemTag("storage_blocks/redstone")), of(TagContent.ELECTRUM_INGOTS), "augment/basic"); // adv station @@ -702,8 +702,8 @@ private void addComponents(RecipeOutput exporter) { new AtomicForgeRecipeBuilder(this.registries).input(ItemContent.PROCESSING_UNIT).input(ItemContent.SILICON_WAFER).input(ItemContent.SILICON_WAFER).result(ItemContent.ADVANCED_COMPUTING_ENGINE).time(5).export(exporter, "advcomputer"); new AtomicForgeRecipeBuilder(this.registries).input(ItemContent.DURATIUM_INGOT).input(ItemContent.ADVANCED_COMPUTING_ENGINE).input(ItemContent.ADVANCED_COMPUTING_ENGINE).result(ItemContent.SUPER_AI_CHIP).time(50).export(exporter, "aicomputer"); - // dubios container - offerMotorRecipe(exporter, ItemContent.DUBIOS_CONTAINER.get(), of(TagContent.PLASTIC_PLATES), of(ItemContent.ADAMANT_INGOT), of(ItemContent.ENDERIC_COMPOUND), "dubios"); + // dubious container + offerMotorRecipe(exporter, ItemContent.DUBIOUS_CONTAINER.get(), of(TagContent.PLASTIC_PLATES), of(ItemContent.ADAMANT_INGOT), of(ItemContent.ENDERIC_COMPOUND), "dubious"); // adv battery offerMotorRecipe(exporter, ItemContent.ADVANCED_BATTERY.get(), of(TagContent.ELECTRUM_INGOTS), of(ItemContent.ENERGITE_INGOT), of(TagContent.STEEL_INGOTS), "advbattery"); @@ -717,7 +717,7 @@ private void addComponents(RecipeOutput exporter) { new AtomicForgeRecipeBuilder(this.registries).input(ItemContent.SUPER_AI_CHIP).input(ItemContent.ADAMANT_INGOT).input(ItemContent.ADAMANT_INGOT).result(ItemContent.HEISENBERG_COMPENSATOR).time(60).export(exporter, "compensator"); new AtomicForgeRecipeBuilder(this.registries).input(ItemContent.UNHOLY_INTELLIGENCE).input(ItemContent.ADAMANT_INGOT).input(ItemContent.ADAMANT_INGOT).result(ItemContent.HEISENBERG_COMPENSATOR).time(60).export(exporter, "compensatoralt"); offerMotorRecipe(exporter, ItemContent.OVERCHARGED_CRYSTAL.get(), of(Items.AMETHYST_BLOCK), of(ItemContent.ADVANCED_BATTERY), of(BlockContent.SUPERCONDUCTOR.asItem()), "overchargedcrystal"); - new AssemblerRecipeBuilder(this.registries).input(ItemContent.FLUX_GATE).input(TagContent.ELECTRUM_INGOTS).input(ItemContent.DUBIOS_CONTAINER).input(ItemContent.ENERGITE_INGOT).result(BlockContent.SUPERCONDUCTOR.asItem(), 4).timeMultiplier(1.6f).export(exporter, "superconductor"); + new AssemblerRecipeBuilder(this.registries).input(ItemContent.FLUX_GATE).input(TagContent.ELECTRUM_INGOTS).input(ItemContent.DUBIOUS_CONTAINER).input(ItemContent.ENERGITE_INGOT).result(BlockContent.SUPERCONDUCTOR.asItem(), 4).timeMultiplier(1.6f).export(exporter, "superconductor"); new AtomicForgeRecipeBuilder(this.registries).input(ItemContent.HEISENBERG_COMPENSATOR).input(ItemContent.OVERCHARGED_CRYSTAL).input(ItemContent.OVERCHARGED_CRYSTAL).result(ItemContent.PROMETHEUM_INGOT).time(240).export(exporter, "prometheum"); // ice in industrial_chiller @@ -1050,7 +1050,7 @@ private void addReactorBlocks(RecipeOutput exporter) { offerStarRecipe(exporter, BlockContent.REACTOR_HEAT_PIPE.asItem(), of(TagContent.ELECTRUM_INGOTS), of(cItemTag("ingots/gold")), "reactorheatpipe"); // explosives - offerCopperReinforcedPlatingRecipe(exporter, BlockContent.LOW_YIELD_NUCLEAR_EXPLOSION_DEVICE.asItem(), of(ItemContent.DUBIOS_CONTAINER), of(ItemContent.URANIUM_PELLET), of(Items.TNT), 1, "manhattan_module"); + offerCopperReinforcedPlatingRecipe(exporter, BlockContent.LOW_YIELD_NUCLEAR_EXPLOSION_DEVICE.asItem(), of(ItemContent.DUBIOUS_CONTAINER), of(ItemContent.URANIUM_PELLET), of(Items.TNT), 1, "manhattan_module"); offerCopperReinforcedPlatingRecipe(exporter, BlockContent.MANHATTAN_MODULE.asItem(), of(ItemContent.HEISENBERG_COMPENSATOR), of(ItemContent.PLUTONIUM_PELLET), of(Items.TNT), 1, "manhattan_modulebetter"); } diff --git a/src/main/java/rearth/oritech/init/ItemContent.java b/src/main/java/rearth/oritech/init/ItemContent.java index 0df0772f95..de0b9dd168 100644 --- a/src/main/java/rearth/oritech/init/ItemContent.java +++ b/src/main/java/rearth/oritech/init/ItemContent.java @@ -109,7 +109,7 @@ public class ItemContent { public static final DeferredItem ION_THRUSTER = ITEMS.registerSimpleItem("ion_thruster"); public static final DeferredItem ADVANCED_COMPUTING_ENGINE = ITEMS.registerSimpleItem("advanced_computing_engine"); public static final DeferredItem SILICON_WAFER = ITEMS.registerSimpleItem("silicon_wafer"); - public static final DeferredItem DUBIOS_CONTAINER = ITEMS.registerItem("dubios_container", props -> new MobCaptureItem(props.stacksTo(16), List.of(EntityType.VEX, EntityType.ALLAY, EntityType.PHANTOM))); + public static final DeferredItem DUBIOUS_CONTAINER = ITEMS.registerItem("dubious_container", props -> new MobCaptureItem(props.stacksTo(16), List.of(EntityType.VEX, EntityType.ALLAY, EntityType.PHANTOM))); public static final DeferredItem ENDERIC_LENS = ITEMS.registerSimpleItem("enderic_lens"); public static final DeferredItem FLUX_GATE = ITEMS.registerSimpleItem("flux_gate"); public static final DeferredItem ADVANCED_BATTERY = ITEMS.registerSimpleItem("advanced_battery"); diff --git a/src/main/resources/assets/emi/recipe/defaults/oritech.json b/src/main/resources/assets/emi/recipe/defaults/oritech.json index 229aba512f..1af8d55e73 100644 --- a/src/main/resources/assets/emi/recipe/defaults/oritech.json +++ b/src/main/resources/assets/emi/recipe/defaults/oritech.json @@ -96,7 +96,7 @@ "oritech:crafting/transparentitem", "oritech:crafting/basicgen", "oritech:crafting/energy", - "oritech:motor/dubios", + "oritech:motor/dubious", "oritech:crafting/itemfilter", "oritech:crafting/manhattan_module", "oritech:crafting/particlecollector", diff --git a/src/main/resources/assets/oritech/lang/de_de.json b/src/main/resources/assets/oritech/lang/de_de.json index 22c63c8ce4..748b0c4b71 100644 --- a/src/main/resources/assets/oritech/lang/de_de.json +++ b/src/main/resources/assets/oritech/lang/de_de.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "Verarbeitungseinheit", "item.oritech.advanced_computing_engine": "Fortgeschrittene Recheneinheit", "item.oritech.silicon_wafer": "Silicon Wafer", - "item.oritech.dubios_container": "Dubioser Behälter", + "item.oritech.dubious_container": "Dubioser Behälter", "item.oritech.enderic_lens": "Enderische Linse", "item.oritech.flux_gate": "Flux Gate", "item.oritech.advanced_battery": "Fortgeschrittene Batterie", diff --git a/src/main/resources/assets/oritech/lang/en_us.json b/src/main/resources/assets/oritech/lang/en_us.json index 73b60430fb..20cbcb0b1a 100644 --- a/src/main/resources/assets/oritech/lang/en_us.json +++ b/src/main/resources/assets/oritech/lang/en_us.json @@ -873,7 +873,7 @@ "item.oritech.processing_unit": "Processing Unit", "item.oritech.advanced_computing_engine": "Advanced Computing Engine", "item.oritech.silicon_wafer": "Silicon Wafer", - "item.oritech.dubios_container": "Dubious Container", + "item.oritech.dubious_container": "Dubious Container", "item.oritech.enderic_lens": "Enderic Lens", "item.oritech.flux_gate": "Flux Gate", "item.oritech.advanced_battery": "Advanced Battery", diff --git a/src/main/resources/assets/oritech/lang/es_es.json b/src/main/resources/assets/oritech/lang/es_es.json index ed2acf7622..8cf711a114 100644 --- a/src/main/resources/assets/oritech/lang/es_es.json +++ b/src/main/resources/assets/oritech/lang/es_es.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "Unidad de procesamiento", "item.oritech.advanced_computing_engine": "Motor de computación avanzada", "item.oritech.silicon_wafer": "Oblea de silicio", - "item.oritech.dubios_container": "Contenedor dudoso", + "item.oritech.dubious_container": "Contenedor dudoso", "item.oritech.enderic_lens": "Lente endérica", "item.oritech.flux_gate": "Puerta de flujo", "item.oritech.advanced_battery": "Batería avanzada", diff --git a/src/main/resources/assets/oritech/lang/fr_ca.json b/src/main/resources/assets/oritech/lang/fr_ca.json index 29cf771f8d..0daa714479 100644 --- a/src/main/resources/assets/oritech/lang/fr_ca.json +++ b/src/main/resources/assets/oritech/lang/fr_ca.json @@ -124,7 +124,7 @@ "color": "gray" }, { - "translate": "item.oritech.dubios_container", + "translate": "item.oritech.dubious_container", "italic": true, "color": "gray" } @@ -484,7 +484,7 @@ "item.oritech.processing_unit": "Unité de traitement", "item.oritech.advanced_computing_engine": "Moteur de calcul avancé", "item.oritech.silicon_wafer": "Plaquette de silicone", - "item.oritech.dubios_container": "Conteneur douteux", + "item.oritech.dubious_container": "Conteneur douteux", "item.oritech.enderic_lens": "Lentille Enderique", "item.oritech.flux_gate": "Contrôleur de flux", "item.oritech.advanced_battery": "Batterie avancée", diff --git a/src/main/resources/assets/oritech/lang/fr_fr.json b/src/main/resources/assets/oritech/lang/fr_fr.json index 69ef981848..6d6476ef08 100644 --- a/src/main/resources/assets/oritech/lang/fr_fr.json +++ b/src/main/resources/assets/oritech/lang/fr_fr.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "Unité de traitement", "item.oritech.advanced_computing_engine": "Moteur de calcul avancé", "item.oritech.silicon_wafer": "Plaquette de silicone", - "item.oritech.dubios_container": "Conteneur douteux", + "item.oritech.dubious_container": "Conteneur douteux", "item.oritech.enderic_lens": "Lentille Enderique", "item.oritech.flux_gate": "Contrôleur de flux", "item.oritech.advanced_battery": "Batterie avancée", diff --git a/src/main/resources/assets/oritech/lang/it_it.json b/src/main/resources/assets/oritech/lang/it_it.json index 594c62e7f4..9458433c27 100644 --- a/src/main/resources/assets/oritech/lang/it_it.json +++ b/src/main/resources/assets/oritech/lang/it_it.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "Unità Di Elaborazione", "item.oritech.advanced_computing_engine": "Motore Di Calcolo Avanzato", "item.oritech.silicon_wafer": "Wafer Di Silicio", - "item.oritech.dubios_container": "Contenitore Sospetto", + "item.oritech.dubious_container": "Contenitore Sospetto", "item.oritech.enderic_lens": "Lente Enderica", "item.oritech.flux_gate": "Cancello Di Flux", "item.oritech.advanced_battery": "Batteria Avanzata", diff --git a/src/main/resources/assets/oritech/lang/ja_jp.json b/src/main/resources/assets/oritech/lang/ja_jp.json index 7322753127..bed82b4115 100644 --- a/src/main/resources/assets/oritech/lang/ja_jp.json +++ b/src/main/resources/assets/oritech/lang/ja_jp.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "処理基盤", "item.oritech.advanced_computing_engine": "高度な計算機関", "item.oritech.silicon_wafer": "シリコンウェハー", - "item.oritech.dubios_container": "怪しげな容器", + "item.oritech.dubious_container": "怪しげな容器", "item.oritech.enderic_lens": "エンダリックレンズ", "item.oritech.flux_gate": "フラックスゲート", "item.oritech.advanced_battery": "高度なバッテリー", diff --git a/src/main/resources/assets/oritech/lang/pl_pl.json b/src/main/resources/assets/oritech/lang/pl_pl.json index ad6c2f529d..860a85b4ba 100644 --- a/src/main/resources/assets/oritech/lang/pl_pl.json +++ b/src/main/resources/assets/oritech/lang/pl_pl.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "Jednostka Przetwarzająca", "item.oritech.advanced_computing_engine": "Zaawansowany Silnik Obliczeniowy", "item.oritech.silicon_wafer": "Krzemowy Wafer", - "item.oritech.dubios_container": "Wątpliwy Pojemnik", + "item.oritech.dubious_container": "Wątpliwy Pojemnik", "item.oritech.enderic_lens": "Soczewka Enderyczna", "item.oritech.flux_gate": "Bramka Fluxowa", "item.oritech.advanced_battery": "Zaawansowana Bateria", diff --git a/src/main/resources/assets/oritech/lang/pt_br.json b/src/main/resources/assets/oritech/lang/pt_br.json index 2c66ac9878..095c2cb42d 100644 --- a/src/main/resources/assets/oritech/lang/pt_br.json +++ b/src/main/resources/assets/oritech/lang/pt_br.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "Unidade de Processamento", "item.oritech.advanced_computing_engine": "Motor de Computação Avançada", "item.oritech.silicon_wafer": "Wafer de Silício", - "item.oritech.dubios_container": "Recipiente Suspeito", + "item.oritech.dubious_container": "Recipiente Suspeito", "item.oritech.enderic_lens": "Lente Endérica", "item.oritech.flux_gate": "Portão de Fluxo", "item.oritech.advanced_battery": "Bateria Avançada", diff --git a/src/main/resources/assets/oritech/lang/pt_pt.json b/src/main/resources/assets/oritech/lang/pt_pt.json index ff076c2d86..1cbee4e323 100644 --- a/src/main/resources/assets/oritech/lang/pt_pt.json +++ b/src/main/resources/assets/oritech/lang/pt_pt.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "Unidade de Processamento", "item.oritech.advanced_computing_engine": "Motor de Computação Avançada", "item.oritech.silicon_wafer": "Wafer de Silício", - "item.oritech.dubios_container": "Recipiente Duvidoso", + "item.oritech.dubious_container": "Recipiente Duvidoso", "item.oritech.enderic_lens": "Lente Endérica", "item.oritech.flux_gate": "Portão de Fluxo", "item.oritech.advanced_battery": "Bateria Avançada", diff --git a/src/main/resources/assets/oritech/lang/ru_ru.json b/src/main/resources/assets/oritech/lang/ru_ru.json index 2912a9d03a..6d5ba4b133 100644 --- a/src/main/resources/assets/oritech/lang/ru_ru.json +++ b/src/main/resources/assets/oritech/lang/ru_ru.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "Процессор", "item.oritech.advanced_computing_engine": "Расширенный вычислительный движок", "item.oritech.silicon_wafer": "Полупроводниковая пластина", - "item.oritech.dubios_container": "Сомнительный контейнер", + "item.oritech.dubious_container": "Сомнительный контейнер", "item.oritech.enderic_lens": "Эндерническая линза", "item.oritech.flux_gate": "Флюсовые ворота", "item.oritech.advanced_battery": "Продвинутая Батарея", diff --git a/src/main/resources/assets/oritech/lang/tr_tr.json b/src/main/resources/assets/oritech/lang/tr_tr.json index f6d002c741..a103a1b270 100644 --- a/src/main/resources/assets/oritech/lang/tr_tr.json +++ b/src/main/resources/assets/oritech/lang/tr_tr.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "İşleme Birimi", "item.oritech.advanced_computing_engine": "Gelişmiş Bilgi İşlem Motoru", "item.oritech.silicon_wafer": "Silikon Wafer", - "item.oritech.dubios_container": "Şüpheli Konteyner", + "item.oritech.dubious_container": "Şüpheli Konteyner", "item.oritech.enderic_lens": "Enderik Lens", "item.oritech.flux_gate": "Akı Kapısı", "item.oritech.advanced_battery": "Gelişmiş Batarya", diff --git a/src/main/resources/assets/oritech/lang/uk_ua.json b/src/main/resources/assets/oritech/lang/uk_ua.json index 7551c483e2..6e3e6f7635 100644 --- a/src/main/resources/assets/oritech/lang/uk_ua.json +++ b/src/main/resources/assets/oritech/lang/uk_ua.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "Процесорний блок", "item.oritech.advanced_computing_engine": "Передовий обчислювальний двигун", "item.oritech.silicon_wafer": "Кремнієва пластина", - "item.oritech.dubios_container": "Сумнівний контейнер", + "item.oritech.dubious_container": "Сумнівний контейнер", "item.oritech.enderic_lens": "Ендерна лінза", "item.oritech.flux_gate": "Потокова брама", "item.oritech.advanced_battery": "Просунута батарея", diff --git a/src/main/resources/assets/oritech/lang/zh_TW.json b/src/main/resources/assets/oritech/lang/zh_TW.json index c4d77918d5..94081ac3fc 100644 --- a/src/main/resources/assets/oritech/lang/zh_TW.json +++ b/src/main/resources/assets/oritech/lang/zh_TW.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "運算核心", "item.oritech.advanced_computing_engine": "高階運算核心", "item.oritech.silicon_wafer": "矽片", - "item.oritech.dubios_container": "異源容器", + "item.oritech.dubious_container": "異源容器", "item.oritech.enderic_lens": "終界透鏡", "item.oritech.flux_gate": "能量閘門", "item.oritech.advanced_battery": "高階電池", diff --git a/src/main/resources/assets/oritech/lang/zh_cn.json b/src/main/resources/assets/oritech/lang/zh_cn.json index 0ec4cd3f08..7ad0e184d9 100644 --- a/src/main/resources/assets/oritech/lang/zh_cn.json +++ b/src/main/resources/assets/oritech/lang/zh_cn.json @@ -862,7 +862,7 @@ "item.oritech.processing_unit": "处理器", "item.oritech.advanced_computing_engine": "高级计算引擎", "item.oritech.silicon_wafer": "硅晶圆", - "item.oritech.dubios_container": "可疑的容器", + "item.oritech.dubious_container": "可疑的容器", "item.oritech.enderic_lens": "末影透镜", "item.oritech.flux_gate": "磁通门", "item.oritech.advanced_battery": "高级电池", diff --git a/src/main/resources/assets/oritech/textures/item/dubios_container.png b/src/main/resources/assets/oritech/textures/item/dubious_container.png similarity index 100% rename from src/main/resources/assets/oritech/textures/item/dubios_container.png rename to src/main/resources/assets/oritech/textures/item/dubious_container.png diff --git a/src/main/resources/assets/oritech/textures/item/dubios_container.png.mcmeta b/src/main/resources/assets/oritech/textures/item/dubious_container.png.mcmeta similarity index 100% rename from src/main/resources/assets/oritech/textures/item/dubios_container.png.mcmeta rename to src/main/resources/assets/oritech/textures/item/dubious_container.png.mcmeta diff --git a/wiki/assets/oritech/item/dubios_container.png b/wiki/assets/oritech/item/dubious_container.png similarity index 100% rename from wiki/assets/oritech/item/dubios_container.png rename to wiki/assets/oritech/item/dubious_container.png diff --git a/wiki/content/components/_meta.json b/wiki/content/components/_meta.json index 8ae44e4043..5b415a7c8f 100644 --- a/wiki/content/components/_meta.json +++ b/wiki/content/components/_meta.json @@ -5,7 +5,7 @@ "basic_battery.mdx": "Basic Battery", "carbon_fibre_strands.mdx": "Carbon Fibre Strands", "clay_catalyst_beads.mdx": "Clay Catalyst Beads", - "dubios_container.mdx": "Dubios Container", + "dubious_container.mdx": "Dubious Container", "enderic_compound.mdx": "Enderic Compound", "enderic_lens.mdx": "Enderic Lens", "flux_gate.mdx": "Flux Gate", diff --git a/wiki/content/components/advanced_battery.mdx b/wiki/content/components/advanced_battery.mdx index a142f1b9d1..45f6c7ea1c 100644 --- a/wiki/content/components/advanced_battery.mdx +++ b/wiki/content/components/advanced_battery.mdx @@ -17,8 +17,8 @@ A larger energy storage component used in advanced machines and equipment. count={1} /> -- **Centrifuge**: Can be mass-produced by processing [Dubios Containers](@oritech:dubios_container) with [Sulfuric Acid](@oritech:fluid_sulfuric_acid). +- **Centrifuge**: Can be mass-produced by processing [Dubious Containers](@oritech:dubious_container) with [Sulfuric Acid](@oritech:fluid_sulfuric_acid). **Usage** - They are used in equipment such as the [Electric Mace](@oritech:electric_mace), [Portable Laser](@oritech:portable_laser), jet-assisted armor and flight equipment, and in storage or power blocks such as the [Large Storage Block](@oritech:large_storage_block) and [Large Solar Panel](@oritech:big_solar_panel_block). -- Once you automate sulfuric acid, centrifuging filled [Dubious Containers](@oritech:dubios_container) is the practical way to scale production. +- Once you automate sulfuric acid, centrifuging filled [Dubious Containers](@oritech:dubious_container) is the practical way to scale production. diff --git a/wiki/content/components/dubios_container.mdx b/wiki/content/components/dubious_container.mdx similarity index 93% rename from wiki/content/components/dubios_container.mdx rename to wiki/content/components/dubious_container.mdx index d2d3bef7b9..6d5237e8f4 100644 --- a/wiki/content/components/dubios_container.mdx +++ b/wiki/content/components/dubious_container.mdx @@ -1,6 +1,6 @@ --- title: Dubious Container -id: oritech:dubios_container +id: oritech:dubious_container type: item --- @@ -14,7 +14,7 @@ most Oritech machines do not handle directly. 'oritech:enderic_compound', 'oritech:adamant_ingot', 'oritech:enderic_compound', 'oritech:enderic_compound', 'oritech:adamant_ingot', 'oritech:enderic_compound' ]} - result="oritech:dubios_container" + result="oritech:dubious_container" count={1} /> diff --git a/wiki/content/components/super_ai_chip.mdx b/wiki/content/components/super_ai_chip.mdx index 2bb779337e..94be4f88b0 100644 --- a/wiki/content/components/super_ai_chip.mdx +++ b/wiki/content/components/super_ai_chip.mdx @@ -11,6 +11,6 @@ The Super AI Chip is one of Oritech's final computing components. and [Advanced Computing Engines](@oritech:advanced_computing_engine). **Usage** -- Used in high-tier recipes such as the [Dubious Container](@oritech:dubios_container), +- Used in high-tier recipes such as the [Dubious Container](@oritech:dubious_container), [Auxiliary Processing Chamber Addon](@oritech:machine_processing_addon), advanced drone logistics, and other end-game machine parts. diff --git a/wiki/content/components/unholy_intelligence.mdx b/wiki/content/components/unholy_intelligence.mdx index 9291c77274..92e2ebc50c 100644 --- a/wiki/content/components/unholy_intelligence.mdx +++ b/wiki/content/components/unholy_intelligence.mdx @@ -7,7 +7,7 @@ type: item A rare logic core obtained by capturing specific magical entities. **Obtaining** -- **Entity Capture**: Give a [Dubios Container](@oritech:dubios_container) to an [Allay](https://minecraft.wiki/w/Allay) +- **Entity Capture**: Give a [Dubious Container](@oritech:dubious_container) to an [Allay](https://minecraft.wiki/w/Allay) or interact with a [Vex](https://minecraft.wiki/w/Vex) to capture their essence. -- **Centrifuge (Alternative)**: Can be synthesized by processing a [Dubios Container](@oritech:dubios_container) +- **Centrifuge (Alternative)**: Can be synthesized by processing a [Dubious Container](@oritech:dubious_container) with [Strange Matter](@oritech:fluid_strange_matter). This method costs much more than capturing entities. diff --git a/wiki/content/machines/machine_core_2.mdx b/wiki/content/machines/machine_core_2.mdx index c096c32fd3..ebfd7822dc 100644 --- a/wiki/content/machines/machine_core_2.mdx +++ b/wiki/content/machines/machine_core_2.mdx @@ -14,7 +14,7 @@ Machine cores determine the quality of Oritech multiblock machines. Better cores - Tier 3 uses [Carbon Fibre Strands](@oritech:carbon_fibre_strands) or [Nickel](@oritech:nickel_ingot) with Redstone. - Tier 4 uses [Machine Plating Blocks](@oritech:machine_plating_block) and [Enderic Compound](@oritech:enderic_compound). - Tier 5 uses [Adamant](@oritech:adamant_ingot) and [Advanced Computing Engines](@oritech:advanced_computing_engine). -- Tier 6 uses [Duratium](@oritech:duratium_ingot) and [Dubious Containers](@oritech:dubios_container). +- Tier 6 uses [Duratium](@oritech:duratium_ingot) and [Dubious Containers](@oritech:dubious_container). - Tier 7 uses [Prometheum](@oritech:promethium_ingot) and [Superconductors](@oritech:superconductor). **Usage** diff --git a/wiki/data/oritech/properties/item.json b/wiki/data/oritech/properties/item.json index a08aad5b59..e5967ab72c 100644 --- a/wiki/data/oritech/properties/item.json +++ b/wiki/data/oritech/properties/item.json @@ -813,7 +813,7 @@ "stack_size": 64, "rarity": "common" }, - "oritech:dubios_container": { + "oritech:dubious_container": { "stack_size": 16, "rarity": "common" }, diff --git a/wiki/translated/zh_cn/content/components/_meta.json b/wiki/translated/zh_cn/content/components/_meta.json index 41b480b98d..cf1c01f1da 100644 --- a/wiki/translated/zh_cn/content/components/_meta.json +++ b/wiki/translated/zh_cn/content/components/_meta.json @@ -5,7 +5,7 @@ "basic_battery.mdx": "基础电池", "carbon_fibre_strands.mdx": "碳纤维", "clay_catalyst_beads.mdx": "黏土催化剂", - "dubios_container.mdx": "可疑的容器", + "dubious_container.mdx": "可疑的容器", "enderic_compound.mdx": "末影化合物", "enderic_lens.mdx": "末影透镜", "flux_gate.mdx": "磁通门", diff --git a/wiki/translated/zh_cn/content/components/advanced_battery.mdx b/wiki/translated/zh_cn/content/components/advanced_battery.mdx index 835e13f2f0..3f7c255d84 100644 --- a/wiki/translated/zh_cn/content/components/advanced_battery.mdx +++ b/wiki/translated/zh_cn/content/components/advanced_battery.mdx @@ -17,8 +17,8 @@ type: item count={1} /> -- **离心机**:用[硫酸](@oritech:fluid_sulfuric_acid)处理[可疑的容器](@oritech:dubios_container)进行批量生产。 +- **离心机**:用[硫酸](@oritech:fluid_sulfuric_acid)处理[可疑的容器](@oritech:dubious_container)进行批量生产。 **用途** - 用于合成[电动重锤](@oritech:electric_mace)、[末影电磁炮](@oritech:portable_laser)、喷气背包和飞行装备,以及[大型能量存储](@oritech:large_storage_block)和[大型太阳能电池板](@oritech:big_solar_panel_block)。 -- 一旦你实现了硫酸自动化生产,流体离心[可疑的容器](@oritech:dubios_container)是一种扩大生产规模的实用方法。 +- 一旦你实现了硫酸自动化生产,流体离心[可疑的容器](@oritech:dubious_container)是一种扩大生产规模的实用方法。 diff --git a/wiki/translated/zh_cn/content/components/dubios_container.mdx b/wiki/translated/zh_cn/content/components/dubious_container.mdx similarity index 92% rename from wiki/translated/zh_cn/content/components/dubios_container.mdx rename to wiki/translated/zh_cn/content/components/dubious_container.mdx index 185bf31faf..ea9c4bc401 100644 --- a/wiki/translated/zh_cn/content/components/dubios_container.mdx +++ b/wiki/translated/zh_cn/content/components/dubious_container.mdx @@ -1,6 +1,6 @@ --- title: 可疑的容器 -id: oritech:dubios_container +id: oritech:dubious_container type: item --- @@ -14,7 +14,7 @@ type: item 'oritech:enderic_compound', 'oritech:adamant_ingot', 'oritech:enderic_compound', 'oritech:enderic_compound', 'oritech:adamant_ingot', 'oritech:enderic_compound' ]} - result="oritech:dubios_container" + result="oritech:dubious_container" count={1} /> diff --git a/wiki/translated/zh_cn/content/components/super_ai_chip.mdx b/wiki/translated/zh_cn/content/components/super_ai_chip.mdx index 308207d64a..b32e4de6c8 100644 --- a/wiki/translated/zh_cn/content/components/super_ai_chip.mdx +++ b/wiki/translated/zh_cn/content/components/super_ai_chip.mdx @@ -11,6 +11,6 @@ type: item 和[高级计算引擎](@oritech:advanced_computing_engine)合成。 **用途** -- 同于高级配方,如[可疑的容器](@oritech:dubios_container)、 +- 同于高级配方,如[可疑的容器](@oritech:dubious_container)、 [辅助加工室插件](@oritech:machine_processing_addon)、高级无人机物流 以及其他末期机器零件。 diff --git a/wiki/translated/zh_cn/content/components/unholy_intelligence.mdx b/wiki/translated/zh_cn/content/components/unholy_intelligence.mdx index 90b589e393..0196b45ea6 100644 --- a/wiki/translated/zh_cn/content/components/unholy_intelligence.mdx +++ b/wiki/translated/zh_cn/content/components/unholy_intelligence.mdx @@ -7,7 +7,7 @@ type: item 一种捕获特定魔法实体获得的稀有逻辑核心。 **捕获方式** -- **捕获实体**:将[可疑的容器](@oritech:dubios_container)用于[悦灵](https://minecraft.wiki/w/Allay) +- **捕获实体**:将[可疑的容器](@oritech:dubious_container)用于[悦灵](https://minecraft.wiki/w/Allay) 或[恼鬼](https://minecraft.wiki/w/Vex)来捕获他们的大脑。 - **离心机(替代方法)**:可以通过[奇异物质](@oritech:fluid_strange_matter) -处理[可疑的容器](@oritech:dubios_container)获得。这种方法比捕获实体的成本高得多。 +处理[可疑的容器](@oritech:dubious_container)获得。这种方法比捕获实体的成本高得多。 diff --git a/wiki/translated/zh_cn/content/machines/machine_core_2.mdx b/wiki/translated/zh_cn/content/machines/machine_core_2.mdx index e9f9b6bdc9..b5ddc53ba3 100644 --- a/wiki/translated/zh_cn/content/machines/machine_core_2.mdx +++ b/wiki/translated/zh_cn/content/machines/machine_core_2.mdx @@ -14,7 +14,7 @@ related_items: ["oritech:machine_core_1", "oritech:machine_core_3", "oritech:mac - 等级 3 使用[碳纤维](@oritech:carbon_fibre_strands)或[镍](@oritech:nickel_ingot)和红石。 - 等级 4 使用[强化护板](@oritech:machine_plating_block)和[末影化合物](@oritech:enderic_compound)。 - 等级 5 使用[精镍](@oritech:adamant_ingot)和[高级计算引擎](@oritech:advanced_computing_engine)。 -- 等级 6 使用[昶铂](@oritech:duratium_ingot)和[可疑的容器](@oritech:dubios_container)。 +- 等级 6 使用[昶铂](@oritech:duratium_ingot)和[可疑的容器](@oritech:dubious_container)。 - 等级 7 使用[钷](@oritech:promethium_ingot)和[超导体](@oritech:superconductor)。 **用途**