diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4b4ce519..11049d162 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,13 +20,13 @@ jobs: name: 🖥️ Project Info runs-on: ubuntu-latest outputs: - project_version: ${{ steps.check.outputs.version }} - project_name: ${{ steps.pakku_info.outputs.name }} - project_full_name: ${{ steps.pakku_info.outputs.name }}-${{ steps.check.outputs.version }} + project_version: ${{ steps.check.outputs.project_version }} + project_name: ${{ steps.check.outputs.project_name }} + project_full_name: ${{ steps.check.outputs.project_name }}-${{ steps.check.outputs.project_version }} changelog: ${{ steps.changelog.outputs.description }} diff: ${{ steps.read_diff.outputs.diff }} - exists: ${{ steps.check_tag.outputs.exists }} - make_release: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'false' }} + exists: ${{ steps.check.outputs.exists }} + make_release: ${{ steps.check.outputs.make_release }} steps: - name: Checkout @@ -145,7 +145,7 @@ jobs: id: determine_version shell: bash run: | - if [ ${{ env.DEV_ENVIRONMENT }} ]; then + if ${{ env.DEV_ENVIRONMENT == 'true' }}; then echo "version=unreleased" >> $GITHUB_OUTPUT else echo "version=${{ steps.pakku_info.outputs.version }}" >> $GITHUB_OUTPUT @@ -159,16 +159,22 @@ jobs: version: ${{ steps.determine_version.outputs.version }} continue-on-error: true - - name: 🔍 Check if changelog is empty + - name: 🔍 Check id: check shell: bash run: | - if [ ${{ env.DEV_ENVIRONMENT || steps.changelog.outcome == 'failure' }} ]; then - echo "version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT - echo "status=Unreleased" >> $GITHUB_OUTPUT - else - echo "status=${{ env.RELEASE_TYPE }}" >> $GITHUB_OUTPUT - echo "version=${{ steps.pakku_info.outputs.version }}" >> $GITHUB_OUTPUT + echo "make_release=${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'false' }}" >> $GITHUB_OUTPUT + echo "exists=${{ steps.check_tag.outputs.exists }}" >> $GITHUB_OUTPUT + + echo "project_name=${{ steps.pakku_info.outputs.name }}" >> $GITHUB_OUTPUT + echo "project_version=${{ steps.pakku_info.outputs.version }}" >> $GITHUB_OUTPUT + echo "release_type=${{ env.RELEASE_TYPE }}" >> $GITHUB_OUTPUT + + echo "minecraft_version=${{ steps.pakku_lock_info.outputs.mc_versions }}" >> $GITHUB_OUTPUT + + if ${{ env.DEV_ENVIRONMENT == 'true' && steps.changelog.outcome == 'failure' }}; then + echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT + echo "release_type=Unreleased" >> $GITHUB_OUTPUT fi - name: 📄 Format diff @@ -185,14 +191,14 @@ jobs: uses: WcAServices/markdown-template-action@v1.1.1 with: template: | - 📃 **Name**: ${{ steps.pakku_info.outputs.name }} - 📃 **Release**: `${{ steps.check.outputs.version }}` - 📃 **Release Type**: `${{ steps.check.outputs.status }}` - 📃 **Game Version**: `${{ steps.pakku_lock_info.outputs.mc_versions }}` + 📃 **Name**: ${{ steps.check.outputs.project_name }} + 📃 **Release**: `${{ steps.check.outputs.project_version }}` + 📃 **Release Type**: `${{ steps.check.outputs.release_type }}` + 📃 **Game Version**: `${{ steps.check.outputs.minecraft_version }}` 📃 **Dev Environment**: `${{ env.DEV_ENVIRONMENT }}` - 📃 **Tag Exists**: `${{ steps.check_tag.outputs.exists }}` - 📃 **Make Release**: `${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'false' }}` + 📃 **Tag Exists**: `${{ steps.check.outputs.exists }}` + 📃 **Make Release**: `${{ steps.check.outputs.make_release }}` ${{ steps.changelog.outputs.description }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 14bf6f5eb..1bf502701 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,66 +1,67 @@ # Changelog -## [Unreleased] +## [0.9.2] ### Changes -- Fixed mining machines not working -- Fixed kaolin clay not generating in the overworld -- Updated field guide for 0.9 (oosyrag) -- Added speed boost to nanosuit leggings (SverhRazum-Nah) -- Updated max capacity of small vessel and crucible to be multiples of 144 (oosyrag) -- Added support for more armor trims from gems (Redeix) -- Added fishing nets (Redeix) -- Added more cloth alternatives (Redeix) -- Fixed milk curdling and olive oil recipes to be consistent with barrels/vats (TomPlop) -- Added universal circuits (from monifactory) for easier ae2 pattern upgrading (TomPlop) -- Added brine and vinegar recipes to GT machines (TomPlop) -- Increased Astikor Carts item size limit (Redeix) -- Changed some quests based on feedback -- Added recipes for digger helmet upgrades -- You can no longer use a blowpipe to hold hot ingots, but tongs have been buffed 6x instead -- You can no longer pick up regular ice with a saw to prevent moving around water sources, but you can craft packed ice instead if you need to cool off -- Added a temporary fix for the ULS-MV millstones/crushing wheels voiding poor raw ores -- Added a temporary fix for the mechanical mixer needing a programmed circuit item to work (craft them out of sticks) -- Fixed a duping exploit involving metal plated blocks -- Fixed some recipes that were using the wrong wrench tag -- Added an earlier way to get paracetamol (cures gregtech hazards) -- Removed recipes for firmalife sprinklers. Use GT pipes instead, those count as greenhouse walls now, and put your sprinklers on drums/fluid tanks/barrels -- Buffed the mixer glowstone recipe -- Nerfed kapok growth speed a little -- Added recipes to turn more things into biomass -- Added recipe to turn saplings into sticks -- Changed mud brick recipes to not require mortar any more -- Fixed not being able to pick up spring water or put it in a mixing bowl -- Changed rotation speed controller recipe -- Now you can put many more things on tool racks -- Buffed some nether mob loot tables -- Buffed piglin bartering table -- Buffed string from cobwebs, TFC shears now work on them too -- The overworld graphite vein now spawns in every stone type -- Granitic/basaltic mineral sand is now usable for iron in primitive age -- Fixed butchery knives missing anvil recipes -- Added recipes to craft GT's marble blocks -- Added assembler recipes for create deco's bricks, and made vanilla bricks consistent (4 instead of 1 per craft) -- Doubled the amount of train tracks you get per craft -- Fixed red alloy/tin alloy double ingots not needing to be heated for anvil recipes -- Long distance item/fluid pipes now need HV -- Kaolin patches now spawn less often in lush cave biomes -- Hid the xp bar because xp isn't used for anything -- Fixed visual workbench not working with tfc workbenches -- Removed adjustable chain gearshift and half of create:connected because they let you get around greate's restrictions -- Added recipe for vanilla campfire for people who like smoke particles -- Fixed AoE tools in bastion chests not having the AoE property -- Fixed various decorative glass block/pane recipes to be consistent -- Bricks and flagstones now use a cutter instead of an assembler -- Slimeballs now smelt into glue -- Removed some more duplicate recipes for vanilla items -- Hid some more things in JEI that aren't craftable -- Added fishing nets in many tiers for scooping fishies -- Added nylon string and fabric +- Fixed mining machines not working. +- Fixed kaolin clay not generating in the overworld. +- Updated field guide for 0.9 (oosyrag). +- Added speed boost to nanosuit leggings (SverhRazum-Nah). +- Updated max capacity of small vessel and crucible to be multiples of 144 (oosyrag). +- Added support for more armor trims from gems (Redeix). +- Added fishing nets (Redeix). +- Added more cloth alternatives (Redeix). +- Fixed milk curdling and olive oil recipes to be consistent with barrels/vats (TomPlop). +- Added universal circuits (from monifactory) for easier ae2 pattern upgrading (TomPlop). +- Added brine and vinegar recipes to GT machines (TomPlop). +- Increased Astikor Carts item size limit (Redeix). +- Changed some quests based on feedback. +- Added recipes for digger helmet upgrades. +- You can no longer use a blowpipe to hold hot ingots, but tongs have been buffed 6x instead. +- You can no longer pick up regular ice with a saw to prevent moving around water sources, but you can craft packed ice instead if you need to cool off. +- Added a temporary fix for the ULS-MV millstones/crushing wheels voiding poor raw ores. +- Added a temporary fix for the mechanical mixer needing a programmed circuit item to work (craft them out of sticks). +- Fixed a duping exploit involving metal plated blocks. +- Fixed some recipes that were using the wrong wrench tag. +- Added an earlier way to get paracetamol (cures gregtech hazards). +- Removed recipes for firmalife sprinklers. Use GT pipes instead, those count as greenhouse walls now, and put your sprinklers on drums/fluid tanks/barrels. +- Buffed the mixer glowstone recipe. +- Nerfed kapok growth speed a little. +- Added recipes to turn more things into biomass. +- Added recipe to turn saplings into sticks. +- Changed mud brick recipes to not require mortar any more. +- Fixed not being able to pick up spring water or put it in a mixing bowl. +- Changed rotation speed controller recipe. +- Now you can put many more things on tool racks. +- Buffed some nether mob loot tables. +- Buffed piglin bartering table. +- Buffed string from cobwebs, TFC shears now work on them too. +- The overworld graphite vein now spawns in every stone type. +- Granitic/basaltic mineral sand is now usable for iron in primitive age. +- Fixed butchery knives missing anvil recipes. +- Added recipes to craft GT's marble blocks. +- Added assembler recipes for create deco's bricks, and made vanilla bricks consistent (4 instead of 1 per craft). +- Doubled the amount of train tracks you get per craft. +- Fixed red alloy/tin alloy double ingots not needing to be heated for anvil recipes. +- Long distance item/fluid pipes now need HV. +- Kaolin patches now spawn less often in lush cave biomes. +- Hid the xp bar because xp isn't used for anything. +- Fixed visual workbench not working with tfc workbenches. +- Removed adjustable chain gearshift and half of create:connected because they let you get around greate's restrictions. +- Added recipe for vanilla campfire for people who like smoke particles. +- Fixed AoE tools in bastion chests not having the AoE property. +- Fixed various decorative glass block/pane recipes to be consistent. +- Bricks and flagstones now use a cutter instead of an assembler. +- Slimeballs now smelt into glue. +- Removed some more duplicate recipes for vanilla items. +- Hid some more things in JEI that aren't craftable. +- Added fishing nets in many tiers for scooping fishies. +- Added nylon string and fabric. - Added phantom string and fabric, created from phantom membranes--Replacing them in recipes - Added support for armor trims, fixed some broken textures, added a bunch of materials, and made a helper function. -- Added handcart recipe -- Allowed more blocks to be used as oven, forge, and bloomery insulation -- Fixed lang error with treated wood planks recipe +- Added handcart recipe. +- Allowed more blocks to be used as oven, forge, and bloomery insulation. +- Fixed lang error with treated wood planks recipe. +- Fixed bug with mmc package. ## [0.9.1] - 18.04.2025 ### Changes diff --git a/config/carryon-common.toml b/config/carryon-common.toml index 3f35a27b2..d34082042 100644 --- a/config/carryon-common.toml +++ b/config/carryon-common.toml @@ -59,7 +59,7 @@ #Entities that CAN be picked up (useWhitelistEntities must be true) allowedEntities = ["tfc:turkey", "tfc:dog", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:cat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit"] #Blocks that CAN be picked up (useWhitelistBlocks must be true) - allowedBlocks = ["#forge:chests/wooden", "#storagedrawers:drawers"] + allowedBlocks = ["framedblocks:framed_chest", "tfc:wood/chest/*", "tfc:wood/trapped_chest/*", "#forge:chests/wooden"] #Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true) allowedStacking = [] diff --git a/config/createaddition-common.toml b/config/createaddition-common.toml index ec628d986..dd18e3100 100644 --- a/config/createaddition-common.toml +++ b/config/createaddition-common.toml @@ -46,7 +46,7 @@ rolling_mill_processing_duration = 400 #Rolling Mill base stress impact. #Range: 0 ~ 1024 - rolling_mill_stress = 16 + rolling_mill_stress = 1 #Wires [wires] diff --git a/config/ftbquests/quests/chapters/multiblock_dilemma.snbt b/config/ftbquests/quests/chapters/multiblock_dilemma.snbt deleted file mode 100644 index 53dd8fc3c..000000000 --- a/config/ftbquests/quests/chapters/multiblock_dilemma.snbt +++ /dev/null @@ -1,220 +0,0 @@ -{ - default_hide_dependency_lines: false - default_quest_shape: "" - filename: "multiblock_dilemma" - group: "19428C6E7A36D463" - icon: "gtceu:electric_blast_furnace" - id: "41FEC6178ABF1998" - order_index: 2 - quest_links: [ - { - id: "787AC5F1A89ABE41" - linked_quest: "1E9BE8D3F8A602DC" - x: 4.5d - y: 0.0d - } - { - id: "5A1F54545034FC9F" - linked_quest: "3568BC9742092FC5" - x: 6.0d - y: 0.0d - } - { - id: "29EFA88DBC897F46" - linked_quest: "05ADBAE5B6F38956" - x: 7.5d - y: 0.0d - } - { - id: "1C71CBF1424099CE" - linked_quest: "10987A49F647279E" - shape: "rsquare" - x: 9.0d - y: 0.0d - } - { - id: "421BA5ADC26DFB19" - linked_quest: "4AEAC79007790BD8" - shape: "rsquare" - x: 10.5d - y: 0.0d - } - { - id: "27D3C414C3E19143" - linked_quest: "1BE779AF4487E3EB" - shape: "rsquare" - x: 10.5d - y: 1.5d - } - { - id: "7E75AAD105D31F26" - linked_quest: "07906458E1A15683" - shape: "rsquare" - x: 9.0d - y: 1.5d - } - { - id: "321893F87228A360" - linked_quest: "16E7CAC7BC8BFD8E" - shape: "rsquare" - x: 7.5d - y: 1.5d - } - { - id: "7888064372044AD3" - linked_quest: "6DDDE2268B691F74" - shape: "rsquare" - x: 6.0d - y: 1.5d - } - { - id: "5D2C26C1501A2CE1" - linked_quest: "2655B72C9FF3B372" - shape: "rsquare" - x: 4.5d - y: 1.5d - } - { - id: "2637BCFD9681EABF" - linked_quest: "53DC6E32C41C94C3" - x: 3.0d - y: 1.5d - } - { - id: "3003AF60FECF2899" - linked_quest: "33263404ED38C6D2" - shape: "rsquare" - x: 1.5d - y: 1.5d - } - { - id: "7D7392009AC28773" - linked_quest: "1BB40CCF17D00719" - shape: "rsquare" - x: 3.0d - y: 0.0d - } - { - id: "026F45422E5639EB" - linked_quest: "48141DBA683F6B5A" - x: 4.5d - y: 3.0d - } - { - id: "6F23E13DC672A3F5" - linked_quest: "24866E83B280C9AB" - shape: "rsquare" - x: 6.0d - y: 3.0d - } - { - id: "0096F2E970A04203" - linked_quest: "6958029B5514D4EC" - x: 7.5d - y: 3.0d - } - { - id: "0205B65B6C2405A2" - linked_quest: "528CE69DA4358B2E" - x: 9.0d - y: 3.0d - } - { - id: "2206AD45E6B2389C" - linked_quest: "77B7B1EDD19831E0" - x: 10.5d - y: 3.0d - } - { - icon: { - Count: 1 - id: "gtceu:turbine_rotor" - tag: { - GT.PartStats: { - Material: "neutronium" - } - } - } - id: "454772220042D94B" - linked_quest: "188A8C3DD38C2762" - shape: "rsquare" - x: 10.5d - y: 4.5d - } - { - id: "7B3367C356023F61" - linked_quest: "4E9DED9569AA17F5" - x: 9.0d - y: 4.5d - } - { - id: "246855660369CA56" - linked_quest: "0F539EC8D2361791" - shape: "rsquare" - x: 7.5d - y: 4.5d - } - { - id: "278D7192878C56AC" - linked_quest: "189F84D6C76CDC8B" - shape: "rsquare" - x: 6.0d - y: 4.5d - } - { - id: "18F88B89C6DD238E" - linked_quest: "1137D2BA7E03D685" - x: 4.5d - y: 4.5d - } - { - id: "052E542D4D30CC93" - linked_quest: "466AC4DD902115EF" - shape: "rsquare" - x: 3.0d - y: 4.5d - } - { - id: "6DA657FC3F725B0C" - linked_quest: "1AD309112ADD8D8D" - shape: "rsquare" - x: 1.5d - y: 4.5d - } - { - id: "26A69E20AEC61DF1" - linked_quest: "249FA99AADAC3710" - shape: "rsquare" - x: 1.5d - y: 0.0d - } - { - id: "7D67FF93BFAF6A4A" - linked_quest: "328CFD483C26EA44" - shape: "rsquare" - x: 1.5d - y: 6.0d - } - { - id: "1D2DEC9BC14B9F64" - linked_quest: "546CC03435E763CF" - x: 7.5d - y: 6.0d - } - { - id: "0BAD33188878F715" - linked_quest: "24366846FDA52CE3" - x: 9.0d - y: 6.0d - } - { - id: "2B1E630DF1ED5624" - linked_quest: "023FF9633765A0EB" - x: 10.5d - y: 6.0d - } - ] - quests: [ ] - subtitle: ["A handy reference of all the multiblocks"] - title: "Multiblock Dilemma" -} diff --git a/config/ftbquests/quests/chapters/progression.snbt b/config/ftbquests/quests/chapters/progression.snbt index cd9b367f9..90759569a 100644 --- a/config/ftbquests/quests/chapters/progression.snbt +++ b/config/ftbquests/quests/chapters/progression.snbt @@ -12,7 +12,7 @@ } } id: "28EBC0FF82EFD94B" - order_index: 3 + order_index: 2 quest_links: [ { id: "77A0335E38D755CA" @@ -20,7 +20,7 @@ shape: "rsquare" size: 0.8d x: 0.0d - y: 1.0d + y: 2.0d } { id: "750818879C23F373" @@ -28,7 +28,7 @@ shape: "rsquare" size: 0.8d x: 1.0d - y: 2.0d + y: 3.0d } { id: "0074100DE2B5BE5A" @@ -36,7 +36,7 @@ shape: "rsquare" size: 0.8d x: 2.0d - y: 0.0d + y: 1.0d } { id: "1C05814535C12FED" @@ -44,7 +44,7 @@ shape: "rsquare" size: 0.75d x: 1.0d - y: 1.0d + y: 2.0d } { id: "513A34184609CA31" @@ -52,7 +52,7 @@ shape: "rsquare" size: 0.75d x: 1.0d - y: 0.0d + y: 1.0d } { id: "22CF428EE30F5B4B" @@ -60,7 +60,7 @@ shape: "rsquare" size: 0.8d x: 2.0d - y: 1.0d + y: 2.0d } { id: "33618A4FD8ED62D7" @@ -68,7 +68,7 @@ shape: "rsquare" size: 0.75d x: 2.0d - y: 2.0d + y: 3.0d } { id: "2B8FBCD290196265" @@ -76,7 +76,7 @@ shape: "rsquare" size: 0.8d x: 2.0d - y: 4.0d + y: 5.0d } { id: "0E8AC841C484408C" @@ -84,7 +84,7 @@ shape: "rsquare" size: 0.8d x: 2.0d - y: -1.0d + y: 0.0d } { id: "6ABFBA6855A6E7E9" @@ -92,7 +92,7 @@ shape: "rsquare" size: 0.8d x: 3.0d - y: 2.0d + y: 3.0d } { id: "629EAE6BC0519572" @@ -100,7 +100,7 @@ shape: "rsquare" size: 0.75d x: 3.0d - y: 3.0d + y: 4.0d } { id: "59568D32C47265ED" @@ -108,7 +108,7 @@ shape: "rsquare" size: 0.75d x: 3.0d - y: 4.0d + y: 5.0d } { id: "42DA2C0B99DB2545" @@ -116,7 +116,7 @@ shape: "rsquare" size: 0.8d x: 3.0d - y: 5.0d + y: 6.0d } { id: "39C4E4082B9B5731" @@ -124,7 +124,7 @@ shape: "rsquare" size: 0.8d x: 4.0d - y: 3.0d + y: 4.0d } { id: "346904314F61ABDB" @@ -132,7 +132,7 @@ shape: "rsquare" size: 0.75d x: 4.0d - y: 4.0d + y: 5.0d } { id: "1C0407D7B45603FC" @@ -140,7 +140,7 @@ shape: "rsquare" size: 0.75d x: 4.0d - y: 5.0d + y: 6.0d } { id: "20BCF31B1430ECFC" @@ -148,7 +148,7 @@ shape: "rsquare" size: 0.8d x: 4.0d - y: 6.0d + y: 7.0d } { id: "384FE989BF9BD89D" @@ -156,7 +156,7 @@ shape: "rsquare" size: 0.8d x: 6.0d - y: 5.0d + y: 6.0d } { id: "3DD1B0AE6630A8E5" @@ -164,7 +164,7 @@ shape: "rsquare" size: 0.8d x: 6.0d - y: 6.0d + y: 7.0d } { id: "519774012E47875A" @@ -172,7 +172,7 @@ shape: "rsquare" size: 0.8d x: 6.0d - y: 7.0d + y: 8.0d } { id: "0B488F9F519FBA61" @@ -180,7 +180,7 @@ shape: "rsquare" size: 0.8d x: 6.0d - y: 8.0d + y: 9.0d } { id: "025C3D8C61A9C011" @@ -188,7 +188,7 @@ shape: "rsquare" size: 0.8d x: 5.0d - y: 4.0d + y: 5.0d } { id: "54F1B023BEC98314" @@ -196,7 +196,7 @@ shape: "rsquare" size: 0.75d x: 5.0d - y: 5.0d + y: 6.0d } { id: "4EABE2BF51A06FC8" @@ -204,7 +204,7 @@ shape: "rsquare" size: 0.75d x: 5.0d - y: 6.0d + y: 7.0d } { id: "607E9492E895927E" @@ -212,95 +212,95 @@ shape: "rsquare" size: 0.8d x: 5.0d - y: 7.0d + y: 8.0d } { id: "709FB8C1561E7BB8" linked_quest: "1646BF9194100E57" - x: -1.0d - y: -5.0d + x: -0.99d + y: -5.12d } { id: "499941B0EDEFBF54" linked_quest: "1C55AE6AD5BDE304" - x: 0.0d - y: -5.0d + x: 0.010000000000000009d + y: -5.12d } { id: "10F2DA9FCC5E3860" linked_quest: "6B08799BCFD01D3D" - x: 1.0d - y: -5.0d + x: 1.01d + y: -5.12d } { id: "72CBEEAD5A41685E" linked_quest: "069FD86133D7D582" - x: 2.0d - y: -5.0d + x: 2.01d + y: -5.12d } { id: "76C69275A82861C8" linked_quest: "7A1E3C3A2D699C5B" - x: 3.0d - y: -5.0d + x: 3.01d + y: -5.12d } { id: "6C144735C40EE615" linked_quest: "2FCBA0D780DBDA9E" - x: 4.0d - y: -5.0d + x: 4.01d + y: -5.12d } { id: "5FDCCB7CE9DACB34" linked_quest: "4C7C0F6A6598BC24" - x: 5.0d - y: -5.0d + x: 5.01d + y: -5.12d } { id: "4ACE1AFCEDC37A05" linked_quest: "6AF3A40BC9CE7122" - x: 6.0d - y: -5.0d + x: 6.01d + y: -5.12d } { id: "1EA07F998161450C" linked_quest: "30A6EDDF25A5E5F8" shape: "rsquare" size: 0.66d - x: 2.0d - y: -4.0d + x: 2.01d + y: -4.12d } { id: "532482B324E31386" linked_quest: "1776FA1F3255731E" shape: "rsquare" size: 0.66d - x: 3.0d - y: -4.0d + x: 3.01d + y: -4.12d } { id: "0F86FC5CD130B2E1" linked_quest: "78277DBC07D3C45C" shape: "rsquare" size: 0.66d - x: 4.0d - y: -4.0d + x: 4.01d + y: -4.12d } { id: "7D227159C48FAB94" linked_quest: "0DC999F79A685194" shape: "rsquare" size: 0.66d - x: 5.0d - y: -4.0d + x: 5.01d + y: -4.12d } { id: "718938D16A6098A7" linked_quest: "35F13B6D60361904" shape: "rsquare" size: 0.66d - x: 6.0d - y: -4.0d + x: 6.01d + y: -4.12d } { id: "713A4F2E798A8BDB" @@ -308,7 +308,73 @@ shape: "rsquare" size: 0.8d x: 2.0d - y: 3.0d + y: 4.0d + } + { + id: "1E40A675803FC0EE" + linked_quest: "033E74BC588E7EAD" + shape: "rsquare" + size: 0.8d + x: 0.0d + y: -1.0d + } + { + id: "086F15BC0794B952" + linked_quest: "3D8174C64DDC268B" + shape: "rsquare" + size: 0.8d + x: 0.0d + y: 1.0d + } + { + id: "3D882E672333DFDB" + linked_quest: "2C35D4E01AEC02AA" + shape: "rsquare" + size: 0.8d + x: 0.0d + y: 0.0d + } + { + id: "54253615E949F3FD" + linked_quest: "48A8E3210B2BAE1C" + size: 0.85d + x: 0.0d + y: -7.6499999999999995d + } + { + id: "6DE3523492F7488F" + linked_quest: "3C173357029AB649" + size: 0.85d + x: 1.0d + y: -7.6499999999999995d + } + { + id: "15C67D0A68F367B8" + linked_quest: "174DA15847665CF8" + size: 0.85d + x: 1.9999999999999998d + y: -7.6499999999999995d + } + { + id: "3FB2B4E7A1EA2511" + linked_quest: "04DE7C58F20B535A" + size: 0.85d + x: 3.0d + y: -7.6499999999999995d + } + { + id: "6DE6915952A42CFE" + linked_quest: "52DAF93E2F3D688A" + size: 0.85d + x: 4.0d + y: -7.6499999999999995d + } + { + id: "51370C0C07149D25" + linked_quest: "56CA2EB7812529C5" + size: 0.85d + x: 5.0d + y: -7.6499999999999995d } ] quests: [ @@ -478,7 +544,7 @@ size: 0.85d title: "&8ULV&r Circuits" x: -1.0d - y: -1.0d + y: 0.0d } { dependencies: [ @@ -501,7 +567,7 @@ size: 0.85d title: "&7LV&r Circuits" x: -1.0d - y: 0.0d + y: 1.0d } { dependencies: [ @@ -521,7 +587,7 @@ size: 0.85d title: "&bMV&r Circuits" x: -1.0d - y: 1.0d + y: 2.0d } { dependencies: [ @@ -541,7 +607,7 @@ size: 0.85d title: "&6HV&r Circuits" x: -1.0d - y: 2.0d + y: 3.0d } { dependencies: [ @@ -560,7 +626,7 @@ size: 0.85d title: "&5EV&r Circuits" x: -1.0d - y: 3.0d + y: 4.0d } { dependencies: [ @@ -581,7 +647,7 @@ size: 0.85d title: "&1IV&r Circuits" x: -1.0d - y: 4.0d + y: 5.0d } { dependencies: [ @@ -606,7 +672,7 @@ size: 0.85d title: "&dLuV&r Circuits" x: -1.0d - y: 5.0d + y: 6.0d } { dependencies: [ @@ -622,7 +688,7 @@ size: 0.85d title: "&cZPM&r Circuits" x: -1.0d - y: 6.0d + y: 7.0d } { dependencies: [ @@ -637,7 +703,7 @@ size: 0.85d title: "&3UV&r Circuits" x: -1.0d - y: 7.0d + y: 8.0d } { dependencies: ["3B49BD004F38E1A2"] @@ -653,7 +719,7 @@ size: 0.85d title: "&4UHV&r Circuits" x: -1.0d - y: 8.0d + y: 9.0d } { dependencies: ["5B2696206205CB2E"] @@ -665,8 +731,8 @@ item: "gtceu:cupronickel_ingot" type: "item" }] - x: -1.0d - y: -4.0d + x: -0.99d + y: -4.12d } { dependencies: [ @@ -681,8 +747,8 @@ item: "gtceu:kanthal_ingot" type: "item" }] - x: 0.0d - y: -4.0d + x: 0.010000000000000009d + y: -4.12d } { dependencies: ["6958029B5514D4EC"] @@ -694,8 +760,8 @@ item: "gtceu:nichrome_ingot" type: "item" }] - x: 1.0d - y: -4.0d + x: 1.01d + y: -4.12d } ] subtitle: ["A step forward is always rewarding"] diff --git a/config/gtceu.yaml b/config/gtceu.yaml index acc5d5331..7cbef731e 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -40,7 +40,7 @@ recipes: # Whether to make miscellaneous recipes harder. # Default: false - hardMiscRecipes: true + hardMiscRecipes: false # Whether to make Glass related recipes harder. Default: true hardGlassRecipes: true diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index b2d6ae4f2..58da9d294 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -151,6 +151,20 @@ "item.tfg.luck_salvo": "Luck Salvo", "item.tfg.resistance_salvo": "Resistance Salvo", "item.tfg.paraffin_wax": "Paraffin Wax", + "item.tfg.flint_arrow_head": "Flint Arrow Head", + "item.tfg.fletching": "Fletching", + "item.tfg.phantom_silk": "Phantom Silk", + "item.tfg.phantom_thread": "Phantom Thread", + "item.tfg.polycaprolactam_fabric": "Polycaprolactam Fabric", + "item.tfg.polycaprolactam_string": "Polycaprolactam String", + "item.tfg.fishing_net.wood": "Wood Fishing Net", + "item.tfg.fishing_net.brass": "Brass Fishing Net", + "item.tfg.fishing_net.rose_gold": "Rose Gold Fishing Net", + "item.tfg.fishing_net.sterling_silver": "Sterling Silver Fishing Net", + "item.tfg.fishing_net.invar": "Invar Fishing Net", + "item.tfg.fishing_net.cupronickel": "Cupronickel Fishing Net", + "item.tfg.fishing_net.tin_alloy": "Tin Alloy Fishing Net", + "item.tfg.fishing_net.magnalium": "Magnalium Fishing Net", "item.tfg.conifer_rosin": "Conifer Rosin", "item.tfg.hardwood_strip": "Hardwood Strip", "item.tfg.soaked_hardwood_strip": "Soaked Hardwood Strip", @@ -177,30 +191,17 @@ "item.tfg.redblu_steel_hull_reinforcement": "Red & Blue Steel Hull Reinforcement", "item.tfg.aluminium_hull_reinforcement": "Aluminium Hull Reinforcement", "item.tfg.stainless_steel_hull_reinforcement": "Stainless Steel Hull Reinforcement", - "item.tfg.flint_arrow_head": "Flint Arrow Head", - "item.tfg.fletching": "Fletching", - "item.tfg.phantom_silk": "Phantom Silk", - "item.tfg.phantom_thread": "Phantom Thread", - "item.tfg.polycaprolactam_fabric": "Polycaprolactam Fabric", - "item.tfg.polycaprolactam_string": "Polycaprolactam String", - "item.tfg.fishing_net.wood": "Wood Fishing Net", - "item.tfg.fishing_net.brass": "Brass Fishing Net", - "item.tfg.fishing_net.rose_gold": "Rose Gold Fishing Net", - "item.tfg.fishing_net.sterling_silver": "Sterling Silver Fishing Net", - "item.tfg.fishing_net.invar": "Invar Fishing Net", - "item.tfg.fishing_net.cupronickel": "Cupronickel Fishing Net", - "item.tfg.fishing_net.tin_alloy": "Tin Alloy Fishing Net", - "item.tfg.fishing_net.magnalium": "Magnalium Fishing Net", - "item.ulv_universal_circuit": "ULV Universal Circuit", - "item.lv_universal_circuit": "LV Universal Circuit", - "item.mv_universal_circuit": "MV Universal Circuit", - "item.hv_universal_circuit": "HV Universal Circuit", - "item.ev_universal_circuit": "EV Universal Circuit", - "item.iv_universal_circuit": "IV Universal Circuit", - "item.luv_universal_circuit": "LuV Universal Circuit", - "item.zpm_universal_circuit": "ZPM Universal Circuit", - "item.uv_universal_circuit": "UV Universal Circuit", - "item.uhv_universal_circuit": "UHV Universal Circuit", + "item.tfg.titanium_hull_reinforcement": "Titanium Hull Reinforcement", + "item.tfg.ulv_universal_circuit": "ULV Universal Circuit", + "item.tfg.lv_universal_circuit": "LV Universal Circuit", + "item.tfg.mv_universal_circuit": "MV Universal Circuit", + "item.tfg.hv_universal_circuit": "HV Universal Circuit", + "item.tfg.ev_universal_circuit": "EV Universal Circuit", + "item.tfg.iv_universal_circuit": "IV Universal Circuit", + "item.tfg.luv_universal_circuit": "LuV Universal Circuit", + "item.tfg.zpm_universal_circuit": "ZPM Universal Circuit", + "item.tfg.uv_universal_circuit": "UV Universal Circuit", + "item.tfg.uhv_universal_circuit": "UHV Universal Circuit", "material.tfg.latex": "Latex", "material.tfg.vulcanized_latex": "Vulcanized Latex", "material.tfg.fluix": "Fluix", @@ -298,6 +299,54 @@ "gtceu:rich_raw_sphalerite": "Deprecated Item, Craft to Upgrade", "gtceu:raw_sphalerite": "Deprecated Item, Craft to Upgrade", "gtceu:poor_raw_sphalerite": "Deprecated Item, Craft to Upgrade", + "trim_material.tfc.almandine_tfc": "Almandine", + "trim_material.tfc.andradite_tfc": "Andradite", + "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", + "trim_material.tfc.cinnabar_tfc": "Cinnabar", + "trim_material.tfc.coal_tfc": "Coal", + "trim_material.tfc.diamond_tfc": "Diamond", + "trim_material.tfc.emerald_tfc": "Emerald", + "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", + "trim_material.tfc.grossular_tfc": "Grossular", + "trim_material.tfc.rutile_tfc": "Rutile", + "trim_material.tfc.lazurite_tfc": "Lazurite", + "trim_material.tfc.pyrope_tfc": "Pyrope", + "trim_material.tfc.rock_salt_tfc": "Rock Salt", + "trim_material.tfc.ruby_tfc": "Ruby", + "trim_material.tfc.salt_tfc": "salt", + "trim_material.tfc.sapphire_tfc": "Sapphire", + "trim_material.tfc.sodalite_tfc": "Sodalite", + "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.spessartine_tfc": "Spessartine", + "trim_material.tfc.topaz_tfc": "Topaz", + "trim_material.tfc.uvarovite_tfc": "Uvarovite", + "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", + "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", + "trim_material.tfc.quartzite_tfc": "Quartzite", + "trim_material.tfc.realgar_tfc": "Realgar", + "trim_material.tfc.malachite_tfc": "Malachite", + "trim_material.tfc.glass_tfc": "Glass", + "trim_material.tfc.olivine_tfc": "Olivine", + "trim_material.tfc.opal_tfc": "Opal", + "trim_material.tfc.amethyst_tfc": "Amethyst", + "trim_material.tfc.lapis_tfc": "Lapis", + "trim_material.tfc.apatite_tfc": "Apatite", + "trim_material.tfc.red_garnet_tfc": "Red Garnet", + "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", + "trim_material.tfc.monazite_tfc": "Monazite", + "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", + "trim_material.tfc.fluix_tfc": "Fluix", + "trim_material.tfc.silver_tfc": "Silver", + "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", + "trim_material.tfc.gold_tfc": "Gold", + "trim_material.tfc.rose_gold_tfc": "Rose Gold", + "trim_material.tfc.nickel_tfc": "Nickel", + "trim_material.tfc.platinum_tfc": "Platinum", + "trim_material.tfc.titanium_tfc": "Titanium", + "trim_material.tfc.bismuth_tfc": "Bismuth", + "trim_material.tfc.neutronium_tfc": "Neutronium", + "trim_material.tfc.pyrite_tfc": "Pyrite", + "trim_material.tfc.redx_tfc": "RedX", "quests.naming-1": "t - Title", "quests.naming-2": "st - Subtitle", "quests.naming-3": "d* - Description, where * description number, for example: d1, d2, d3, d4...", diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index baa860369..f755ae809 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -267,14 +267,14 @@ const registerCreateRecipes = (event) => { A: '#forge:screws/wrought_iron', B: '#forge:plates/brass', C: '#forge:rods/black_steel', - D: '#forge:gears/steel', + D: '#forge:small_gears/steel', E: '#forge:tools/hammers', F: '#forge:storage_blocks/copper', G: '#forge:tools/screwdrivers', }).id('tfg:create/shaped/steam_engine') event.recipes.gtceu.assembler('tfg:create/steam_engine') - .itemInputs('2x #forge:screws/wrought_iron', '#forge:plates/brass', '2x #forge:rods/red_steel', '#forge:gears/steel', '#forge:storage_blocks/copper') + .itemInputs('2x #forge:screws/wrought_iron', '#forge:plates/brass', '2x #forge:rods/red_steel', '#forge:small_gears/steel', '#forge:storage_blocks/copper') .circuit(3) .itemOutputs('create:steam_engine') .duration(200) diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 6b1de2743..d175cd9ab 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -13,7 +13,7 @@ const registerCreateAdditionsRecipes = (event) => { ], { A: 'create:precision_mechanism', B: 'greate:steel_shaft', - C: '#forge:gears/black_steel', + C: '#forge:double_plates/black_steel', D: '#gtceu:circuits/ulv', E: 'gtceu:ulv_machine_hull' }).id('tfg:create_additions/shaped/rolling_mill') diff --git a/kubejs/server_scripts/create_horse_power/recipes.js b/kubejs/server_scripts/create_horse_power/recipes.js index 865f155d6..652bfb2b2 100644 --- a/kubejs/server_scripts/create_horse_power/recipes.js +++ b/kubejs/server_scripts/create_horse_power/recipes.js @@ -11,7 +11,7 @@ function registerCreateHorsePowerBlockRecipes(event) { 'CCC' ], { A: '#forge:fences/wooden', - B: '#forge:gears/bronze', + B: '#forge:small_gears/bronze', C: '#tfc:rock/raw', D: '#forge:tools/hammers', E: '#tfc:chisels' @@ -25,7 +25,7 @@ function registerCreateHorsePowerBlockRecipes(event) { 'CCC' ], { A: '#forge:fences/wooden', - B: '#forge:gears/bismuth_bronze', + B: '#forge:small_gears/bismuth_bronze', C: '#tfc:rock/raw', D: '#forge:tools/hammers', E: '#tfc:chisels' @@ -39,7 +39,7 @@ function registerCreateHorsePowerBlockRecipes(event) { 'CCC' ], { A: '#forge:fences/wooden', - B: '#forge:gears/black_bronze', + B: '#forge:small_gears/black_bronze', C: '#tfc:rock/raw', D: '#forge:tools/hammers', E: '#tfc:chisels' diff --git a/kubejs/server_scripts/endermanoverhaul/recipes.js b/kubejs/server_scripts/endermanoverhaul/recipes.js index 5701fa39f..90c2ec970 100644 --- a/kubejs/server_scripts/endermanoverhaul/recipes.js +++ b/kubejs/server_scripts/endermanoverhaul/recipes.js @@ -3,5 +3,6 @@ function registerEndermanOverhaulRecipes(event) { event.remove({ id: 'endermanoverhaul:corrupted_shield' }) + event.remove({ id: 'endermanoverhaul:corrupted_blade' }) } \ No newline at end of file diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index 09b318c39..44ae555e0 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -61,22 +61,22 @@ function registerGreateRecipes(event) { // TODO: recycling recipes for these? event.shapeless('greate:steel_cogwheel', ['greate:steel_shaft', '#forge:small_gears/wrought_iron', '#forge:tools/wrenches']) .id('greate:shapeless/steel_cogwheel') - event.shapeless('greate:large_steel_cogwheel', ['greate:steel_shaft', '#forge:gears/wrought_iron', '#forge:tools/wrenches']) + event.shapeless('greate:large_steel_cogwheel', ['greate:steel_shaft', '#forge:small_gears/wrought_iron','#forge:small_gears/wrought_iron', '#forge:tools/wrenches']) .id('greate:shapeless/large_steel_cogwheel'); event.shapeless('greate:aluminium_cogwheel', ['greate:aluminium_shaft', '#forge:small_gears/steel', '#forge:tools/wrenches']) .id('greate:shapeless/aluminium_cogwheel') - event.shapeless('greate:large_aluminium_cogwheel', ['greate:aluminium_shaft', '#forge:gears/steel', '#forge:tools/wrenches']) + event.shapeless('greate:large_aluminium_cogwheel', ['greate:aluminium_shaft', '#forge:small_gears/steel', '#forge:small_gears/steel', '#forge:tools/wrenches']) .id('greate:shapeless/large_aluminium_cogwheel'); event.shapeless('greate:stainless_steel_cogwheel', ['greate:stainless_steel_shaft', '#forge:small_gears/aluminium', '#forge:tools/wrenches']) .id('greate:shapeless/stainless_steel_cogwheel') - event.shapeless('greate:large_stainless_steel_cogwheel', ['greate:stainless_steel_shaft', '#forge:gears/aluminium', '#forge:tools/wrenches']) + event.shapeless('greate:large_stainless_steel_cogwheel', ['greate:stainless_steel_shaft', '#forge:small_gears/aluminium', '#forge:small_gears/aluminium', '#forge:tools/wrenches']) .id('greate:shapeless/large_stainless_steel_cogwheel'); event.shapeless('greate:titanium_cogwheel', ['greate:titanium_shaft', '#forge:small_gears/stainless_steel', '#forge:tools/wrenches']) .id('greate:shapeless/titanium_cogwheel') - event.shapeless('greate:large_titanium_cogwheel', ['greate:titanium_shaft', '#forge:gears/stainless_steel', '#forge:tools/wrenches']) + event.shapeless('greate:large_titanium_cogwheel', ['greate:titanium_shaft', '#forge:small_gears/stainless_steel', '#forge:small_gears/stainless_steel', '#forge:tools/wrenches']) .id('greate:shapeless/large_titanium_cogwheel'); // #endregion @@ -90,7 +90,7 @@ function registerGreateRecipes(event) { ], { A: 'tfc:quern', B: 'tfc:handstone', - C: '#forge:gears/bronze', + C: '#forge:small_gears/bronze', D: '#forge:tools/hammers', E: '#forge:tools/saws' }).id('greate:shaped/andesite_alloy_millstone') @@ -102,7 +102,7 @@ function registerGreateRecipes(event) { ], { A: 'tfc:quern', B: 'tfc:handstone', - C: '#forge:gears/bismuth_bronze', + C: '#forge:small_gears/bismuth_bronze', D: '#forge:tools/hammers', E: '#forge:tools/saws' }).id('greate:shaped/andesite_alloy_millstone2') @@ -114,7 +114,7 @@ function registerGreateRecipes(event) { ], { A: 'tfc:quern', B: 'tfc:handstone', - C: '#forge:gears/black_bronze', + C: '#forge:small_gears/black_bronze', D: '#forge:tools/hammers', E: '#forge:tools/saws' }).id('greate:shaped/andesite_alloy_millstone3') @@ -126,7 +126,7 @@ function registerGreateRecipes(event) { ], { A: '#forge:smooth_stone', B: 'gtceu:treated_wood_slab', - C: '#forge:gears/steel', + C: '#forge:small_gears/steel', D: '#forge:tools/hammers', E: '#forge:tools/wrenches', F: '#forge:dusts/diamond' diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index b38223a16..3ee3cf82a 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -76,25 +76,25 @@ function registerGreateRecyclingRecipes(event) { event.shapeless('#forge:small_gears/wrought_iron', ['greate:steel_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:steel_shaft', - event.shapeless('#forge:gears/wrought_iron', ['greate:large_steel_cogwheel'])) + event.shapeless('2x #forge:small_gears/wrought_iron', ['greate:large_steel_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:aluminium_shaft', event.shapeless('#forge:small_gears/steel', ['greate:aluminium_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:aluminium_shaft', - event.shapeless('#forge:gears/steel', ['greate:large_aluminium_cogwheel'])) + event.shapeless('2x #forge:small_gears/steel', ['greate:large_aluminium_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:stainless_steel_shaft', event.shapeless('#forge:small_gears/aluminium', ['greate:stainless_steel_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:stainless_steel_shaft', - event.shapeless('#forge:gears/aluminium', ['greate:large_stainless_steel_cogwheel'])) + event.shapeless('2x #forge:small_gears/aluminium', ['greate:large_stainless_steel_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:titanium_shaft', event.shapeless('#forge:small_gears/stainless_steel', ['greate:titanium_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:titanium_shaft', - event.shapeless('#forge:gears/stainless_steel', ['greate:large_titanium_cogwheel'])) + event.shapeless('2x #forge:small_gears/stainless_steel', ['greate:large_titanium_cogwheel'])) // #endregion diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 945066891..94042afbd 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -961,6 +961,13 @@ const registerGTCEURecipes = (event) => { .duration(100) .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.centrifuge('tfg:centrifuge_rosin') + .itemInputs('tfg:conifer_rosin') + .outputFluids(Fluid.of('gtceu:glue', 50)) + .itemOutputs('2x #forge:dusts/carbon') + .chancedOutput('gtceu:plant_ball', 1000, 850) + .duration(400) + .EUt(GTValues.VA[GTValues.ULV]) event.recipes.createSequencedAssembly([ 'gtceu:ulv_voltage_coil', diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 9c6a6e520..d1b104513 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -581,6 +581,54 @@ function registerGTCEuMachineRecipes(event) { //#endregion + //#region ULV Hatches + + event.recipes.shaped('gtceu:ulv_input_bus', [ + 'CAC', + 'CBC', + 'CDC' + ], { + A: '#forge:chests/wooden', + B: 'gtceu:ulv_machine_hull', + C: 'tfc:glue', + D: '#forge:tools/wrenches' + }).id('gtceu:shaped/ulv_input_bus') + + event.recipes.shaped('gtceu:ulv_output_bus', [ + 'CDC', + 'CBC', + 'CAC' + ], { + A: '#forge:chests/wooden', + B: 'gtceu:ulv_machine_hull', + C: 'tfc:glue', + D: '#forge:tools/wrenches' + }).id('gtceu:shaped/ulv_output_bus') + + event.recipes.shaped('gtceu:ulv_input_hatch', [ + 'CAC', + 'CBC', + 'CDC' + ], { + A: '#forge:glass', + B: 'gtceu:ulv_machine_hull', + C: 'tfc:glue', + D: '#forge:tools/wrenches' + }).id('gtceu:shaped/ulv_input_hatch') + + event.recipes.shaped('gtceu:ulv_output_hatch', [ + 'CDC', + 'CBC', + 'CAC' + ], { + A: '#forge:glass', + B: 'gtceu:ulv_machine_hull', + C: 'tfc:glue', + D: '#forge:tools/wrenches' + }).id('gtceu:shaped/ulv_output_hatch') + + //#endregion + //#region Long distance pipes event.recipes.gtceu.assembler('long_distance_item_pipe') diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 0ba83cb63..87bbfe62a 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -2,6 +2,9 @@ function removeGTCEURecipes(event) { + event.replaceInput({ input: 'gtceu:wood_drum' }, 'gtceu:wood_drum', 'minecraft:glass') + event.replaceInput({ input: 'minecraft:chest' }, 'minecraft:chest', '#forge:chests/wooden') + global.GTCEU_DISABLED_ITEMS.forEach(item => { event.remove({ input: item }) event.remove({ output: item }) diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index a8617193c..70d220efe 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -272,32 +272,7 @@ function registerTFCMetalsRecipes(event) { .tier(5) .id('tfc:anvil/blue_steel_ingot') - // Gears - event.recipes.tfc.anvil('gtceu:bronze_gear', '#forge:double_plates/bronze', ['punch_last', 'shrink_any', 'draw_any']) - .tier(2) - .id('tfc:anvil/bronze_gear') - event.recipes.tfc.anvil('gtceu:black_bronze_gear', '#forge:double_plates/black_bronze', ['punch_last', 'shrink_any', 'draw_any']) - .tier(2) - .id('tfc:anvil/black_bronze_gear') - event.recipes.tfc.anvil('gtceu:bismuth_bronze_gear', '#forge:double_plates/bismuth_bronze', ['punch_last', 'shrink_any', 'draw_any']) - .tier(2) - .id('tfc:anvil/bismuth_bronze_gear') - event.recipes.tfc.anvil('gtceu:wrought_iron_gear', '#forge:double_plates/wrought_iron', ['punch_last', 'shrink_any', 'draw_any']) - .tier(3) - .id('tfc:anvil/wrought_iron_gear') - event.recipes.tfc.anvil('gtceu:steel_gear', '#forge:double_plates/steel', ['punch_last', 'shrink_any', 'draw_any']) - .tier(4) - .id('tfc:anvil/steel_gear') - event.recipes.tfc.anvil('gtceu:black_steel_gear', '#forge:double_plates/black_steel', ['punch_last', 'shrink_any', 'draw_any']) - .tier(5) - .id('tfc:anvil/black_steel_gear') - event.recipes.tfc.anvil('gtceu:red_steel_gear', '#forge:double_plates/red_steel', ['punch_last', 'shrink_any', 'draw_any']) - .tier(6) - .id('tfc:anvil/red_steel_gear') - event.recipes.tfc.anvil('gtceu:blue_steel_gear', '#forge:double_plates/blue_steel', ['punch_last', 'shrink_any', 'draw_any']) - .tier(6) - .id('tfc:anvil/blue_steel_gear') - + // Small Gears event.recipes.tfc.anvil('gtceu:small_wrought_iron_gear', '#forge:ingots/wrought_iron', ['hit_last', 'shrink_second_last', 'draw_third_last']) .tier(3) .id('tfc:anvil/small_wrought_iron_gear') @@ -310,6 +285,12 @@ function registerTFCMetalsRecipes(event) { event.recipes.tfc.anvil('gtceu:small_bronze_gear', '#forge:ingots/bronze', ['hit_last', 'shrink_second_last', 'draw_third_last']) .tier(2) .id('tfc:anvil/small_bronze_gear') + event.recipes.tfc.anvil('gtceu:small_bismuth_bronze_gear', '#forge:ingots/bismuth_bronze', ['hit_last', 'shrink_second_last', 'draw_third_last']) + .tier(2) + .id('tfc:anvil/small_bismuth_bronze_gear') + event.recipes.tfc.anvil('gtceu:small_black_bronze_gear', '#forge:ingots/black_bronze', ['hit_last', 'shrink_second_last', 'draw_third_last']) + .tier(2) + .id('tfc:anvil/small_black_bronze_gear') // Cast iron -> Raw Iron Bloom event.recipes.tfc.bloomery('tfc:raw_iron_bloom', 'minecraft:charcoal', Fluid.of('gtceu:iron', 144), 15000) diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 76dde34b8..c35cfd5ea 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -539,6 +539,14 @@ function registerVintageImprovementsRecipes(event) { processingTime: 200 }).id('tfg:vi/vacuumizing/glue_from_resin') + event.custom({ + type: 'vintageimprovements:vacuumizing', + ingredients: [{ item: 'tfg:conifer_rosin' }], + results: [{ fluid: 'gtceu:glue', amount: 50 }], + heatRequirement: "heated", + processingTime: 200 + }).id('tfg:vi/vacuumizing/glue_from_rosin') + event.custom({ type: 'vintageimprovements:vacuumizing', ingredients: [{ item: 'minecraft:bone_meal' }, { fluid: 'tfc:limewater', amount: 500 }], diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index ac24ae217..5deb267fd 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -187,7 +187,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Wood.addFlags(GENERATE_SMALL_GEAR); GTMaterials.Brass.addFlags(GENERATE_SMALL_GEAR, GENERATE_RING); - GTMaterials.BismuthBronze.addFlags(GENERATE_GEAR); + GTMaterials.BlackBronze.addFlags(GENERATE_SMALL_GEAR); + GTMaterials.BismuthBronze.addFlags(GENERATE_SMALL_GEAR); GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD); GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_SMALL_GEAR); diff --git a/kubejs/startup_scripts/tfc/tag_prefixes.js b/kubejs/startup_scripts/tfc/tag_prefixes.js index d3a4026f5..81a1f11e9 100644 --- a/kubejs/startup_scripts/tfc/tag_prefixes.js +++ b/kubejs/startup_scripts/tfc/tag_prefixes.js @@ -2,7 +2,7 @@ const registerTFCTagPrefixes = (event) => { - TagPrefix.ORES.remove(TagPrefix.ore) + TagPrefix.ORES.remove(TagPrefix.oreDeepslate) TagPrefix.ORES.remove(TagPrefix.oreTuff) TagPrefix.ORES.remove(TagPrefix.oreSand) diff --git a/mods b/mods index ffeea9861..18f2162c9 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit ffeea9861f4266858a98d7be602b11eb3b8df073 +Subproject commit 18f2162c995feab284ea8048b405e3efb41aff96 diff --git a/pakku-lock.json b/pakku-lock.json index 8388d237c..ace72b7b5 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1892,7 +1892,7 @@ { "pakku_id": "vBb8GNgsYQrf2uAx", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "caelum", "modrinth": "caelum" @@ -4444,7 +4444,7 @@ "uCACXyPoJ4iKQzNG" ], "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "enderman-overhaul", "modrinth": "enderman-overhaul" @@ -6174,7 +6174,7 @@ { "pakku_id": "uCACXyPoJ4iKQzNG", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "geckolib", "modrinth": "geckolib" @@ -10587,7 +10587,7 @@ { "pakku_id": "pITFJNUBx59dBitK", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "primitive-creatures" }, @@ -10830,7 +10830,7 @@ { "pakku_id": "J5CyvX6hIaMAyzVK", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "resourceful-config", "modrinth": "resourceful-config" @@ -10891,7 +10891,7 @@ { "pakku_id": "cxgo5IyMJwtpohRH", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "resourceful-lib", "modrinth": "resourceful-lib" @@ -13017,6 +13017,27 @@ "modrinth": "lNttW2Xl" }, "files": [ + { + "type": "modrinth", + "file_name": "TerraFirmaGreg-Core-Modern-0.6.2.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/GNiiq3GB/TerraFirmaGreg-Core-Modern-0.6.2.jar", + "id": "GNiiq3GB", + "parent_id": "lNttW2Xl", + "hashes": { + "sha512": "b94362f2b923c83e6265f34b96a553356d265fa50221222ba2ab81091628e1a61cc2071b31f406d2f2823651247f2fce5b91634c78569cff861a9319ac5b4b8b", + "sha1": "cac7136e073528263a0064c3d70876a06106754a" + }, + "required_dependencies": [], + "size": 237159, + "date_published": "2025-04-27T07:12:55.828230Z" + }, { "type": "curseforge", "file_name": "TerraFirmaGreg-Core-Modern-0.6.1.jar", @@ -13040,30 +13061,6 @@ ], "size": 241598, "date_published": "2025-04-15T03:58:23.103Z" - }, - { - "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.6.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/V5J04AzG/TerraFirmaGreg-Core-Modern-0.6.1.jar", - "id": "V5J04AzG", - "parent_id": "lNttW2Xl", - "hashes": { - "sha512": "49b5afb2a8b17309d5787a373b765cbbfb266de547bd67a91aa82ee01f14c504601b60e50ec562e1474963ec7060bc11ae246ea8e282f1eb71138f5aa820a0ef", - "sha1": "5c23bc9e7d5948142b1d45ad8fca91e6a9467bf3" - }, - "required_dependencies": [ - "JaCEZUhg", - "7tG215v7" - ], - "size": 241598, - "date_published": "2025-04-15T03:58:27.227420Z" } ] }, diff --git a/pakku.json b/pakku.json index 796b3396b..b1c344387 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.9.1", + "version": "0.9.2", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [ @@ -219,6 +219,12 @@ }, "particular-reforged": { "side": "BOTH" + }, + "caelum": { + "side": "BOTH" + }, + "tfc-caelum": { + "side": "BOTH" } } } \ No newline at end of file