diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 7ed12f4..23e42c7 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -731,7 +731,7 @@ } ] title: "The \"Fun\" will never stop" - x: 3.375d + x: 5.625d y: 6.75d } { @@ -754,29 +754,6 @@ x: 5.625d y: 4.5d } - { - dependencies: [ - "40408FFD02134148" - "4AFD3073C731A1E4" - "7FA0ACB7F161F378" - ] - description: [ - "You've probably noticed the &9\"chance per tier\"&r when hovering over the bonus outputs in &2EMI&r Each overclock above the required tier will add that % bonus to the chanced output!" - "" - "This means using an &3EV Macerator&r will yield &6more Byproducts&r!" - ] - id: "7B23AF5B6B62BC19" - size: 0.75d - subtitle: "Avarice and hedonism in a single block" - tasks: [{ - id: "4EC5F44332F7533B" - item: "gtceu:ev_macerator" - type: "item" - }] - title: "Even More Byproducts" - x: 5.625d - y: 6.75d - } { dependencies: [ "73E8283634E5E33A" diff --git a/config/ftbquests/quests/chapters/gtceu.snbt b/config/ftbquests/quests/chapters/gtceu.snbt index 4a54249..7263a1a 100644 --- a/config/ftbquests/quests/chapters/gtceu.snbt +++ b/config/ftbquests/quests/chapters/gtceu.snbt @@ -968,8 +968,6 @@ "&9&lScythe:&r A powerful farming tool that can automatically replant your crops in a large area. It's also a surprisingly good weapon!" "" "&9&lPlunger:&r A tool to clear stuck fluids from GregTech&a machines." - "" - "&9&lButchery Knife:&r A weapon that comes pre-enchanted with &6Looting III&r. You might want to use it to gather leather and food." "{@pagebreak}" "&e&lNote:&r This quest's reward is &3Damascus Steel&r - a rare material which can only be found as overworld loot. It far surpasses the materials you have now, so be sure to use it." ] @@ -978,7 +976,9 @@ id: "gtceu:iron_screwdriver" tag: { Damage: 0 - GT.Tool: { } + GT.Tool: { + DefaultEnchantments: [ ] + } } } id: "5C3501DD3B4788FA" diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index f1827fb..03189a1 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -1037,7 +1037,11 @@ "" "&aToluene&r can also optionally be used in &5EV&r to make &dGasoline&r." "" - "&cTNT&r is used in the &3Implosion Compressor&r to make Gems. It also blows stuff (and your friends) up." + "&cTNT&r is used in the &3Implosion Compressor&r to make Gems. It also blows stuff (and your friends) up. " + "{@pagebreak}" + "&cITNT&r can also be used in the &3Implosion Compressor&r at a better rate but require &aNitration Mixture&r to make. It also ignites when punched so be careful when it is placed." + "" + "Get &9either&r TNT or ITNT to complete this quest." "" "Technically, Dynamite or Powerbarrels could also be used... but Dynamite is a pain to obtain, whereas Powerbarrels are weaker." ] @@ -1049,11 +1053,28 @@ { id: "1CB85F57BA45252D" item: "gtceu:gelled_toluene" + optional_task: true type: "item" } { id: "04BF6A36E965C348" - item: "minecraft:tnt" + item: { + Count: 1 + id: "itemfilters:or" + tag: { + items: [ + { + Count: 1b + id: "minecraft:tnt" + } + { + Count: 1b + id: "gtceu:industrial_tnt" + } + ] + } + } + title: "TNT" type: "item" } ] diff --git a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt index 0c33470..e3642ac 100644 --- a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt +++ b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt @@ -483,7 +483,9 @@ "14D277A164202FF8" ] description: [ - "Better Ore Processing for &6chanced Byproducts&r, only at the cost of this &3Macerator&r! A must have." + "Faster Ore Processing only at the cost of this &3Macerator&r! A must have." + "" + "Also used to craft the &3Large Maceration Tower&r." "" "And now, it's finally time for mass ore processing automation." "" @@ -497,7 +499,7 @@ item: "gtceu:iv_macerator" type: "item" }] - title: "Shredding your Ores with further more Byproducts" + title: "Shredding your Ores with greater speed" x: 1.5d y: 4.875d } diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 2f772ff..f648914 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -430,11 +430,11 @@ { dependencies: ["32EA7E81885C8E87"] description: [ - "The Lathe is an important machine to help shape metals. Thanks to it, you can turn &6one Ingot into two Rods&r, and &6one Bolt into one screw&r. That's twice the efficiency on those recipes as opposed to crafting by hand." - "{@pagebreak}" - "&l&3Lore:&r&o The GregTech 5 Lathe produces one Rod and 2 small piles of Dust per Ingot. We also have a setting for this in GTCEu, but it's turned off by default." + "The Lathe is an important machine to help shape metals. Thanks to it, you can turn &6one Ingot into one Rod and 2 small piles of Dust&r, and &6one Bolt into one screw&r. That's twice the material efficiency on those recipes as opposed to crafting by hand. " "" - "&oThe GT6 Lathe acts like GT5's, but Bolts lathe into one Screw and 1/72 of a pile of Dust. Disgusting!" + "However the &bMV&r &3Extruder&r has the ability to turn &6one Ingot&r directly into &6two Rods&r alongside its many other functions." + "" + "&l&3Lore:&r &oThe GT6 Lathe acts like GTm's lathe, but Bolts lathe into one Screw and 1/72 of a pile of Dust. Disgusting!" ] id: "07E7678095258EDB" rewards: [{ @@ -506,19 +506,21 @@ description: [ "&oThe &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel." "" - "If you want Steam-based power production, this will be your first port-of-call. Other power options are listed in the &bMV&r chapter." + "If you want Steam-based power production, this will be your first port-of-call. Other power options are listed in the &bMV&r chapter, if you want to invest in those, you can &cskip this quest&r with the checkmark." "" - "We should note that the LBB in its &bcurrent state&r isn't... great. It's probably better to use an alternate fuel source for now (or just spam &dsingleblock Boilers&r). This will be &2rebalanced&r in due time, don't you worry. For that reason, though, you can &cskip this quest&r with the checkmark." + "One \"easy\" fuel option is producing &dCharcoal&r from &3Coke Ovens&r. One piece of Charcoal lasts 20s in the LBB and the wood can be sourced from a tree farm." "" "&cImportant:&r This Boiler &lCAN&r also &cexplode&r similarly to the regular Boilers! Usually, the explosion can be rather devastating... but it's configured to not damage blocks or entities in this modpack." "{@pagebreak}" "&cWater supply is &lcrucial&r&r. Dedicate a &3Primitive Pump&r with a &7LV&r Output Hatch in the &lsame chunk&r as the Boiler. Any biome will still be enough to supply enough water." "" - "Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel." + "Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of automating fuel." "{@pagebreak}" "&5&lWith this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25% power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines." "" "&9Note:&r An in-depth tutorial about Multiblocks is given after you get the &3Electric Blast Furnace&r. We recommend you aim for that first." + "" + "&l&3Lore:&r&o The LBB used to be terrible, however it recently got rebalanced in 7.3.0 to make it actually viable to use." ] icon: "gtceu:bronze_large_boiler" id: "33263404ED38C6D2" @@ -610,8 +612,6 @@ "" "A small amount of &dFlawless Emeralds&r will be required in &bMV&r, and running ores in &3Sifting Machine&r is how you obtain these." "" - "Each higher tier of &3Sifter&r increases the chance of all Gem types to be found, at the cost of more energy. " - "" "&9Note:&r If you crushed Gem Ores (such as Diamond), it is critical you use this machine to recover the actual gems in non dust form. However, this is a rather slow process, so you may want to smelt this type of ore directly into the Gem." ] id: "7A64425597F58015" @@ -1744,7 +1744,7 @@ type: "item" }] title: "Gallium Arsenide" - x: 1.125d + x: 2.25d y: 7.875d } { @@ -2501,6 +2501,111 @@ x: -2.25d y: 7.875d } + { + dependencies: [ + "257DB4B39B2A928E" + "581CDF545E1EA1FD" + ] + description: [ + "&3Concrete&r and &3Studs&r are two decorative block families added that increse your speed when walking on them, with &3Concrete&r increasing your speed more." + "" + "Get &9either&r of them to complete this quest." + ] + hide_dependency_lines: true + icon: "gtceu:light_concrete" + id: "41DD503169987D50" + shape: "rsquare" + size: 0.66d + subtitle: "Subsonic!" + tasks: [{ + id: "755F679F2DA97A4F" + item: { + Count: 1 + id: "itemfilters:or" + tag: { + items: [ + { + Count: 1b + id: "gtceu:light_concrete" + } + { + Count: 1b + id: "gtceu:dark_concrete" + } + { + Count: 1b + id: "gtceu:white_studs" + } + { + Count: 1b + id: "gtceu:orange_studs" + } + { + Count: 1b + id: "gtceu:magenta_studs" + } + { + Count: 1b + id: "gtceu:light_blue_studs" + } + { + Count: 1b + id: "gtceu:yellow_studs" + } + { + Count: 1b + id: "gtceu:lime_studs" + } + { + Count: 1b + id: "gtceu:pink_studs" + } + { + Count: 1b + id: "gtceu:gray_studs" + } + { + Count: 1b + id: "gtceu:light_gray_studs" + } + { + Count: 1b + id: "gtceu:cyan_studs" + } + { + Count: 1b + id: "gtceu:purple_studs" + } + { + Count: 1b + id: "gtceu:blue_studs" + } + { + Count: 1b + id: "gtceu:brown_studs" + } + { + Count: 1b + id: "gtceu:green_studs" + } + { + Count: 1b + id: "gtceu:red_studs" + } + { + Count: 1b + id: "gtceu:black_studs" + } + ] + } + } + title: "Blocks" + type: "item" + }] + title: "Gotta go fast" + x: 1.12d + y: 7.875d + } ] subtitle: ["Tame electricity and make your first machines"] title: "&7LV&r - Low Voltage" diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index cd5349c..67d151f 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -1625,7 +1625,7 @@ "" "The Extruder shapes solid materials into (almost!) any form using &aIngots&r. This is a great way to reduce the amount of microcrafting, as well as keeping a high conversion ratio." "" - "The Extruder can make &6Bolts&r, &6&6Small Gears&r, &6Gears&r, and &6&6Rings&r at the highest efficiency in a single step!" + "The Extruder can make &6Rods&r, &6Bolts&r, &6&6Small Gears&r, &6Gears&r, and &6&6Rings&r at the highest efficiency in a single step!" "" "You may also like to use it for &dPipes&r, &dLong Rods&r, and &dRotors&r." ] diff --git a/config/ftbquests/quests/chapters/steam_age.snbt b/config/ftbquests/quests/chapters/steam_age.snbt index 7724699..61e0833 100644 --- a/config/ftbquests/quests/chapters/steam_age.snbt +++ b/config/ftbquests/quests/chapters/steam_age.snbt @@ -457,8 +457,6 @@ "" "Introducing... &aDrums&r! They have large internal buffers, and any &aDrum&r can be broken and picked up and will &dkeep the fluid&r inside." "{@pagebreak}" - "&l&4[ NOT YET IMPLEMENTED ]" - "" "Additionally, &binternal tanks&r from machines will interact with items containing fluid. This is great for manual crafting - this means you can use fluid drums instead of multiple buckets in crafting. To &5void fluid&r contained in a Drum, place it alone in any crafting grid." "" "&o&7Pssst:&8 &oA right-click with a Screwdriver allows a Drum to drain its content into another container placed under it. This is great if you want to keep your Liquid Boilers fueled for longer." @@ -1131,20 +1129,16 @@ } { dependencies: ["48AED37B4E20A99A"] - description: ["Invar has &650% more durability&r when used in GregTech tools compared to Iron (yes, that is the same as &aWrought Iron&r), and comes with inherent &bEfficiency I&r. Great for mining - you might want to consider using this in your tools if you &5haven't unlocked&r Steel."] + description: ["Invar has &650% more durability&r when used in GregTech tools compared to Iron (yes, that is the same as &aWrought Iron&r). Great for mining - you might want to consider using this in your tools if you &5haven't unlocked&r Steel."] id: "76F61E499780C30B" rewards: [{ - id: "15C0F36A7E35F7A6" + id: "4B335E308869FC4B" item: { Count: 1 id: "gtceu:invar_mining_hammer" tag: { Damage: 0 DisallowContainerItem: 0b - Enchantments: [{ - id: "minecraft:efficiency" - lvl: 1s - }] GT.Behaviours: { AoEColumn: 1 AoELayer: 0 @@ -1152,8 +1146,12 @@ MaxAoEColumn: 1 MaxAoELayer: 0 MaxAoERow: 1 + TorchPlacing: 1b } GT.Tool: { + AttackDamage: 4.5f + AttackSpeed: -3.2f + DefaultEnchantments: [ ] HarvestLevel: 2 MaxDamage: 1151 ToolSpeed: 5.6f diff --git a/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt b/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt index ace45a1..ca57c51 100644 --- a/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt +++ b/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt @@ -684,7 +684,7 @@ description: [ "A shopping list for anyone looking to automate &6Ore Processing&r on a large scale:" "" - "&9-&r One or more &3IV Macerators&r (the higher the tier, the higher your chances of byproducts!)." + "&9-&r One or more &3IV Macerators&r." "&9-&r The &3Large Centrifuge&r. Set it to work as a Thermal Centrifuge, and you're off to the races." "&9-&r One or more &3MV Electrolyzers&r - you could possibly make the large version if there's enough demand." "&9-&r A &3Multi Smelter&r." @@ -698,7 +698,7 @@ "&9-&r Alternately, a &3Large Ore Washer&r, accompanied with a set of &3Distilleries&r for &dDistilled Water&r." "&9-&r A second &3Large Centrifuge&r... this time set to Centrifuge mode for impure/purified dusts." "&9-&r &3Chemical Baths&r for the special Byproducts that require &dMercury&r or &dSodium Persulfate&r to obtain." - "&9-&r &3Sifters&r of any tier (higher tier = better chanced output), for gem ores." + "&9-&r &3Sifters&r of any tier for gem ores." "&9-&r &3Electromagnetic Separators&r." "{@pagebreak}" "If the Large Machines aren't your thing, you could always try using tons of &7LV&r machinery, and route with some clever piping." diff --git a/config/ftbquests/quests/data.snbt b/config/ftbquests/quests/data.snbt index 8428198..022081a 100644 --- a/config/ftbquests/quests/data.snbt +++ b/config/ftbquests/quests/data.snbt @@ -19,6 +19,7 @@ } pause_game: false progression_mode: "default" + show_lock_icons: true title: "GregTech Community Pack" version: 13 } diff --git a/config/gtceu.yaml b/config/gtceu.yaml index 3e5e05b..07e2790 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -10,7 +10,7 @@ recipes: # Change the recipe of Rods in the Lathe to 1 Rod and 2 Small Piles of Dust, instead of 2 Rods. # Default: true - harderRods: false + harderRods: true # Whether to make crafting recipes for Bricks, Firebricks, Nether Bricks, and Coke Bricks harder. # Default: false @@ -89,15 +89,35 @@ recipes: # Default: false enchantedTools: false + # Whether to enable macerator decomposition recycling + # Default: true + enableMaceratorRecycling: true + + # Percentage yield of macerator decomposition recycling outputs, 1.0 means 100% + # Default: 1.0f + maceratorRecyclingYield: 1.0 + + # Whether to enable arc furnace decomposition recycling + # Default: true + enableArcRecycling: true + + # Percentage yield of arc furnace decomposition recycling outputs, 1.0 means 100% + # Default: 1.0f + arcRecyclingYield: 1.0 + + # Whether to enable extractor decomposition recycling + # Default: true + enableExtractorRecycling: true + + # Percentage yield of extractor decomposition recycling outputs, 1.0 means 100% + # Default: 1.0f + extractorRecyclingYield: 1.0 + worldgen: # Rubber Tree spawn chance (decimal % per chunk) # Default: 0.5 rubberTreeSpawnChance: 0.5 - # Should all Stone Types drop unique Ore Item Blocks? - # Default: false (meaning only Stone, Netherrack, and Endstone) - allUniqueStoneTypes: false - # Should Sand-like ores fall? # This includes gravel, sand, and red sand ores. # Default: false (no falling ores) @@ -199,6 +219,10 @@ machines: # Default: false cleanMultiblocks: false + # Whether the miner should attempt to replace the block mined with a cobbled version of the ore + # Default: true + replaceWithCobbleVersion: true + # Block to replace mined ores with in the miner and multiblock miner. # Default: minecraft:cobblestone replaceMinedBlocksWith: minecraft:cobblestone @@ -211,9 +235,10 @@ machines: # Default: true enableMaintenance: true - # Time in ticks between when Multiblocks can require Maintenance. By default, 48 hours. - # Default: 3456000 - maintenanceTime: 3456000 + # How often to check for maintenance, rolling a 1/6000 chance every X ticks (before secondary effects like Configurable Maintenance Hatch). + # In default settings, this equates to a 5% chance every hour of a machine running. + # Default: 1000 (ticks) + maintenanceCheckRate: 1000 # Whether to enable World Accelerators, which accelerate ticks for surrounding Tile Entities, Crops, etc. # Default: true @@ -288,6 +313,9 @@ machines: # Default: 8 steamMultiParallelAmount: 8 + # Whether the Drums can input fluids from the output side (bottom). + allowDrumsInputFluidsFromOutputSide: false + # Small Steam Boiler Options smallBoilers: # The amount of steam a Steam Solid Boiler produces per second at max temperature. @@ -415,6 +443,10 @@ client: # Default: true renderFluids: true + # Render growing plants in multiblocks that support them? + # Default: true + renderGrowingPlants: true + # Whether or not to color tiered machine highlights in the tier color # Default: true coloredTieredMachineOutline: true @@ -423,6 +455,13 @@ client: # Default: true coloredWireOutline: true + tankItemFluidPreview: + # Set true to render the including fluid icons to GT Drums + drum: false + + # Set true to render the including fluid icons to Super (Quantum) Tanks + quantumTank: false + # Config options for Tools and Armor tools: # Random chance for electric tools to take actual damage @@ -470,7 +509,7 @@ tools: voltageTierQuarkTech: 5 # Advanced QuarkTech Suit Chestplate Voltage Tier. - # Default: 5 (LuV) + # Default: 6 (LuV) voltageTierAdvQuarkTech: 6 # Electric Impeller Jetpack Voltage Tier. @@ -606,6 +645,10 @@ compat: # Default: false showDimensionTier: false + # Whether Create compatibility will be available. + # Default: true + createCompat: true + dev: # Debug general events? (will print recipe conficts etc. to server's debug.log) # Default: false diff --git a/index.toml b/index.toml index 67e895e..96b9a39 100644 --- a/index.toml +++ b/index.toml @@ -118,11 +118,11 @@ hash = "cc7b7524a1409711280d59e9af31b93d161cb654981abb0b2ea945111734fd3d" [[files]] file = "config/ftbquests/quests/chapters/ev__extreme_voltage.snbt" -hash = "b90780b61e40c18101b9af99a82468cfd3283d0b6bfbb703d7cb1aab141bb3fe" +hash = "53c659b33da3563178e89a9fa14020c6f76997207110389f5e16b79b9ed099a6" [[files]] file = "config/ftbquests/quests/chapters/gtceu.snbt" -hash = "8328695fce4ed23b94fa2e54e431e59ede189e4a9ed1f76b9e6eec24639b7e8b" +hash = "bd24a9ab8ee710861a5c63dbed317c243e28d92d8c716a69e9eb4a1b3ef7348e" [[files]] file = "config/ftbquests/quests/chapters/heating_coils.snbt" @@ -130,11 +130,11 @@ hash = "3de3b8987fbd6652079f9a6f8ff7f0d140753eb94563b31554648a09990d89e1" [[files]] file = "config/ftbquests/quests/chapters/hv__high_voltage.snbt" -hash = "c7509bc06ae4bc0a5667610206be7cc8d2c9db244543adeba6b9a3f45c7f09eb" +hash = "5396e223fedd3d402a2a774a2aac4ba7e9f7a03e108c4aa2e05e63e077daab0d" [[files]] file = "config/ftbquests/quests/chapters/iv__insane_voltage.snbt" -hash = "47e9a9124100e3e5d67af25dd1c2fa07a852a80f50d62d61588050960a2dd2fa" +hash = "3e8d67a0e489ad0c423fa452dc7cc5c7f7b2033e737cd9a841d79964856c28af" [[files]] file = "config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt" @@ -142,7 +142,7 @@ hash = "b68e2e3c85c5f70f5f1938e31ec228684cc08e823bca4e4170fb92e9339b2670" [[files]] file = "config/ftbquests/quests/chapters/lv__low_voltage.snbt" -hash = "30fd5fb575e5a138f51de82459c5aa32708697d36a4690d4ed33f89ab6a4673f" +hash = "f3c1fddd173769681ab70af459a53398775ddd7ae006f2a2a5588d91eb0a9c50" [[files]] file = "config/ftbquests/quests/chapters/multiblock_dilemma.snbt" @@ -150,7 +150,7 @@ hash = "c597f716bb540288bd909925586087298edabb66bf5b65b8f353631f05e295ce" [[files]] file = "config/ftbquests/quests/chapters/mv__medium_voltage.snbt" -hash = "284458ad917439b46ae6f725732c5f95acd3805c7139791f2d7631a6e5431153" +hash = "533e80c3d683bf6b1e1a03747962c763091afa65b5f3ac000c62504e82fe5036" [[files]] file = "config/ftbquests/quests/chapters/ore_generation.snbt" @@ -170,11 +170,11 @@ hash = "070e4c59640dc3014745eb4f2b83f918342a92c7dbec9a44c7e003500de90904" [[files]] file = "config/ftbquests/quests/chapters/steam_age.snbt" -hash = "15f51039f3f8e730257b352a4ec337fb292c3e2a0213a049f90d4d485e6f4434" +hash = "77232cec33203139fb43919eccdb092da49d10875094453644d41ccadb7a932a" [[files]] file = "config/ftbquests/quests/chapters/tips_and_tricks_2.snbt" -hash = "171dd9f3683bd2a82752e7cba96c8a4e44f5370e7ba1a819838eb5be7a652e0a" +hash = "60cea2a6709ee8d78d6a6625393f1a6d823f29b51df9f1518a67b99fba24b817" [[files]] file = "config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt" @@ -186,7 +186,7 @@ hash = "7fb0ab7a9aadbad7563ecfac1cedf3204a70761abb5b93df84f77f3a7504ceba" [[files]] file = "config/ftbquests/quests/data.snbt" -hash = "3ebade5d68b4aea34338bdf09499e52a7f70e96261cd78247790ba479a8f511b" +hash = "f09e044050912b32b625c79a70916c35497aa989cdf852d08b847110a4c23ed7" [[files]] file = "config/ftbquests/quests/reward_tables/bronze_age.snbt" @@ -226,7 +226,7 @@ hash = "9abe2c7f784810cac3ca71c74d02aacd5fe6861d744cb143d077a525a2b42e76" [[files]] file = "config/gtceu.yaml" -hash = "51af2e256f83d90bbbd35cf4567b8b3cda560cb60847e844e422f2975fc9aa29" +hash = "5533b9de9259ba09d1d0a201897fbd272f03790bf05c082f0616069450cd2d6a" [[files]] file = "config/hangglider-client.toml" @@ -614,7 +614,7 @@ hash = "a184a4372a849553c142772f0f3a434fb59d0fa242c317deb2556451bd9880a5" [[files]] file = "kubejs/server_scripts/appliedenergistics2/terminals.js" -hash = "7588ffcb734f4ba3caecea9259dff93d4b66b4e7ebc1fe254645a6fb3fa3fa89" +hash = "65044811e34e7b2d2d2728ed0bd025f4994369ae8b97b6711209a0469cafa96c" [[files]] file = "kubejs/server_scripts/building/architects_palette.js" @@ -652,9 +652,13 @@ hash = "e533b6ba1ecf4b040a381378904cbaa71ca1071de3c7f000991c7cf08e91f71c" file = "kubejs/server_scripts/gregtech/temporary_fixes.js" hash = "c1b8d11d702ecc9bb6950c5efd39fbc395dc9a4bdb87f8233acde31cf8887506" +[[files]] +file = "kubejs/server_scripts/gregtech/void_air.js" +hash = "95e582854cad11a56825a4f5adce8f1944c247e41c6265b3acc69ab21b9d53f3" + [[files]] file = "kubejs/server_scripts/gregtech/wood_unification.js" -hash = "3ef4090c877d7eae7e7b0426bd25d05e2abf3c1afa1eca49891ca83eb0cdd842" +hash = "4b4b92765b4150ace7c1aad90b3f718e2ebbce41d6b64dc59cb37d4c5adeddb0" [[files]] file = "kubejs/server_scripts/miscellaneous.js" @@ -702,7 +706,7 @@ hash = "e586325a5342247db88d21d5f040540c26134ac9dd0c1f55bf0d79b2c8ae1585" [[files]] file = "kubejs/server_scripts/tags/items.js" -hash = "c3d121f2c0a775cf83d6f22ec519def5e680df80e1b9584fe6b4daee53a6ca63" +hash = "a2d421c36c4f23ca9c86683abd6b1d19cf730eaae7af9bd4cef1be9947bfc2bb" [[files]] file = "kubejs/server_scripts/torchmaster.js" @@ -720,6 +724,10 @@ hash = "bdbe3251b4b39173618be5ff3450ab6abd3dc7a73db591b61d86a010eb8faabb" file = "kubejs/startup_scripts/components/hsla-steel.js" hash = "2df8bceaa0bcb871203b094c657461eb9b78cc4fc20d63d95388d2e1d0f95a2e" +[[files]] +file = "kubejs/startup_scripts/dimension_markers.js" +hash = "6a452906c16e9321766192f5236fa984ee832e7764dd9a687daa5bdfe69051fb" + [[files]] file = "kubejs/startup_scripts/icons.js" hash = "509f876d9767bf536a5452021bef3dff8cf1d10345f2b4aba8d2df529763edbe" @@ -966,7 +974,7 @@ metafile = true [[files]] file = "mods/gregtechceu-modern.pw.toml" -hash = "405441ee4b2caa3503f94720d00f9d86d804ab5cba09fb65f13cee4be11c3e39" +hash = "095d95ed8aa22628bf45e18aa2782cb7a0064d2f815261edb00dc8bc559bea38" metafile = true [[files]] @@ -1011,7 +1019,7 @@ metafile = true [[files]] file = "mods/jei.pw.toml" -hash = "5f7c3cf35124bf96e880cc8562fc44ac15990a89b07db299aed9a88ce3752cb1" +hash = "94a0ed0630ad6e53af1e317e86a195672f4627552fde677396ac94eefce6ffc6" metafile = true [[files]] diff --git a/kubejs/server_scripts/appliedenergistics2/terminals.js b/kubejs/server_scripts/appliedenergistics2/terminals.js index 98b8489..c77bf25 100644 --- a/kubejs/server_scripts/appliedenergistics2/terminals.js +++ b/kubejs/server_scripts/appliedenergistics2/terminals.js @@ -113,4 +113,11 @@ ServerEvents.recipes((event) => { E: "ae2:engineering_processor", C: "ae2:fluix_glass_cable", }); + + // Stonecut p2p tunnels, attunement sucks + // Written by MatthiasMann + const p2p = ["redstone", "item", "fluid", "fe", "light"] + p2p.forEach(type => { + event.stonecutting("ae2:" + type + "_p2p_tunnel", "ae2:me_p2p_tunnel") + }); }); diff --git a/kubejs/server_scripts/gregtech/void_air.js b/kubejs/server_scripts/gregtech/void_air.js new file mode 100644 index 0000000..9fcb174 --- /dev/null +++ b/kubejs/server_scripts/gregtech/void_air.js @@ -0,0 +1,8 @@ +ServerEvents.recipes(event => { + const greg = event.recipes.gtceu; + greg.gas_collector("void_air") + .circuit(4) + .outputFluids(Fluid.of("gtceu:air", 10000)) + .dimension("javd:void") + .duration(200).EUt(16); +}); diff --git a/kubejs/server_scripts/gregtech/wood_unification.js b/kubejs/server_scripts/gregtech/wood_unification.js index 9e0f759..bd75762 100644 --- a/kubejs/server_scripts/gregtech/wood_unification.js +++ b/kubejs/server_scripts/gregtech/wood_unification.js @@ -2,15 +2,15 @@ ServerEvents.recipes((event) => { function woodUnification(woodType) { event.recipes.gtceu .assembler(`${woodType}_fence`) - .itemInputs(`${woodType}_planks`, "stick") + .itemInputs(`${woodType}_planks`) .itemOutputs(`${woodType}_fence`) - .circuit(1) + .circuit(13) .duration(100) .EUt(4); event.recipes.gtceu .assembler(`${woodType}_fence_gate`) - .itemInputs(`2x ${woodType}_planks`, "2x stick") + .itemInputs(`2x ${woodType}_planks`, "2x #forge:rods/wooden") .itemOutputs(`${woodType}_fence_gate`) .circuit(2) .duration(100) @@ -18,11 +18,11 @@ ServerEvents.recipes((event) => { event.recipes.gtceu .assembler(`${woodType}_stairs`) - .itemInputs(`6x ${woodType}_planks`) + .itemInputs(`3x ${woodType}_planks`) .itemOutputs(`4x ${woodType}_stairs`) - .circuit(1) + .circuit(7) .duration(100) - .EUt(1); + .EUt(4); } woodUnification("warped"); diff --git a/kubejs/server_scripts/tags/items.js b/kubejs/server_scripts/tags/items.js index 242e8e0..b8a2024 100644 --- a/kubejs/server_scripts/tags/items.js +++ b/kubejs/server_scripts/tags/items.js @@ -9,4 +9,7 @@ ServerEvents.tags("item", (event) => { event.add("forge:meat", "minecraft:cooked_mutton"); event.add("forge:meat", "minecraft:rabbit"); event.add("forge:meat", "minecraft:cooked_rabbit"); + + event.add("forge:enchanting_fuels", "gtceu:lazurite_gem"); + event.add("forge:enchanting_fuels", "gtceu:sodalite_gem"); }); diff --git a/kubejs/startup_scripts/dimension_markers.js b/kubejs/startup_scripts/dimension_markers.js new file mode 100644 index 0000000..23e38e5 --- /dev/null +++ b/kubejs/startup_scripts/dimension_markers.js @@ -0,0 +1,6 @@ +GTCEuStartupEvents.registry("gtceu:dimension_marker", event => { + event.create("javd:void") + .iconSupplier(() => Item.of("javd:portal_block").getItem()) + .tier(0) + .overrideName("Void Dimension"); +}); diff --git a/mods/gregtechceu-modern.pw.toml b/mods/gregtechceu-modern.pw.toml index d627cd9..3cb5ddc 100644 --- a/mods/gregtechceu-modern.pw.toml +++ b/mods/gregtechceu-modern.pw.toml @@ -1,13 +1,13 @@ name = "GregTech CEu Modern" -filename = "gtceu-1.20.1-7.2.0.jar" +filename = "gtceu-1.20.1-7.4.0.jar" side = "both" [download] hash-format = "sha1" -hash = "d41938569195b8b6a971a24f950f7999dfeba852" +hash = "19c638cb4913b0581da1e518771f41965f96932f" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 7022042 +file-id = 7262157 project-id = 890405 diff --git a/mods/jei.pw.toml b/mods/jei.pw.toml index 8b8fcfc..20d5ded 100644 --- a/mods/jei.pw.toml +++ b/mods/jei.pw.toml @@ -1,13 +1,13 @@ name = "Just Enough Items (JEI)" -filename = "jei-1.20.1-forge-15.20.0.112.jar" +filename = "jei-1.20.1-forge-15.20.0.127.jar" side = "both" [download] hash-format = "sha1" -hash = "f12b3781af6337794ae6e010420a97585360ea2f" +hash = "6c7684a0e9356f6d60d7b12a14caf6c644ee11ef" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 6600311 +file-id = 7270446 project-id = 238222 diff --git a/pack.toml b/pack.toml index 539a3d9..5d21129 100644 --- a/pack.toml +++ b/pack.toml @@ -1,13 +1,13 @@ name = "GregTech CEu Modern Community Pack" author = "ursamina" -version = "1.14.1" +version = "1.14.2" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "750d1e0446c3e5b86e7c79c93a4f162a049ed6d125f58aec07d2e6603ae16410" +hash = "679050f097e1c6eea213074aea6e0ecdef4a53ad9e828c98cf86d5fc11ee06ef" [versions] -forge = "47.4.6" +forge = "47.4.10" minecraft = "1.20.1" diff --git a/serverpack/start.ps1 b/serverpack/start.ps1 index 7eda20c..431f49b 100644 --- a/serverpack/start.ps1 +++ b/serverpack/start.ps1 @@ -1,8 +1,8 @@ $GAME_VERSION = "1.20.1" -$FORGE_VERSION = "1.20.1-47.4.6" +$FORGE_VERSION = "1.20.1-47.4.10" $FINDME_VERSION = "1.20.1-3.2.1d" -$PACK_TAG = "v1.14.1" +$PACK_TAG = "v1.14.2" $PACK_URI = "https://raw.githubusercontent.com/GregTechCEu/GregTech-Modern-Community-Pack/refs/tags/$PACK_TAG/pack.toml" # Ensure java is installed diff --git a/serverpack/start.sh b/serverpack/start.sh index d687829..064e3ca 100644 --- a/serverpack/start.sh +++ b/serverpack/start.sh @@ -1,7 +1,7 @@ #!/bin/bash -FORGE_VERSION="1.20.1-47.4.6" -PACK_TAG="v1.14.1" +FORGE_VERSION="1.20.1-47.4.10" +PACK_TAG="v1.14.2" # Ensure java is installed if ! command -v java >/dev/null 2>&1; then