diff --git a/.github/ISSUE_TEMPLATE/003-dev-only.yml b/.github/ISSUE_TEMPLATE/003-dev-only.yml new file mode 100644 index 00000000..8024b87a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/003-dev-only.yml @@ -0,0 +1,9 @@ +name: 'Dev Only Issue' +description: "This select the dev only issue template." +body: + - type: textarea + attributes: + label: Task + description: What do you need to do? + validations: + required: true diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 0df638f3..77a814a7 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -36,7 +36,7 @@ jobs: - name: Download Resource Packs zip run: | GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases) - ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | head -1) + ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | grep "resourcepack" | head -1) ASSET_NAME=$(echo $ASSET_URL | awk -F'/' '{print $NF}') wget -O ./overrides/resourcepacks/$ASSET_NAME $ASSET_URL @@ -104,7 +104,8 @@ jobs: mv -vf .minecraft/* ./ zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip ./docker-compose.yml ./PleaseRead.txt ./log4j2_112-116.xml ./Install.bat ./Install.sh ./ServerStart.bat ./ServerStart.sh ./settings.bat ./settings.sh ./TmuxServer.sh ./bansoukou/ ./config/ ./local/ ./mods/ ./resources/ ./scripts/ - - name: Create GitHub Release + - if: matrix.version == 'NORMAL' + name: Create GitHub Release (NORMAL) uses: softprops/action-gh-release@v2 with: tag_name: ${{ env.VERSION_NORMAL }} @@ -114,4 +115,13 @@ jobs: ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip + + - if: matrix.version == 'LWJGL3' + name: Create GitHub Release (LWJGL3) + uses: softprops/action-gh-release@v2 + with: + tag_name: ${{ env.VERSION_LWJGL3 }} + prerelease: true + generate_release_notes: true + files: | ./${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-cmmc.zip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c54b6723..b89312e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: - name: Download Resource Packs zip run: | GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases) - ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | head -1) + ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | grep "resourcepack" | head -1) ASSET_NAME=$(echo $ASSET_URL | awk -F'/' '{print $NF}') wget -O ./overrides/resourcepacks/$ASSET_NAME $ASSET_URL @@ -114,17 +114,24 @@ jobs: mv -vf .minecraft/* ./ zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip ./docker-compose.yml ./PleaseRead.txt ./log4j2_112-116.xml ./Install.bat ./Install.sh ./ServerStart.bat ./ServerStart.sh ./settings.bat ./settings.sh ./TmuxServer.sh ./bansoukou/ ./config/ ./local/ ./mods/ ./resources/ ./scripts/ - - name: Create GitHub Release + - if: matrix.version == 'NORMAL' + name: Create GitHub Release (NORMAL) uses: softprops/action-gh-release@v2 with: - tag_name: "${{ env.VERSION_NORMAL }}" - draft: false - prerelease: false + tag_name: ${{ env.VERSION_NORMAL }} generate_release_notes: true files: | ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip + + - if: matrix.version == 'LWJGL3' + name: Create GitHub Release (LWJGL3) + uses: softprops/action-gh-release@v2 + with: + tag_name: ${{ env.VERSION_LWJGL3 }} + generate_release_notes: true + files: | ./${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-cmmc.zip # - name: Upload Curseforge diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md index b4ca2bc9..6eb74e71 100644 --- a/CHANGELOG_v2.md +++ b/CHANGELOG_v2.md @@ -1,3 +1,58 @@ +# v2.7.4 +## Modpack information +- Update Duct Tape quest. +- Update Blank Pattern quest. +- Add Programmed Circuit Card quest. +- Fix Darmstadtium quest. +- Fix Portable Scanner quest. + +## Modpack migration +- CoreMod fixes issues with DraconicAdditions. + 1. If there is `Draconic-Additions-1.12.2-1.17.0.45-universal` in the folder `bansoukou`, delete the whole folder. + 2. Delete `Draconic-Additions-1.12.2-1.17.0.45-universal-patched.jar` in the folder named `mods`. + 3. Rename `Draconic-Additions-1.12.2-1.17.0.45-universal.disabled` to `Draconic-Additions-1.12.2-1.17.0.45-universal.jar` in the folder named `mods`. + +## Fix config +### Spice of Life +- Food history will not get reset after every death. + +### Nutrition +- Nutrition will not get reset after every death. + +## New recipes +### AE2 Unofficial Extended Life +- Blank Pattern + +### Neeve's AE2: Extended Life Additions +- Programmed Circuit Card + +## New mods +- Red Core (0.5.1) + +## Update mods +- Advanced Backups (3.5.2 -> 3.6) +- AE2 Fluid Crafting Rework (2.5.13 -> 2.6.2) +- Better Questing Unofficial (4.2.2 -> 4.2.3) +- Controlling (3.0.12.3 -> 3.0.12.4) +- CraftPresence (2.3.9 -> 2.4.3) +- EnderStorage continuation (2.5.0 -> 2.6.2) +- GregTech Food Option (1.11.1 -> 1.11.2.1) +- GTExpert-Core (2.1.6 -> 2.2.4) +- Had Enough Items (4.25.4 -> 4.25.5) +- Neeve's AE2: Extended Life Additions (0.56.4 -> 0.56.6) +- PackagedAuto (1.0.13.47 -> 1.0.13.49) +- RenderLib (1.3.4 -> 1.3.5) +- VintageFix (0.4.2 -> 0.5.0) + +## Move mods +- 燐/Hesperus (0.2.9.3) -> Alfheim Lighting Engine (1.3) +- It's the little things (1.0.4) -> Valkyrie (0.2) + +## Del mods +- Nothirium (0.3.4) + +* * * + # v2.7.3 ## Modpack information - Update to CEu 2.8.8 and add new quests. @@ -7,14 +62,14 @@ - Fix quest issues. ## Update mods -- Advanced Backups -- AE2 Fluid Crafting Rework -- GregTech CE Unofficial -- GTExpert-Core -- Neeve's AE2: Extended Life Additions -- PackagedAuto -- Particle Culling -- Universal Tweaks +- Advanced Backups (3.5.1 -> 3.5.2) +- AE2 Fluid Crafting Rework (2.5.12 -> 2.5.13) +- GregTech CE Unofficial (2.8.7 -> 2.8.8) +- GTExpert-Core (2.1.4 -> 2.1.6) +- Neeve's AE2: Extended Life Additions (1.6.1 -> 1.6.2) +- PackagedAuto (1.0.12.46 -> 1.0.12.47) +- Particle Culling (1.4.2 -> 1.4.3) +- Universal Tweaks (1.10.0 -> 1.11.0) * * * @@ -25,23 +80,12 @@ - Add HV Chainsaw quest. ## New mods -- Particle Culling +- Particle Culling (1.4.2) ## Update mods -- Advanced Backups -- AE2 Fluid Crafting Rework -- Aqua Acrobatics -- Better Questing Unofficial -- CensoredASM -- ConfigAnytime -- CraftPresence -- GTExpert-Core -- Had Enough Items -- Modern Splash -- OpenComputers -- PackagedAuto -- RoughlyEnoughIDs -- VintageFix +- AE2 Fluid Crafting Rework (2.5.8 -> 2.5.12) +- Better Questing Unofficial (4.2.1 -> 4.2.2) +- PackagedAuto (1.0.12.43 -> 1.0.12.46) * * * @@ -49,17 +93,10 @@ ## Modpack information - Fix quests issues. -## Downgrade mods -- RoughlyEnoughIDs - ## Update mods -- AE2 Fluid Crafting Rework -- Better Questing Unofficial -- ConfigAnytime -- GTExpert-Core -- JourneyMap -- PackagedAuto -- VintageFix +- AE2 Fluid Crafting Rework (2.5.7 -> 2.5.8) +- Better Questing Unofficial (4.2.0 -> 4.2.1) +- PackagedAuto (0.11.40 -> 0.11.43) * * * @@ -68,27 +105,29 @@ - A major adjustment has been made in food related matter. - Thanks to @KatatsumuriPan, @MaimoCh, @hag-hag for his support!! +## New mods +- Better Questing Unofficial (4.2.0) +- Nutrition Unofficial Extended Life (4.13.0) +- Nutrition: GTCEu (1.0.0) +- ParticleCulling (1.4.2) + ## Remove mods -- FTB Quests (Forge) -- Item Filters +- FTB Quests (1220.9.0.15) +- Item Filters (1.0.4.2) ## Move mods -- FTB Backups (Forge) -> Advanced Backups +- FTB Backups (1220.9.0.15) -> Advanced Backups (3.5.1) ## Update mods -- AE2 Unofficial Extended Life -- GTExpert-Core -- PackagedAuto -- Roughly Enough IDs -- Universal Tweaks - -## New mods -- Nutrition Unofficial Extended Life -- Nutrition: GTCEu -- Better Questing Unofficial +- Inventory Bogo Sorter (1.4.7 -> 1.4.8) +- GregTech Food Option (1.11.0.1 -> 1.11.1) +- JourneyMap (5.7.1 -> 5.7.1p3) +- Modern Splash (1.3 -> 1.3.1) +- OpenComputers (1.8.3 -> 1.8.5) +- RoughlyEnoughIDs (2.0.7 -> 2.1.1) ## Formally introduced from compatibility mods -- The Spice of Life +- The Spice of Life (1.3.12) * * * @@ -98,26 +137,19 @@ - Includes multiplayer issues, performance tweaks and mod updates. - **ALSO, FUTURE UPDATES WILL BE 2.7.X, AND THE BACKPORTS OF 2.6.X VERSIONS WILL BE DEPRECATED!!** -## New mods -- Nutrition Unofficial Extended Life -- Nutrition: GTCEu -- Particle Culling - ## Update mods -- Advanced Backups -- AE2 Fluid Crafting Rework -- Aqua Acrobatics -- Better Questing Unofficial -- CensoredASM -- ConfigAnytime -- CraftPresence -- GTExpert-Core -- Had Enough Items -- Modern Splash -- OpenComputers -- PackagedAuto -- RoughlyEnoughIDs -- VintageFix +- Advanced Backups (3.4 -> 3.5.1) +- AE2 Fluid Crafting Rework (2.5.8 -> 2.5.12) +- Aqua Acrobatics (1.15.3 -> 1.15.4) +- CensoredASM (5.19 -> 5.20) +- ConfigAnytime (2.0 -> 3.0) +- CraftPresence (2.3.5 -> 2.3.9) +- GTExpert-Core (2.1.1 -> 2.1.4) +- Had Enough Items (4.25.2 -> 4.25.4) +- Modern Splash (1.3 -> 1.3.1) +- OpenComputers (1.8.3 -> 1.8.5) +- RoughlyEnoughIDs (2.0.7 -> 2.1.1) +- VintageFix (0.4.1 -> 0.4.2) * * * diff --git a/README.md b/README.md index 9376a571..0e0af792 100644 --- a/README.md +++ b/README.md @@ -55,21 +55,21 @@ | Age | Quest | Description | Migration | Tips | | ---- | ---- | ---- | ---- | --- | -| Stone Age | 〇 | 〇 | 〇 | - | -| Ore Veins | 〇 | 〇 | 〇 | - | -| Tier 0 - ULV | 〇 | 〇 | 〇 | - | -| Tier 1 - LV | 〇 | 〇 | 〇 | - | -| Tier 2 - MV | 〇 | 〇 | 〇 | - | -| Tier 3 - HV | 〇 | 〇 | 〇 | - | -| Tier 4 - EV | 〇 | 〇 | 〇 | - | -| Tier 5 - IV | 〇 | 〇 | 〇 | - | -| Tier 6 - LuV | 〇 | △ | 〇 | - | -| Tier 7 - ZPM | 〇 | △ | 〇 | - | -| Tier 8 - UV / UHV | 〇 | △ | 〇 | - | -| Tier 940 - Endgame | 〇 | × | 〇 | - | -| AE2 Unofficial Extended Life | 〇 | 〇 | 〇 | - | -| Draconic Evolution | 〇 | △ | 〇 | - | -| GCYM / GTFO/ GTEC | 〇 | 〇 | 〇 | - | +| Stone Age | 〇 | 〇 | 〇 | - | +| Ore Veins | 〇 | 〇 | 〇 | - | +| Tier 0 - ULV | 〇 | 〇 | 〇 | - | +| Tier 1 - LV | 〇 | 〇 | 〇 | - | +| Tier 2 - MV | 〇 | 〇 | 〇 | - | +| Tier 3 - HV | 〇 | 〇 | 〇 | - | +| Tier 4 - EV | 〇 | 〇 | 〇 | - | +| Tier 5 - IV | 〇 | 〇 | 〇 | - | +| Tier 6 - LuV | 〇 | △ | 〇 | - | +| Tier 7 - ZPM | 〇 | △ | 〇 | - | +| Tier 8 - UV / UHV | 〇 | △ | 〇 | - | +| Tier 940 - Endgame | 〇 | × | 〇 | - | +| AE2 Unofficial Extended Life | 〇 | 〇 | 〇 | - | +| Draconic Evolution | 〇 | △ | 〇 | - | +| GCYM / GTFO/ GTEC | 〇 | 〇 | 〇 | - | | Foods | × | × | × | Rescheduled | | Milestones | 〇 | △ | 〇 | - | @@ -77,4 +77,3 @@ ## Credits - Many Japanese Quests are also translated from the [GregTech-Community-Pack](https://github.com/GregTechCEu/GregTech-Community-Pack). -- The idea of Saw Mill and some other recipes are from [IMPACT: GREGTECH EDITION](https://gt-impact.github.io/) diff --git a/buildtools/gen-lwjgl3-manifest.py b/buildtools/gen-lwjgl3-manifest.py index 2e0995ad..17befd85 100644 --- a/buildtools/gen-lwjgl3-manifest.py +++ b/buildtools/gen-lwjgl3-manifest.py @@ -7,12 +7,14 @@ ## Run main function projectIDs = [ + 419286, # MixinBooter 870276, # ConfigAnytime + 873867, # Red Core + 874067, # Valkyrie + 910715, # Alfheim Lighting Engine 624967, # RenderLib - 624960, # Nothirium 409087, # Entity Culling 408853, # Particle Culling - 419286 # MixinBooter ] # Read manifest.json diff --git a/cmmc/README.md b/cmmc/README.md index 5171900b..02a73054 100644 --- a/cmmc/README.md +++ b/cmmc/README.md @@ -19,9 +19,8 @@ ## Self download mods -- [Fugue](https://github.com/CleanroomMC/Fugue/releases) by CleanroomMC -- [Scalar](https://github.com/CleanroomMC/Scalar/releases/tag/2.11.1) by CleanroomMC - +- [Fugue](https://www.curseforge.com/minecraft/mc-mods/fugue) by CleanroomMC +- [Scalar](https://www.curseforge.com/minecraft/mc-mods/scalar/files/5309537) by CleanroomMC ## Optional mods - [Vintagium](https://github.com/Asek3/sodium-1.12/actions) by Asek3 diff --git a/cmmc/instance.cfg b/cmmc/instance.cfg index b826cd31..2810ac03 100644 --- a/cmmc/instance.cfg +++ b/cmmc/instance.cfg @@ -17,10 +17,10 @@ OverrideJavaLocation=true OverrideMemory=false OverrideNativeWorkarounds=false OverrideWindow=false -JvmArgs=-XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+AlwaysActAsServerClassMachine -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseNUMA -XX:NmethodSweepActivity=1 -XX:ReservedCodeCacheSize=400M -XX:NonNMethodCodeHeapSize=12M -XX:ProfiledCodeHeapSize=194M -XX:NonProfiledCodeHeapSize=194M -XX:-DontCompileHugeMethods -XX:MaxNodeLimit=240000 -XX:NodeLimitFudgeFactor=8000 -XX:+UseVectorCmov -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority -XX:ThreadPriorityPolicy=1 -XX:AllocatePrefetchStyle=3 -XX:+UseZGC -XX:-ZProactive +JvmArgs=-XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGuaranteedGCInterval=1000000 -XX:AllocatePrefetchStyle=1 -XX:+DisableExplicitGC -XX:+UseNUMA -XX:+UseLargePages -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority -XX:MaxNodeLimit=240000 -XX:NodeLimitFudgeFactor=8000 -XX:-DontCompileHugeMethods iconKey=default lastLaunchTime=0 lastTimePlayed=0 name=[CleanroomMMC] GregTech Expert 2 MODPACKVERSION -notes=This instance is built using Github Action.\nUsing installer artifact from commit: f8856412a24c1e0588518eac79b5ede8ab393cf4\nAction URL: https://github.com/CleanroomMC/Cleanroom/actions/runs/9012049921 +notes=This instance is built using Github Action.\nUsing installer artifact from commit: b5cfa24bd9a1f39b185d565b408e1876d82109e4\nAction URL: https://github.com/CleanroomMC/Cleanroom/actions/runs/9598223581 totalTimePlayed=0 diff --git a/cmmc/libraries/cleanroom-0.2.1-alpha+build.1.run.573-universal.jar b/cmmc/libraries/cleanroom-0.2.2-alpha+build.13.run.651-universal.jar similarity index 68% rename from cmmc/libraries/cleanroom-0.2.1-alpha+build.1.run.573-universal.jar rename to cmmc/libraries/cleanroom-0.2.2-alpha+build.13.run.651-universal.jar index 92bdbb25..d7f12622 100644 Binary files a/cmmc/libraries/cleanroom-0.2.1-alpha+build.1.run.573-universal.jar and b/cmmc/libraries/cleanroom-0.2.2-alpha+build.13.run.651-universal.jar differ diff --git a/cmmc/mmc-pack.json b/cmmc/mmc-pack.json index 935ed2b7..ceef89f9 100644 --- a/cmmc/mmc-pack.json +++ b/cmmc/mmc-pack.json @@ -29,9 +29,9 @@ "uid": "net.minecraft" } ], - "cachedVersion": "0.2.1-alpha+build.1.run.573", + "cachedVersion": "0.2.2-alpha+build.13.run.651", "uid": "net.minecraftforge", - "version": "0.2.1-alpha+build.1.run.573" + "version": "0.2.2-alpha+build.13.run.651" } ], "formatVersion": 1 diff --git a/cmmc/patches/net.minecraftforge.json b/cmmc/patches/net.minecraftforge.json index fbcd049e..ce8e7df4 100644 --- a/cmmc/patches/net.minecraftforge.json +++ b/cmmc/patches/net.minecraftforge.json @@ -11,7 +11,7 @@ "formatVersion": 1, "libraries": [ { - "name": "com.cleanroommc:cleanroom:0.2.1-alpha+build.1.run.573-universal", + "name": "com.cleanroommc:cleanroom:0.2.2-alpha+build.13.run.651-universal", "MMC-hint": "local" }, { @@ -81,35 +81,35 @@ } }, { - "name": "top.outlands:foundation:0.13.2", + "name": "top.outlands:foundation:0.13.8", "downloads": { "artifact": { - "path": "top/outlands/foundation/0.13.2/foundation-0.13.2.jar", - "url": "https://maven.outlands.top/releases/top/outlands/foundation/0.13.2/foundation-0.13.2.jar", - "sha1": "0ce893af7504ebf12f0cebd5cc7eb64dd432274e", - "size": 57303 + "path": "top/outlands/foundation/0.13.8/foundation-0.13.8.jar", + "url": "https://maven.outlands.top/releases/top/outlands/foundation/0.13.8/foundation-0.13.8.jar", + "sha1": "606a69a67fd682ae8c5b64b0e2916a2a82f38d8a", + "size": 57676 } } }, { - "name": "org.burningwave:jvm-driver:8.15.0", + "name": "org.burningwave:jvm-driver:8.16.1", "downloads": { "artifact": { - "path": "org/burningwave/jvm-driver/8.15.0/jvm-driver-8.15.0.jar", - "url": "https://maven.minecraftforge.net/org/burningwave/jvm-driver/8.15.0/jvm-driver-8.15.0.jar", - "sha1": "25726c48ca638be8483ae5152be0ab6fc668760e", - "size": 293696 + "path": "org/burningwave/jvm-driver/8.16.1/jvm-driver-8.16.1.jar", + "url": "https://maven.minecraftforge.net/org/burningwave/jvm-driver/8.16.1/jvm-driver-8.16.1.jar", + "sha1": "86cc25a3cdea3b3e843b61bd14c2a5c36f36ec6b", + "size": 293690 } } }, { - "name": "io.github.toolfactory:jvm-driver:9.7.0", + "name": "io.github.toolfactory:jvm-driver:9.7.1", "downloads": { "artifact": { - "path": "io/github/toolfactory/jvm-driver/9.7.0/jvm-driver-9.7.0.jar", - "url": "https://maven.minecraftforge.net/io/github/toolfactory/jvm-driver/9.7.0/jvm-driver-9.7.0.jar", - "sha1": "8c4580431d73030009549e2112f202481943433e", - "size": 224896 + "path": "io/github/toolfactory/jvm-driver/9.7.1/jvm-driver-9.7.1.jar", + "url": "https://maven.minecraftforge.net/io/github/toolfactory/jvm-driver/9.7.1/jvm-driver-9.7.1.jar", + "sha1": "d4f63e9ce8de7abd19b9ee6884e1165762c624b2", + "size": 224021 } } }, @@ -158,13 +158,13 @@ } }, { - "name": "org.jline:jline:3.25.0", + "name": "org.jline:jline:3.26.1", "downloads": { "artifact": { - "path": "org/jline/jline/3.25.0/jline-3.25.0.jar", - "url": "https://maven.minecraftforge.net/org/jline/jline/3.25.0/jline-3.25.0.jar", - "sha1": "bf1a4a43c7ece74d0d7887c9cd2fb4493517ebcb", - "size": 1256232 + "path": "org/jline/jline/3.26.1/jline-3.26.1.jar", + "url": "https://maven.minecraftforge.net/org/jline/jline/3.26.1/jline-3.26.1.jar", + "sha1": "ddb96d65e7827ad4c380acea3fa19c59df4b1572", + "size": 1427756 } } }, @@ -202,13 +202,13 @@ } }, { - "name": "org.apache.maven:maven-artifact:3.9.5", + "name": "org.apache.maven:maven-artifact:3.9.7", "downloads": { "artifact": { - "path": "org/apache/maven/maven-artifact/3.9.5/maven-artifact-3.9.5.jar", - "url": "https://maven.minecraftforge.net/org/apache/maven/maven-artifact/3.9.5/maven-artifact-3.9.5.jar", - "sha1": "b956b64636f8d6ed082c7722c611231323beef2d", - "size": 58588 + "path": "org/apache/maven/maven-artifact/3.9.7/maven-artifact-3.9.7.jar", + "url": "https://maven.minecraftforge.net/org/apache/maven/maven-artifact/3.9.7/maven-artifact-3.9.7.jar", + "sha1": "80c4c5d751987280967f4bc0a3f5d6e44409b4a1", + "size": 58713 } } }, @@ -235,13 +235,13 @@ } }, { - "name": "org.apache.commons:commons-compress:1.26.1", + "name": "org.apache.commons:commons-compress:1.26.2", "downloads": { "artifact": { - "path": "org/apache/commons/commons-compress/1.26.1/commons-compress-1.26.1.jar", - "url": "https://maven.minecraftforge.net/org/apache/commons/commons-compress/1.26.1/commons-compress-1.26.1.jar", - "sha1": "44331c1130c370e726a2e1a3e6fba6d2558ef04a", - "size": 1079377 + "path": "org/apache/commons/commons-compress/1.26.2/commons-compress-1.26.2.jar", + "url": "https://maven.minecraftforge.net/org/apache/commons/commons-compress/1.26.2/commons-compress-1.26.2.jar", + "sha1": "eb1f823447af685208e684fce84783b43517960c", + "size": 1083634 } } }, @@ -345,13 +345,13 @@ } }, { - "name": "com.google.guava:guava:33.1.0-jre", + "name": "com.google.guava:guava:33.2.1-jre", "downloads": { "artifact": { - "path": "com/google/guava/guava/33.1.0-jre/guava-33.1.0-jre.jar", - "url": "https://maven.minecraftforge.net/com/google/guava/guava/33.1.0-jre/guava-33.1.0-jre.jar", - "sha1": "9b7ed39143d59e8eabcc6f91ffe4d23db2efe558", - "size": 3053247 + "path": "com/google/guava/guava/33.2.1-jre/guava-33.2.1-jre.jar", + "url": "https://maven.minecraftforge.net/com/google/guava/guava/33.2.1-jre/guava-33.2.1-jre.jar", + "sha1": "818e780da2c66c63bbb6480fef1f3855eeafa3e4", + "size": 3051356 } } }, @@ -367,13 +367,13 @@ } }, { - "name": "com.google.code.gson:gson:2.10.1", + "name": "com.google.code.gson:gson:2.11.0", "downloads": { "artifact": { - "path": "com/google/code/gson/gson/2.10.1/gson-2.10.1.jar", - "url": "https://maven.minecraftforge.net/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar", - "sha1": "b3add478d4382b78ea20b1671390a858002feb6c", - "size": 283367 + "path": "com/google/code/gson/gson/2.11.0/gson-2.11.0.jar", + "url": "https://maven.minecraftforge.net/com/google/code/gson/gson/2.11.0/gson-2.11.0.jar", + "sha1": "527175ca6d81050b53bdd4c457a6d6e017626b0e", + "size": 298435 } } }, @@ -389,144 +389,144 @@ } }, { - "name": "io.netty:netty-codec:4.1.109.Final", + "name": "io.netty:netty-codec:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-codec/4.1.109.Final/netty-codec-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-codec/4.1.109.Final/netty-codec-4.1.109.Final.jar", - "sha1": "16e0b2beb49318a549d3ba5d66d707bd5daa8c97", - "size": 353493 + "path": "io/netty/netty-codec/4.1.110.Final/netty-codec-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-codec/4.1.110.Final/netty-codec-4.1.110.Final.jar", + "sha1": "f1fa43b03e93ab88e805b6a4e3e83780c80b47d2", + "size": 353944 } } }, { - "name": "io.netty:netty-buffer:4.1.109.Final", + "name": "io.netty:netty-buffer:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-buffer/4.1.109.Final/netty-buffer-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-buffer/4.1.109.Final/netty-buffer-4.1.109.Final.jar", - "sha1": "9d21d602ad7c639fa16b1d26559065d310a34c51", - "size": 307344 + "path": "io/netty/netty-buffer/4.1.110.Final/netty-buffer-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-buffer/4.1.110.Final/netty-buffer-4.1.110.Final.jar", + "sha1": "3d918a9ee057d995c362902b54634fc307132aac", + "size": 333176 } } }, { - "name": "io.netty:netty-common:4.1.109.Final", + "name": "io.netty:netty-common:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-common/4.1.109.Final/netty-common-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-common/4.1.109.Final/netty-common-4.1.109.Final.jar", - "sha1": "da63e54ee1ca69abf4206cb74fadef7f50850911", - "size": 664404 + "path": "io/netty/netty-common/4.1.110.Final/netty-common-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-common/4.1.110.Final/netty-common-4.1.110.Final.jar", + "sha1": "ec361e7e025c029be50c55c8480080cabcbc01e7", + "size": 688546 } } }, { - "name": "io.netty:netty-handler:4.1.109.Final", + "name": "io.netty:netty-handler:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-handler/4.1.109.Final/netty-handler-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-handler/4.1.109.Final/netty-handler-4.1.109.Final.jar", - "sha1": "9167863307b3c44cc12262e7b5512de3499b9c4a", - "size": 568956 + "path": "io/netty/netty-handler/4.1.110.Final/netty-handler-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-handler/4.1.110.Final/netty-handler-4.1.110.Final.jar", + "sha1": "168db749c22652ee7fed1ebf7ec46ce856d75e51", + "size": 569951 } } }, { - "name": "io.netty:netty-resolver:4.1.109.Final", + "name": "io.netty:netty-resolver:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-resolver/4.1.109.Final/netty-resolver-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-resolver/4.1.109.Final/netty-resolver-4.1.109.Final.jar", - "sha1": "055485ac976e27c8bb67ee111a8490c58f67b70c", + "path": "io/netty/netty-resolver/4.1.110.Final/netty-resolver-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-resolver/4.1.110.Final/netty-resolver-4.1.110.Final.jar", + "sha1": "66c15921104cda0159b34e316541bc765dfaf3c0", "size": 37814 } } }, { - "name": "io.netty:netty-transport:4.1.109.Final", + "name": "io.netty:netty-transport:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-transport/4.1.109.Final/netty-transport-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-transport/4.1.109.Final/netty-transport-4.1.109.Final.jar", - "sha1": "79e3b07d58ef03c7a860d48f932b720675aa8bd3", - "size": 497753 + "path": "io/netty/netty-transport/4.1.110.Final/netty-transport-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-transport/4.1.110.Final/netty-transport-4.1.110.Final.jar", + "sha1": "b91f04c39ac14d6a29d07184ef305953ee6e0348", + "size": 517826 } } }, { - "name": "io.netty:netty-transport-native-unix-common:4.1.109.Final", + "name": "io.netty:netty-transport-native-unix-common:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-transport-native-unix-common/4.1.109.Final/netty-transport-native-unix-common-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-transport-native-unix-common/4.1.109.Final/netty-transport-native-unix-common-4.1.109.Final.jar", - "sha1": "da7fe1e6943cbab8ee48df2beadc2c8304f347a2", - "size": 44066 + "path": "io/netty/netty-transport-native-unix-common/4.1.110.Final/netty-transport-native-unix-common-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-transport-native-unix-common/4.1.110.Final/netty-transport-native-unix-common-4.1.110.Final.jar", + "sha1": "a7096e7c0a25a983647909d7513f5d4943d589c0", + "size": 44064 } } }, { - "name": "io.netty:netty-transport-classes-epoll:4.1.109.Final", + "name": "io.netty:netty-transport-classes-epoll:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-transport-classes-epoll/4.1.109.Final/netty-transport-classes-epoll-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-transport-classes-epoll/4.1.109.Final/netty-transport-classes-epoll-4.1.109.Final.jar", - "sha1": "7307c8acbc9b331fce3496750a5112bdc726fd2a", - "size": 147342 + "path": "io/netty/netty-transport-classes-epoll/4.1.110.Final/netty-transport-classes-epoll-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-transport-classes-epoll/4.1.110.Final/netty-transport-classes-epoll-4.1.110.Final.jar", + "sha1": "3ca1cff0bf82bfd38e89f6946e54f24cbb3424a2", + "size": 147350 } } }, { - "name": "io.netty:netty-transport-native-epoll:4.1.109.Final", + "name": "io.netty:netty-transport-native-epoll:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-transport-native-epoll/4.1.109.Final/netty-transport-native-epoll-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-transport-native-epoll/4.1.109.Final/netty-transport-native-epoll-4.1.109.Final.jar", - "sha1": "067d037667772fa015514484ad9b080e65966523", - "size": 6074 + "path": "io/netty/netty-transport-native-epoll/4.1.110.Final/netty-transport-native-epoll-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-transport-native-epoll/4.1.110.Final/netty-transport-native-epoll-4.1.110.Final.jar", + "sha1": "0843fbabe636c98f1a2f60dc57e29832b2c612b0", + "size": 6076 } } }, { - "name": "io.netty:netty-codec-http:4.1.109.Final", + "name": "io.netty:netty-codec-http:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-codec-http/4.1.109.Final/netty-codec-http-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-codec-http/4.1.109.Final/netty-codec-http-4.1.109.Final.jar", - "sha1": "6dca43cedc0b2dc6bf57bdc85fce6ffca3e6b72a", - "size": 668088 + "path": "io/netty/netty-codec-http/4.1.110.Final/netty-codec-http-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-codec-http/4.1.110.Final/netty-codec-http-4.1.110.Final.jar", + "sha1": "9d05cd927209ea25bbf342962c00b8e5a828c2a4", + "size": 668432 } } }, { - "name": "io.netty:netty-codec-http2:4.1.109.Final", + "name": "io.netty:netty-codec-http2:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-codec-http2/4.1.109.Final/netty-codec-http2-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-codec-http2/4.1.109.Final/netty-codec-http2-4.1.109.Final.jar", - "sha1": "6bd4a54b69a81356393f6e4621bad40754f8a5a2", - "size": 490122 + "path": "io/netty/netty-codec-http2/4.1.110.Final/netty-codec-http2-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-codec-http2/4.1.110.Final/netty-codec-http2-4.1.110.Final.jar", + "sha1": "e0849843eb5b1c036b12551baca98a9f7ff847a0", + "size": 490271 } } }, { - "name": "io.netty:netty-codec-dns:4.1.109.Final", + "name": "io.netty:netty-codec-dns:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-codec-dns/4.1.109.Final/netty-codec-dns-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-codec-dns/4.1.109.Final/netty-codec-dns-4.1.109.Final.jar", - "sha1": "ee231baee2cc9f1300ecc0d9a1e8bb9b31db02fa", - "size": 67087 + "path": "io/netty/netty-codec-dns/4.1.110.Final/netty-codec-dns-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-codec-dns/4.1.110.Final/netty-codec-dns-4.1.110.Final.jar", + "sha1": "381c5bf8b7570c163fa7893a26d02b7ac36ff6eb", + "size": 67077 } } }, { - "name": "io.netty:netty-resolver-dns:4.1.109.Final", + "name": "io.netty:netty-resolver-dns:4.1.110.Final", "downloads": { "artifact": { - "path": "io/netty/netty-resolver-dns/4.1.109.Final/netty-resolver-dns-4.1.109.Final.jar", - "url": "https://maven.minecraftforge.net/io/netty/netty-resolver-dns/4.1.109.Final/netty-resolver-dns-4.1.109.Final.jar", - "sha1": "5f4d858234b557b73631a24e562bb89fc5399cad", + "path": "io/netty/netty-resolver-dns/4.1.110.Final/netty-resolver-dns-4.1.110.Final.jar", + "url": "https://maven.minecraftforge.net/io/netty/netty-resolver-dns/4.1.110.Final/netty-resolver-dns-4.1.110.Final.jar", + "sha1": "3e687cdc4ecdbbad07508a11b715bdf95fa20939", "size": 181171 } } @@ -598,24 +598,24 @@ } }, { - "name": "jakarta.xml.ws:jakarta.xml.ws-api:4.0.1", + "name": "jakarta.xml.ws:jakarta.xml.ws-api:4.0.2", "downloads": { "artifact": { - "path": "jakarta/xml/ws/jakarta.xml.ws-api/4.0.1/jakarta.xml.ws-api-4.0.1.jar", - "url": "https://maven.minecraftforge.net/jakarta/xml/ws/jakarta.xml.ws-api/4.0.1/jakarta.xml.ws-api-4.0.1.jar", - "sha1": "cd70069d89a628e8759173f7dcd933035bd777dc", - "size": 75282 + "path": "jakarta/xml/ws/jakarta.xml.ws-api/4.0.2/jakarta.xml.ws-api-4.0.2.jar", + "url": "https://maven.minecraftforge.net/jakarta/xml/ws/jakarta.xml.ws-api/4.0.2/jakarta.xml.ws-api-4.0.2.jar", + "sha1": "331ecab874ee75b48db661a331319958cb04edec", + "size": 77621 } } }, { - "name": "jakarta.activation:jakarta.activation-api:2.1.2", + "name": "jakarta.activation:jakarta.activation-api:2.1.3", "downloads": { "artifact": { - "path": "jakarta/activation/jakarta.activation-api/2.1.2/jakarta.activation-api-2.1.2.jar", - "url": "https://maven.minecraftforge.net/jakarta/activation/jakarta.activation-api/2.1.2/jakarta.activation-api-2.1.2.jar", - "sha1": "640c0d5aff45dbff1e1a1bc09673ff3a02b1ba12", - "size": 66096 + "path": "jakarta/activation/jakarta.activation-api/2.1.3/jakarta.activation-api-2.1.3.jar", + "url": "https://maven.minecraftforge.net/jakarta/activation/jakarta.activation-api/2.1.3/jakarta.activation-api-2.1.3.jar", + "sha1": "fa165bd70cda600368eee31555222776a46b881f", + "size": 66514 } } }, @@ -642,24 +642,24 @@ } }, { - "name": "com.cleanroommc:sponge-mixin:0.19.5+mixin.0.8.5", + "name": "com.cleanroommc:sponge-mixin:0.19.7+mixin.0.8.5", "downloads": { "artifact": { - "path": "com/cleanroommc/sponge-mixin/0.19.5+mixin.0.8.5/sponge-mixin-0.19.5+mixin.0.8.5.jar", - "url": "https://maven.outlands.top/releases/com/cleanroommc/sponge-mixin/0.19.5+mixin.0.8.5/sponge-mixin-0.19.5+mixin.0.8.5.jar", - "sha1": "f4982e536ae300eabfa07792e24d7561bca0f238", - "size": 1423894 + "path": "com/cleanroommc/sponge-mixin/0.19.7+mixin.0.8.5/sponge-mixin-0.19.7+mixin.0.8.5.jar", + "url": "https://maven.outlands.top/releases/com/cleanroommc/sponge-mixin/0.19.7+mixin.0.8.5/sponge-mixin-0.19.7+mixin.0.8.5.jar", + "sha1": "595687737a1006a6198efb7fe0f10150b61898be", + "size": 1424129 } } }, { - "name": "io.github.llamalad7:mixinextras-common:0.3.5", + "name": "io.github.llamalad7:mixinextras-common:0.3.6", "downloads": { "artifact": { - "path": "io/github/llamalad7/mixinextras-common/0.3.5/mixinextras-common-0.3.5.jar", - "url": "https://maven.minecraftforge.net/io/github/llamalad7/mixinextras-common/0.3.5/mixinextras-common-0.3.5.jar", - "sha1": "5de895137aa0478675b6ecf7602d9652b05dc37e", - "size": 173204 + "path": "io/github/llamalad7/mixinextras-common/0.3.6/mixinextras-common-0.3.6.jar", + "url": "https://maven.minecraftforge.net/io/github/llamalad7/mixinextras-common/0.3.6/mixinextras-common-0.3.6.jar", + "sha1": "8d992e7a746af47abb59c8232aff5a3f8f0c9f17", + "size": 173236 } } } @@ -674,5 +674,5 @@ } ], "uid": "net.minecraftforge", - "version": "0.2.1-alpha+build.1.run.573" + "version": "0.2.2-alpha+build.13.run.651" } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 47c9b435..2ff670c4 100644 --- a/manifest.json +++ b/manifest.json @@ -86,12 +86,12 @@ }, { "projectID": 570458, - "fileID": 5147702, + "fileID": 5411078, "required": true }, { "projectID": 634242, - "fileID": 5111624, + "fileID": 5463459, "required": true }, { @@ -124,11 +124,6 @@ "fileID": 2830265, "required": true }, - { - "projectID": 585546, - "fileID": 4743092, - "required": true - }, { "projectID": 245211, "fileID": 2667280, @@ -161,7 +156,7 @@ }, { "projectID": 297038, - "fileID": 5290565, + "fileID": 5480894, "required": true }, { @@ -186,7 +181,7 @@ }, { "projectID": 876284, - "fileID": 5324112, + "fileID": 5451323, "required": true }, { @@ -211,7 +206,7 @@ }, { "projectID": 477021, - "fileID": 5155451, + "fileID": 5487400, "required": true }, { @@ -261,7 +256,7 @@ }, { "projectID": 250398, - "fileID": 5165715, + "fileID": 5408385, "required": true }, { @@ -306,7 +301,7 @@ }, { "projectID": 629629, - "fileID": 5183601, + "fileID": 5487266, "required": true }, { @@ -336,7 +331,7 @@ }, { "projectID": 308380, - "fileID": 5351460, + "fileID": 5398860, "required": true }, { @@ -385,8 +380,8 @@ "required": true }, { - "projectID": 232791, - "fileID": 3330021, + "projectID": 874067, + "fileID": 5235356, "required": true }, { @@ -481,12 +476,12 @@ }, { "projectID": 557549, - "fileID": 5229422, + "fileID": 5471944, "required": true }, { "projectID": 871198, - "fileID": 5222248, + "fileID": 5348800, "required": true }, { @@ -506,7 +501,7 @@ }, { "projectID": 623955, - "fileID": 5315135, + "fileID": 5440394, "required": true }, { @@ -571,7 +566,7 @@ }, { "projectID": 851103, - "fileID": 5322968, + "fileID": 5487208, "required": true }, { @@ -591,7 +586,7 @@ }, { "projectID": 884359, - "fileID": 5317480, + "fileID": 5380800, "required": true }, { @@ -616,7 +611,7 @@ }, { "projectID": 624967, - "fileID": 5101529, + "fileID": 5421689, "required": true }, { @@ -625,13 +620,8 @@ "required": true }, { - "projectID": 624960, - "fileID": 4710696, - "required": true - }, - { - "projectID": 620262, - "fileID": 4724647, + "projectID": 910715, + "fileID": 5218222, "required": true }, { @@ -693,6 +683,11 @@ "projectID": 408853, "fileID": 5337217, "required": true + }, + { + "projectID": 873867, + "fileID": 4883852, + "required": true } ], "overrides": "overrides" diff --git a/modlist.html b/modlist.html index 84743708..d7f4c5b1 100644 --- a/modlist.html +++ b/modlist.html @@ -21,7 +21,6 @@
  • Project Red - Illumination (by MrTJP)
  • FPS Reducer (by bre2el)
  • p455w0rd's Library (by TheRealp455w0rd)
    • -
  • BisectHosting Server Integration Menu [FORGE] (by BisectHosting)
  • The One Probe (by McJty)
  • RealBench: Nomi-CEu-Edition (by IntegerLimit_)
  • FTB Ultimine (Forge) (by FTB)
    • @@ -73,7 +72,7 @@
  • Lazy AE2 (by phantamanta44)
  • Dynamistics (by Eutropium)
  • MixinBooter (by Rongmario)
    • -
  • It's the little things (by Zlepper)
    • +
  • Valkyrie (by Desoroxxx)
  • Faster Ladder Climbing (by maddachshund)
  • Bansōkō [絆創膏] - Mod Patcher (by Rongmario)
  • FTB Library (Forge) (Legacy) (by FTB)
    • @@ -120,8 +119,7 @@
  • p455w0rd's AE2 Wireless Terminals Patch (by katatsumuri_pan)
  • RenderLib (by meldexun)
  • Entity Culling (by meldexun)
    • -
  • Nothirium (by meldexun)
    • -
  • 燐/Hesperus (by kappa_maintainer)
    • +
  • Alfheim Lighting Engine (by Desoroxxx)
  • Wireless Redstone CBE (by covers1624)
  • BdLib (by bdew)
  • AE2 Stuff Unofficial (by serenibyss)
    • @@ -134,4 +132,5 @@
  • Nutrition: GTCEu (by katatsumuri_pan)
  • The Spice of Life (by squeek502)
  • Particle Culling (by bl4ckscor3)
    • +
  • Red Core (by Desoroxxx)
    • diff --git a/overrides/bansoukou/.gitkeep b/overrides/bansoukou/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/overrides/bansoukou/Draconic-Additions-1.12.2-1.17.0.45-universal/net/foxmcloud/draconicadditions/lib/DARecipes.class b/overrides/bansoukou/Draconic-Additions-1.12.2-1.17.0.45-universal/net/foxmcloud/draconicadditions/lib/DARecipes.class deleted file mode 100644 index 8fc08e0c..00000000 Binary files a/overrides/bansoukou/Draconic-Additions-1.12.2-1.17.0.45-universal/net/foxmcloud/draconicadditions/lib/DARecipes.class and /dev/null differ diff --git a/overrides/config/AdvancedBackups.properties b/overrides/config/AdvancedBackups.properties index 97e368d5..381852be 100644 --- a/overrides/config/AdvancedBackups.properties +++ b/overrides/config/AdvancedBackups.properties @@ -25,16 +25,18 @@ config.advancedbackups.activity=true config.advancedbackups.type=zip #A list of files, relative paths within the world directory, to skip backing up. -#Default : empty. -config.advancedbackups.blacklist=session.lock +#Comma separated, * is a wildcard, and backslashes are replaced with forward slashes. +#Default : session.lock,*.dat_old +config.advancedbackups.blacklist=session.lock,*.dat_old #The absolute or relative path to the backup location. #Options : any file path. Default : ./backups config.advancedbackups.path=./backups #Minimum time between backups, in hours. This can prevent a shutdown backup from triggering immediately after a scheduled backup or similar situations. +#Set to 0 to disable. #5 minutes = ~ 0.083 hours. -#Range : 0.08 - 500 #Default : 0.5 +#Range : 0 - 500 #Default : 0.5 config.advancedbackups.frequency.min=0.5 #Triggers a backup if none has already happened within this time. Can be combined with an uptime-based schedule. @@ -72,9 +74,27 @@ config.advancedbackups.frequency.startup=true #Range : 5-1000 #Default : 30 config.advancedbackups.frequency.delay=30 -#Whether to disable console and chat logging. Does not affect debug.log, does not affect error messages. -#Options : true, false #Default : false -config.advancedbackups.logging.silent=false + +#-------------------------------------------------------------------------------------------------------------------- +##The following options control logging of backup progress, including which clients to contact. +##Backup start and end are always logged to console. The rest is configurable. +#-------------------------------------------------------------------------------------------------------------------- + +#Which clients to send progress updates to. Behaviour before this was added was `ops` +#Options : ops, all, none #Default : ops +config.advancedbackups.logging.clients=ops + +#How often to send progress info to clients, measured in milliseconds. Old behaviour was `0`, not recommended for servers due to network load. +#Range : 0 - ~infinite #Default : 500 +config.advancedbackups.logging.clientfrequency=500 + +#Whether to log backup progress to console. Start / finish are always logged. Old behaviour was `false`. +#Options : true, false #Default : true +config.advancedbackups.logging.console=true + +#How often to send log progress info in the console, measured in milliseconds. +#Range : 0 - ~infinite #Default : 5000 +config.advancedbackups.logging.consolefrequency=5000 diff --git a/overrides/config/Valkyrie.cfg b/overrides/config/Valkyrie.cfg new file mode 100644 index 00000000..22c5d46d --- /dev/null +++ b/overrides/config/Valkyrie.cfg @@ -0,0 +1,71 @@ +# Configuration file + +general { + + general { + B:customIcons=true + B:highPrecisionDepthBuffer=false + S:windowTitle=GregTech Expert 2 + } + + zoom { + B:smoothCamera=false + B:smoothZoom=false + + # Min: 1.0 + # Max: 10.0 + D:smoothZoomSpeed=5.0 + + # Min: 1.0 + # Max: 10.0 + D:zoomMultiplier=3.0 + } + + graphics { + + clouds { + B:enabled=false + I:height=256 + I:layers=1 + + # Min: 4 + # Max: 2147483647 + I:renderDistance=32 + D:saturation=0.5 + } + + fog { + B:distanceFog=false + B:enabled=true + B:lavaFog=true + B:waterFog=true + } + + leaves { + B:fancyLeaves=false + B:leavesCulling=true + + # Min: 1 + # Max: 127 + I:leavesCullingDepth=4 + } + + } + + mc67532fix { + B:enabled=true + + # Min: 3 + # Max: 127 + I:offset=3 + } + + debug { + B:enabled=false + B:wireframeClouds=false + B:wireframeTerrain=false + } + +} + + diff --git a/overrides/config/betterquesting/DefaultQuests.json b/overrides/config/betterquesting/DefaultQuests.json index 8761fb20..c307f053 100644 --- a/overrides/config/betterquesting/DefaultQuests.json +++ b/overrides/config/betterquesting/DefaultQuests.json @@ -8570,7 +8570,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§c§l※この燃料はGTE2で登場するオリジナルです。本家CEuには登場しないのでご注意ください。§r\n\nナクアダロケット燃料はナクアダリアクターの代替品として追加したオリジナルの燃料です。他を受け付けない圧倒的な燃焼効率を持ちますが、核融合よりは弱いので繋ぎの燃料として利用しましょう。", + "desc:8": "§c§l※この燃料はGTExpert Coreのオリジナルです。本家CEuには登場しないのでご注意ください。§r\n\nナクアダロケット燃料はナクアダリアクターの代替品として追加したオリジナルの燃料です。他を受け付けない圧倒的な燃焼効率を持ちますが、核融合よりは弱いので繋ぎの燃料として利用しましょう。", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -8617,6 +8617,185 @@ } }, "132:10": { + "preRequisites:11": [ + 697 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "§c§l※この液体はGTExpert Coreのオリジナルです。本家CEuには登場しないのでご注意ください。§r\n\nクリオジウムは最上位の冷却材で、どんなものでも最短で冷やすことが可能です。\n作成方法としては2種類あり、1つはパイロジウムを真空冷却器で冷やす方法、もう1つはエレクトロチン、エンダーパール、氷から作成する方法です。\n\nオススメはパイロジウムから作成する方法です。", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "forge:bucketfilled", + "tag:10": { + "Amount:3": 1000, + "FluidName:8": "cryotheum" + } + }, + "ignoresview:1": 0, + "ismain:1": 0, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "低温やけどの騒ぎではない", + "questlogic:8": "AND", + "repeat_relative:1": 1, + "repeattime:3": -1, + "simultaneous:1": 0, + "snd_complete:8": "minecraft:entity.player.levelup", + "snd_update:8": "minecraft:entity.player.levelup", + "tasklogic:8": "AND", + "visibility:8": "ALWAYS" + } + }, + "questID:3": 132, + "rewards:9": {}, + "tasks:9": { + "0:10": { + "autoConsume:1": 0, + "consume:1": 0, + "entryLogic:8": "AND", + "groupDetect:1": 0, + "ignoreNBT:1": 0, + "index:3": 0, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "forge:bucketfilled", + "tag:10": { + "Amount:3": 1000, + "FluidName:8": "cryotheum" + } + } + }, + "taskID:8": "bq_standard:retrieval" + } + } + }, + "133:10": { + "preRequisites:11": [ + 697 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "§c§l※この液体はGTExpert Coreのオリジナルです。本家CEuには登場しないのでご注意ください。§r\n\nパイロジウムは最上位の加熱材で、どんなものでも最短で加熱することが可能です。\n作成方法としては合金高炉で作成しますが、その際にアルゴンを利用して焼くとかなり短縮するので、枯渇していない限りは利用して作成しましょう。", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "forge:bucketfilled", + "tag:10": { + "Amount:3": 1000, + "FluidName:8": "molten.pyrotheum" + } + }, + "ignoresview:1": 0, + "ismain:1": 0, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "なぜ鉄バケツは無事なのか", + "questlogic:8": "AND", + "repeat_relative:1": 1, + "repeattime:3": -1, + "simultaneous:1": 0, + "snd_complete:8": "minecraft:entity.player.levelup", + "snd_update:8": "minecraft:entity.player.levelup", + "tasklogic:8": "AND", + "visibility:8": "ALWAYS" + } + }, + "questID:3": 133, + "rewards:9": {}, + "tasks:9": { + "0:10": { + "autoConsume:1": 0, + "consume:1": 0, + "entryLogic:8": "AND", + "groupDetect:1": 0, + "ignoreNBT:1": 0, + "index:3": 0, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "forge:bucketfilled", + "tag:10": { + "Amount:3": 1000, + "FluidName:8": "molten.pyrotheum" + } + } + }, + "taskID:8": "bq_standard:retrieval" + } + } + }, + "134:10": { + "preRequisites:11": [ + 555 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "プログラム回路カードはパターンに回路を焼くことにより、対応した番号へ自動的に切り替えることが出来るカードです。\n\nこのカードの利点として、GCYMのマルチマシンやPA突入前は番号ごとにマシンを用意する必要を無くすことが出来ます。\nまたクリーンルームのような狭い空間でも効果を発揮します。\n\n\n余談その1\n登場時は混合インターフェースに刺せなかったが、追加の更新で対応した。", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 2, + "OreDict:8": "", + "id:8": "nae2:upgrade" + }, + "ignoresview:1": 0, + "ismain:1": 0, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "GCYMやPAまでの繋ぎ", + "questlogic:8": "AND", + "repeat_relative:1": 1, + "repeattime:3": -1, + "simultaneous:1": 0, + "snd_complete:8": "minecraft:entity.player.levelup", + "snd_update:8": "minecraft:entity.player.levelup", + "tasklogic:8": "AND", + "visibility:8": "ALWAYS" + } + }, + "questID:3": 134, + "rewards:9": {}, + "tasks:9": { + "0:10": { + "index:3": 0, + "taskID:8": "bq_standard:checkbox" + }, + "1:10": { + "autoConsume:1": 0, + "consume:1": 0, + "entryLogic:8": "AND", + "groupDetect:1": 0, + "ignoreNBT:1": 0, + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 2, + "OreDict:8": "", + "id:8": "nae2:upgrade" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } + }, + "135:10": { "preRequisites:11": [ 776 ], @@ -8670,7 +8849,7 @@ } } }, - "133:10": { + "136:10": { "preRequisites:11": [ 283 ], @@ -8724,7 +8903,7 @@ } } }, - "134:10": { + "137:10": { "preRequisites:11": [ 286 ], @@ -8784,7 +8963,7 @@ } } }, - "135:10": { + "138:10": { "preRequisites:11": [ 78 ], @@ -8899,7 +9078,7 @@ } } }, - "136:10": { + "139:10": { "preRequisites:11": [ 72, 267 @@ -8960,7 +9139,7 @@ } } }, - "137:10": { + "140:10": { "preRequisites:11": [ 267 ], @@ -9020,7 +9199,7 @@ } } }, - "138:10": { + "141:10": { "preRequisites:11": [ 261 ], @@ -9078,7 +9257,7 @@ } } }, - "139:10": { + "142:10": { "preRequisites:11": [ 283 ], @@ -9132,7 +9311,7 @@ } } }, - "140:10": { + "143:10": { "preRequisites:11": [ 263 ], @@ -9186,7 +9365,7 @@ } } }, - "141:10": { + "144:10": { "preRequisites:11": [ 72, 265 @@ -9241,7 +9420,7 @@ } } }, - "142:10": { + "145:10": { "preRequisites:11": [ 265 ], @@ -9295,7 +9474,7 @@ } } }, - "143:10": { + "146:10": { "preRequisites:11": [ 284 ], @@ -9367,7 +9546,7 @@ } } }, - "144:10": { + "147:10": { "preRequisites:11": [ 273, 46 @@ -9458,7 +9637,7 @@ } } }, - "145:10": { + "148:10": { "preRequisites:11": [ 247 ], @@ -9512,14 +9691,14 @@ } } }, - "146:10": { + "149:10": { "preRequisites:11": [ 261 ], "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "ピストン、エミッター、センサーはこの時代では要らない子ですが、居ないのも変なので追加された。\n\nただしその他の時代では機械作成に利用されるようになります。", + "desc:8": "ピストン、エミッター、センサーなどはこの時代では要らない子ですが、居ないのも変なので追加された。\n\nただしその他の時代では機械作成に利用されるようになります。", "frame:8": "DEFAULT", "globalshare:1": 0, "icon:10": { @@ -9532,7 +9711,7 @@ "ismain:1": 0, "issilent:1": 0, "lockedprogress:1": 0, - "name:8": "居ないと違和感", + "name:8": "忘れされた子はだーれだ？", "questlogic:8": "AND", "repeat_relative:1": 1, "repeattime:3": -1, @@ -9582,7 +9761,7 @@ } } }, - "147:10": { + "150:10": { "preRequisites:11": [ 291 ], @@ -9640,7 +9819,7 @@ } } }, - "148:10": { + "151:10": { "preRequisites:11": [ 265 ], @@ -9738,7 +9917,7 @@ } } }, - "149:10": { + "152:10": { "preRequisites:11": [ 259 ], @@ -9792,7 +9971,7 @@ } } }, - "150:10": { + "153:10": { "preRequisites:11": [ 254 ], @@ -9846,7 +10025,7 @@ } } }, - "151:10": { + "154:10": { "preRequisites:11": [ 272 ], @@ -9900,7 +10079,7 @@ } } }, - "152:10": { + "155:10": { "preRequisites:11": [ 252 ], @@ -9958,7 +10137,7 @@ } } }, - "153:10": { + "156:10": { "preRequisites:11": [ 257, 68 @@ -10037,7 +10216,7 @@ } } }, - "154:10": { + "157:10": { "preRequisites:11": [ 54, 251 @@ -10110,7 +10289,7 @@ } } }, - "155:10": { + "158:10": { "preRequisites:11": [ 280 ], @@ -10206,7 +10385,7 @@ } } }, - "156:10": { + "159:10": { "preRequisites:11": [ 283 ], @@ -10260,7 +10439,7 @@ } } }, - "157:10": { + "160:10": { "preRequisites:11": [ 265 ], @@ -10314,7 +10493,7 @@ } } }, - "158:10": { + "161:10": { "preRequisites:11": [ 97, 286, @@ -10394,7 +10573,7 @@ } } }, - "159:10": { + "162:10": { "preRequisites:11": [ 255 ], @@ -10448,7 +10627,7 @@ } } }, - "160:10": { + "163:10": { "preRequisites:11": [ 256 ], @@ -10544,7 +10723,7 @@ } } }, - "161:10": { + "164:10": { "preRequisites:11": [ 291 ], @@ -10584,7 +10763,7 @@ } } }, - "162:10": { + "165:10": { "preRequisites:11": [ 269 ], @@ -10644,7 +10823,7 @@ } } }, - "163:10": { + "166:10": { "preRequisites:11": [ 286 ], @@ -10702,9 +10881,9 @@ } } }, - "164:10": { + "167:10": { "preRequisites:11": [ - 261 + 290 ], "properties:10": { "betterquesting:10": { @@ -10760,7 +10939,7 @@ } } }, - "165:10": { + "168:10": { "preRequisites:11": [ 102, 257 @@ -10889,7 +11068,7 @@ } } }, - "166:10": { + "169:10": { "preRequisites:11": [ 265 ], @@ -10973,7 +11152,7 @@ } } }, - "167:10": { + "170:10": { "preRequisites:11": [ 265 ], @@ -11027,7 +11206,7 @@ } } }, - "168:10": { + "171:10": { "preRequisites:11": [ 284 ], @@ -11081,7 +11260,7 @@ } } }, - "169:10": { + "172:10": { "preRequisites:11": [ 284 ], @@ -11171,7 +11350,7 @@ } } }, - "170:10": { + "173:10": { "preRequisites:11": [ 8 ], @@ -11243,7 +11422,7 @@ } } }, - "171:10": { + "174:10": { "preRequisites:11": [ 72, 267 @@ -11298,7 +11477,7 @@ } } }, - "172:10": { + "175:10": { "preRequisites:11": [ 267 ], @@ -11352,7 +11531,7 @@ } } }, - "173:10": { + "176:10": { "preRequisites:11": [ 265 ], @@ -11406,7 +11585,7 @@ } } }, - "174:10": { + "177:10": { "preRequisites:11": [ 265 ], @@ -11484,7 +11663,7 @@ } } }, - "175:10": { + "178:10": { "preRequisites:11": [ 265 ], @@ -11556,7 +11735,7 @@ } } }, - "176:10": { + "179:10": { "preRequisites:11": [ 261 ], @@ -11614,7 +11793,7 @@ } } }, - "177:10": { + "180:10": { "preRequisites:11": [ 268 ], @@ -11654,7 +11833,7 @@ } } }, - "178:10": { + "181:10": { "preRequisites:11": [ 364 ], @@ -11720,7 +11899,7 @@ } } }, - "179:10": { + "182:10": { "preRequisites:11": [ 312 ], @@ -11774,7 +11953,7 @@ } } }, - "180:10": { + "183:10": { "preRequisiteTypes:7": [ 1, 1 @@ -11857,7 +12036,7 @@ } } }, - "181:10": { + "184:10": { "preRequisites:11": [ 338 ], @@ -11911,7 +12090,7 @@ } } }, - "182:10": { + "185:10": { "preRequisites:11": [ 308 ], @@ -11965,7 +12144,7 @@ } } }, - "183:10": { + "186:10": { "preRequisites:11": [ 324, 380 @@ -12020,7 +12199,7 @@ } } }, - "184:10": { + "187:10": { "preRequisites:11": [ 357 ], @@ -12074,7 +12253,7 @@ } } }, - "185:10": { + "188:10": { "preRequisites:11": [ 109, 56 @@ -12129,7 +12308,7 @@ } } }, - "186:10": { + "189:10": { "preRequisites:11": [ 312 ], @@ -12183,7 +12362,7 @@ } } }, - "187:10": { + "190:10": { "preRequisites:11": [ 313 ], @@ -12223,7 +12402,7 @@ } } }, - "188:10": { + "191:10": { "preRequisites:11": [ 297 ], @@ -12277,7 +12456,7 @@ } } }, - "189:10": { + "192:10": { "preRequisites:11": [ 366 ], @@ -12352,7 +12531,7 @@ } } }, - "190:10": { + "193:10": { "preRequisites:11": [ 364 ], @@ -12418,7 +12597,7 @@ } } }, - "191:10": { + "194:10": { "preRequisites:11": [ 367 ], @@ -12472,7 +12651,7 @@ } } }, - "192:10": { + "195:10": { "preRequisites:11": [ 319, 316 @@ -12671,7 +12850,7 @@ } } }, - "193:10": { + "196:10": { "preRequisites:11": [ 319 ], @@ -12725,7 +12904,7 @@ } } }, - "194:10": { + "197:10": { "preRequisites:11": [ 348 ], @@ -12797,7 +12976,7 @@ } } }, - "195:10": { + "198:10": { "preRequisites:11": [ 316 ], @@ -12851,7 +13030,7 @@ } } }, - "196:10": { + "199:10": { "preRequisites:11": [ 102 ], @@ -12905,7 +13084,7 @@ } } }, - "197:10": { + "200:10": { "preRequisites:11": [ 309 ], @@ -12959,7 +13138,7 @@ } } }, - "198:10": { + "201:10": { "preRequisites:11": [ 309, 319 @@ -13014,7 +13193,7 @@ } } }, - "199:10": { + "202:10": { "preRequisites:11": [ 296 ], @@ -13054,7 +13233,7 @@ } } }, - "200:10": { + "203:10": { "preRequisites:11": [ 364 ], @@ -13120,7 +13299,7 @@ } } }, - "201:10": { + "204:10": { "preRequisites:11": [ 371 ], @@ -13174,7 +13353,7 @@ } } }, - "202:10": { + "205:10": { "preRequisites:11": [ 265 ], @@ -13264,7 +13443,7 @@ } } }, - "203:10": { + "206:10": { "preRequisites:11": [ 312, 299 @@ -13403,7 +13582,7 @@ } } }, - "204:10": { + "207:10": { "preRequisites:11": [ 380 ], @@ -13457,7 +13636,7 @@ } } }, - "205:10": { + "208:10": { "preRequisites:11": [ 268, 339, @@ -13532,7 +13711,7 @@ } } }, - "206:10": { + "209:10": { "preRequisites:11": [ 364 ], @@ -13598,7 +13777,7 @@ } } }, - "207:10": { + "210:10": { "preRequisites:11": [ 338 ], @@ -13638,7 +13817,7 @@ } } }, - "208:10": { + "211:10": { "preRequisites:11": [ 319 ], @@ -13678,7 +13857,7 @@ } } }, - "209:10": { + "212:10": { "preRequisiteTypes:7": [ 0, 0, @@ -13757,7 +13936,7 @@ } } }, - "210:10": { + "213:10": { "preRequisites:11": [ 312 ], @@ -13811,7 +13990,7 @@ } } }, - "211:10": { + "214:10": { "preRequisites:11": [ 366 ], @@ -13866,7 +14045,7 @@ } } }, - "212:10": { + "215:10": { "preRequisites:11": [ 315 ], @@ -13920,7 +14099,7 @@ } } }, - "213:10": { + "216:10": { "preRequisites:11": [ 364 ], @@ -13960,7 +14139,7 @@ } } }, - "214:10": { + "217:10": { "preRequisites:11": [ 364 ], @@ -14026,7 +14205,7 @@ } } }, - "215:10": { + "218:10": { "preRequisites:11": [ 298 ], @@ -14080,7 +14259,7 @@ } } }, - "216:10": { + "219:10": { "preRequisites:11": [ 337 ], @@ -14134,7 +14313,7 @@ } } }, - "217:10": { + "220:10": { "preRequisites:11": [ 355 ], @@ -14202,7 +14381,7 @@ } } }, - "218:10": { + "221:10": { "preRequisites:11": [ 342 ], @@ -14256,7 +14435,7 @@ } } }, - "219:10": { + "222:10": { "preRequisites:11": [ 316 ], @@ -14296,7 +14475,7 @@ } } }, - "220:10": { + "223:10": { "preRequisites:11": [ 312 ], @@ -14336,7 +14515,7 @@ } } }, - "221:10": { + "224:10": { "preRequisites:11": [ 338 ], @@ -14408,7 +14587,7 @@ } } }, - "222:10": { + "225:10": { "preRequisites:11": [ 302 ], @@ -14462,7 +14641,7 @@ } } }, - "223:10": { + "226:10": { "preRequisites:11": [ 300, 380, @@ -14531,7 +14710,7 @@ } } }, - "224:10": { + "227:10": { "preRequisites:11": [ 293 ], @@ -14585,7 +14764,7 @@ } } }, - "225:10": { + "228:10": { "preRequisites:11": [ 51, 34 @@ -14640,7 +14819,7 @@ } } }, - "226:10": { + "229:10": { "preRequisites:11": [ 364 ], @@ -14706,7 +14885,7 @@ } } }, - "227:10": { + "230:10": { "preRequisites:11": [ 357 ], @@ -14766,7 +14945,7 @@ } } }, - "228:10": { + "231:10": { "preRequisites:11": [ 323 ], @@ -14838,7 +15017,7 @@ } } }, - "229:10": { + "232:10": { "preRequisites:11": [ 353 ], @@ -14932,7 +15111,7 @@ } } }, - "230:10": { + "233:10": { "preRequisites:11": [ 351 ], @@ -15004,7 +15183,7 @@ } } }, - "231:10": { + "234:10": { "preRequisites:11": [ 312 ], @@ -15058,7 +15237,7 @@ } } }, - "232:10": { + "235:10": { "preRequisites:11": [ 286 ], @@ -15130,7 +15309,7 @@ } } }, - "233:10": { + "236:10": { "preRequisites:11": [ 269 ], @@ -15202,7 +15381,7 @@ } } }, - "234:10": { + "237:10": { "preRequisites:11": [ 332 ], @@ -15256,7 +15435,7 @@ } } }, - "235:10": { + "238:10": { "preRequisites:11": [ 357 ], @@ -15311,7 +15490,7 @@ } } }, - "236:10": { + "239:10": { "preRequisites:11": [ 352, 300, @@ -15381,7 +15560,7 @@ } } }, - "237:10": { + "240:10": { "preRequisites:11": [ 378 ], @@ -15435,7 +15614,7 @@ } } }, - "238:10": { + "241:10": { "preRequisites:11": [ 374 ], @@ -15489,7 +15668,7 @@ } } }, - "239:10": { + "242:10": { "preRequisites:11": [ 357 ], @@ -15561,7 +15740,7 @@ } } }, - "240:10": { + "243:10": { "preRequisites:11": [ 312 ], @@ -15601,7 +15780,7 @@ } } }, - "241:10": { + "244:10": { "preRequisiteTypes:7": [ 1, 0 @@ -15660,7 +15839,7 @@ } } }, - "242:10": { + "245:10": { "preRequisiteTypes:7": [ 0, 1 @@ -15719,7 +15898,7 @@ } } }, - "243:10": { + "246:10": { "preRequisites:11": [ 312 ], @@ -15773,7 +15952,7 @@ } } }, - "244:10": { + "247:10": { "preRequisites:11": [ 309 ], @@ -15863,7 +16042,7 @@ } } }, - "245:10": { + "248:10": { "preRequisites:11": [ 364 ], @@ -15929,7 +16108,7 @@ } } }, - "246:10": { + "249:10": { "preRequisites:11": [ 312 ], @@ -16017,7 +16196,7 @@ } } }, - "247:10": { + "250:10": { "preRequisites:11": [ 312 ], @@ -16081,7 +16260,7 @@ } } }, - "248:10": { + "251:10": { "preRequisites:11": [ 357 ], @@ -16135,7 +16314,7 @@ } } }, - "249:10": { + "252:10": { "preRequisites:11": [ 324, 55 @@ -16190,7 +16369,7 @@ } } }, - "250:10": { + "253:10": { "preRequisites:11": [ 312 ], @@ -16230,7 +16409,7 @@ } } }, - "251:10": { + "254:10": { "preRequisites:11": [ 369 ], @@ -16284,7 +16463,7 @@ } } }, - "252:10": { + "255:10": { "preRequisites:11": [ 372 ], @@ -16344,7 +16523,7 @@ } } }, - "253:10": { + "256:10": { "preRequisites:11": [ 355 ], @@ -16398,7 +16577,7 @@ } } }, - "254:10": { + "257:10": { "preRequisites:11": [ 357 ], @@ -16542,7 +16721,7 @@ } } }, - "255:10": { + "258:10": { "preRequisites:11": [ 363, 313 @@ -16597,7 +16776,7 @@ } } }, - "256:10": { + "259:10": { "preRequisites:11": [ 374 ], @@ -16651,7 +16830,7 @@ } } }, - "257:10": { + "260:10": { "preRequisites:11": [ 329 ], @@ -16705,7 +16884,7 @@ } } }, - "258:10": { + "261:10": { "preRequisiteTypes:7": [ 1, 1 @@ -16812,7 +16991,7 @@ } } }, - "259:10": { + "262:10": { "preRequisites:11": [ 366 ], @@ -16852,7 +17031,7 @@ } } }, - "260:10": { + "263:10": { "preRequisites:11": [ 381, 330, @@ -16908,7 +17087,7 @@ } } }, - "261:10": { + "264:10": { "preRequisites:11": [ 376 ], @@ -16962,7 +17141,7 @@ } } }, - "262:10": { + "265:10": { "preRequisites:11": [ 295 ], @@ -17016,7 +17195,7 @@ } } }, - "263:10": { + "266:10": { "preRequisites:11": [ 312 ], @@ -17070,7 +17249,7 @@ } } }, - "264:10": { + "267:10": { "preRequisites:11": [ 312 ], @@ -17124,7 +17303,7 @@ } } }, - "265:10": { + "268:10": { "preRequisites:11": [ 357 ], @@ -17196,7 +17375,7 @@ } } }, - "266:10": { + "269:10": { "preRequisites:11": [ 334 ], @@ -17250,7 +17429,7 @@ } } }, - "267:10": { + "270:10": { "preRequisites:11": [ 71, 357, @@ -17324,7 +17503,7 @@ } } }, - "268:10": { + "271:10": { "preRequisites:11": [ 397 ], @@ -17364,7 +17543,7 @@ } } }, - "269:10": { + "272:10": { "preRequisiteTypes:7": [ 0, 1 @@ -17423,7 +17602,7 @@ } } }, - "270:10": { + "273:10": { "preRequisites:11": [ 402 ], @@ -17477,7 +17656,7 @@ } } }, - "271:10": { + "274:10": { "preRequisites:11": [ 431, 430, @@ -17520,7 +17699,7 @@ } } }, - "272:10": { + "275:10": { "preRequisites:11": [ 405 ], @@ -17574,7 +17753,7 @@ } } }, - "273:10": { + "276:10": { "preRequisites:11": [ 427 ], @@ -17628,7 +17807,7 @@ } } }, - "274:10": { + "277:10": { "preRequisites:11": [ 442, 386 @@ -17683,7 +17862,7 @@ } } }, - "275:10": { + "278:10": { "preRequisites:11": [ 427 ], @@ -17737,7 +17916,7 @@ } } }, - "276:10": { + "279:10": { "preRequisites:11": [ 437 ], @@ -17827,7 +18006,7 @@ } } }, - "277:10": { + "280:10": { "preRequisiteTypes:7": [ 1, 0, @@ -17908,7 +18087,7 @@ } } }, - "278:10": { + "281:10": { "preRequisites:11": [ 403 ], @@ -17962,7 +18141,7 @@ } } }, - "279:10": { + "282:10": { "preRequisites:11": [ 442 ], @@ -18052,7 +18231,7 @@ } } }, - "280:10": { + "283:10": { "preRequisiteTypes:7": [ 1, 0 @@ -18111,7 +18290,7 @@ } } }, - "281:10": { + "284:10": { "preRequisites:11": [ 438, 440 @@ -18220,7 +18399,7 @@ } } }, - "282:10": { + "285:10": { "preRequisites:11": [ 435 ], @@ -18274,7 +18453,7 @@ } } }, - "283:10": { + "286:10": { "preRequisites:11": [ 395, 323 @@ -18329,7 +18508,7 @@ } } }, - "284:10": { + "287:10": { "preRequisites:11": [ 420 ], @@ -18369,7 +18548,7 @@ } } }, - "285:10": { + "288:10": { "preRequisites:11": [ 402 ], @@ -18408,7 +18587,7 @@ "consume:1": 0, "entryLogic:8": "AND", "groupDetect:1": 0, - "ignoreNBT:1": 0, + "ignoreNBT:1": 1, "index:3": 0, "partialMatch:1": 1, "requiredItems:9": { @@ -18423,11 +18602,7 @@ } } }, - "286:10": { - "preRequisiteTypes:7": [ - 1, - 0 - ], + "289:10": { "preRequisites:11": [ 405, 410 @@ -18482,7 +18657,7 @@ } } }, - "287:10": { + "290:10": { "preRequisites:11": [ 405 ], @@ -18548,7 +18723,7 @@ } } }, - "288:10": { + "291:10": { "preRequisites:11": [ 390, 389, @@ -18604,7 +18779,7 @@ } } }, - "289:10": { + "292:10": { "preRequisites:11": [ 437 ], @@ -18694,7 +18869,7 @@ } } }, - "290:10": { + "293:10": { "preRequisites:11": [ 409 ], @@ -18748,7 +18923,7 @@ } } }, - "291:10": { + "294:10": { "preRequisites:11": [ 316, 369 @@ -18788,7 +18963,7 @@ "consume:1": 0, "entryLogic:8": "AND", "groupDetect:1": 0, - "ignoreNBT:1": 0, + "ignoreNBT:1": 1, "index:3": 0, "partialMatch:1": 1, "requiredItems:9": { @@ -18803,7 +18978,7 @@ } } }, - "292:10": { + "295:10": { "preRequisites:11": [ 434 ], @@ -18869,7 +19044,7 @@ } } }, - "293:10": { + "296:10": { "preRequisites:11": [ 405 ], @@ -18953,7 +19128,7 @@ } } }, - "294:10": { + "297:10": { "preRequisites:11": [ 392 ], @@ -19007,7 +19182,7 @@ } } }, - "295:10": { + "298:10": { "preRequisites:11": [ 443, 425 @@ -19029,7 +19204,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "前のバージョンでは盛大にバグっていた", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -19068,10 +19243,7 @@ } } }, - "296:10": { - "preRequisiteTypes:7": [ - 1 - ], + "299:10": { "preRequisites:11": [ 405 ], @@ -19125,7 +19297,7 @@ } } }, - "297:10": { + "300:10": { "preRequisites:11": [ 418, 409 @@ -19180,7 +19352,7 @@ } } }, - "298:10": { + "301:10": { "preRequisites:11": [ 444 ], @@ -19228,32 +19400,12 @@ "0:10": { "Amount:3": 1000, "FluidName:8": "refinery_gas" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "1:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 1, - "requiredFluids:9": { - "0:10": { + }, + "1:10": { "Amount:3": 1000, "FluidName:8": "methane" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "2:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 2, - "requiredFluids:9": { - "0:10": { + }, + "2:10": { "Amount:3": 1000, "FluidName:8": "lpg" } @@ -19262,7 +19414,7 @@ } } }, - "299:10": { + "302:10": { "preRequisites:11": [ 424, 428 @@ -19317,7 +19469,7 @@ } } }, - "300:10": { + "303:10": { "preRequisites:11": [ 427 ], @@ -19365,18 +19517,8 @@ "0:10": { "Amount:3": 1000, "FluidName:8": "sodium_persulfate" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "1:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 1, - "requiredFluids:9": { - "0:10": { + }, + "1:10": { "Amount:3": 1000, "FluidName:8": "iron_iii_chloride" } @@ -19385,7 +19527,7 @@ } } }, - "301:10": { + "304:10": { "preRequisites:11": [ 385, 464 @@ -19440,7 +19582,7 @@ } } }, - "302:10": { + "305:10": { "preRequisites:11": [ 405 ], @@ -19494,7 +19636,7 @@ } } }, - "303:10": { + "306:10": { "preRequisiteTypes:7": [ 0, 1 @@ -19595,7 +19737,7 @@ } } }, - "304:10": { + "307:10": { "preRequisites:11": [ 405 ], @@ -19649,14 +19791,14 @@ } } }, - "305:10": { + "308:10": { "preRequisites:11": [ 427 ], "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "ダクトテープはメンテナンスのクエストにある通り\nメンテナンスハッチに貼り付けることで1回で機械のメンテナンス問題を全て解決することができます。\n\n見た目が汚くなるという欠点がありますが...\n\n現在バグで一回機械をメンテナンスするとその後一切メンテナンス問題が起きなくなりますが、いつか修正された時のためにずっとダクトテープを使い続けることはやめて早めに自動メンテナンスハッチに乗り換えましょう。", + "desc:8": "ダクトテープはメンテナンスのクエストにある通り\nメンテナンスハッチに貼り付けることで1回で機械のメンテナンス問題を全て解決することができます。\n\n見た目が汚くなるという欠点がありますが...\n\n現在バグで一回機械をメンテナンスするとその後一切メンテナンス問題が起きなくなりますが、いつか修正された時のためにずっとダクトテープを使い続けることはやめて早めに自動メンテナンスハッチに乗り換えましょう。\n\n\n余談その1\n実はダクトテープを利用すれば、クレートを一度だけ破壊しても中身を保持する事が可能となっている。\n利用方法はShiftキーを押しながらクレートに対して右クリックで貼り付けることが出来る。", "frame:8": "DEFAULT", "globalshare:1": 0, "icon:10": { @@ -19703,7 +19845,7 @@ } } }, - "306:10": { + "309:10": { "preRequisites:11": [ 405 ], @@ -19743,7 +19885,7 @@ } } }, - "307:10": { + "310:10": { "preRequisites:11": [ 427 ], @@ -19797,7 +19939,7 @@ } } }, - "308:10": { + "311:10": { "preRequisites:11": [ 394 ], @@ -19914,7 +20056,7 @@ } } }, - "309:10": { + "312:10": { "preRequisites:11": [ 405 ], @@ -19980,7 +20122,7 @@ } } }, - "310:10": { + "313:10": { "preRequisites:11": [ 400, 409 @@ -20035,7 +20177,7 @@ } } }, - "311:10": { + "314:10": { "preRequisites:11": [ 418 ], @@ -20083,20 +20225,8 @@ "Damage:2": 439, "OreDict:8": "", "id:8": "gregtech:meta_item_1" - } - }, - "taskID:8": "bq_standard:retrieval" - }, - "1:10": { - "autoConsume:1": 0, - "consume:1": 0, - "entryLogic:8": "AND", - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 1, - "partialMatch:1": 1, - "requiredItems:9": { - "0:10": { + }, + "1:10": { "Count:3": 1, "Damage:2": 440, "OreDict:8": "", @@ -20105,12 +20235,12 @@ }, "taskID:8": "bq_standard:retrieval" }, - "2:10": { + "1:10": { "autoConsume:1": 0, "consume:1": 1, "groupDetect:1": 0, "ignoreNBT:1": 0, - "index:3": 2, + "index:3": 1, "requiredFluids:9": { "0:10": { "Amount:3": 1000, @@ -20121,7 +20251,7 @@ } } }, - "312:10": { + "315:10": { "preRequisites:11": [ 404 ], @@ -20175,10 +20305,7 @@ } } }, - "313:10": { - "preRequisiteTypes:7": [ - 1 - ], + "316:10": { "preRequisites:11": [ 413 ], @@ -20232,7 +20359,7 @@ } } }, - "314:10": { + "317:10": { "preRequisites:11": [ 404 ], @@ -20286,7 +20413,7 @@ } } }, - "315:10": { + "318:10": { "preRequisites:11": [ 427 ], @@ -20340,7 +20467,7 @@ } } }, - "316:10": { + "319:10": { "preRequisites:11": [ 402 ], @@ -20394,7 +20521,7 @@ } } }, - "317:10": { + "320:10": { "preRequisites:11": [ 400, 414 @@ -20467,7 +20594,7 @@ } } }, - "318:10": { + "321:10": { "preRequisites:11": [ 416 ], @@ -20521,7 +20648,7 @@ } } }, - "319:10": { + "322:10": { "preRequisites:11": [ 434 ], @@ -20575,7 +20702,7 @@ } } }, - "320:10": { + "323:10": { "preRequisites:11": [ 405 ], @@ -20647,7 +20774,7 @@ } } }, - "321:10": { + "324:10": { "preRequisites:11": [ 385, 415 @@ -20702,7 +20829,7 @@ } } }, - "322:10": { + "325:10": { "preRequisites:11": [ 405 ], @@ -20756,7 +20883,7 @@ } } }, - "323:10": { + "326:10": { "preRequisites:11": [ 393 ], @@ -20810,7 +20937,7 @@ } } }, - "324:10": { + "327:10": { "preRequisites:11": [ 405 ], @@ -20864,7 +20991,7 @@ } } }, - "325:10": { + "328:10": { "preRequisites:11": [ 405 ], @@ -20924,7 +21051,7 @@ } } }, - "326:10": { + "329:10": { "preRequisites:11": [ 59, 416 @@ -20979,7 +21106,7 @@ } } }, - "327:10": { + "330:10": { "preRequisites:11": [ 398 ], @@ -21039,7 +21166,7 @@ } } }, - "328:10": { + "331:10": { "preRequisites:11": [ 405 ], @@ -21093,7 +21220,7 @@ } } }, - "329:10": { + "332:10": { "preRequisites:11": [ 444, 69 @@ -21142,46 +21269,16 @@ "0:10": { "Amount:3": 1000, "FluidName:8": "oil" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "1:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 1, - "requiredFluids:9": { - "0:10": { + }, + "1:10": { "Amount:3": 1000, "FluidName:8": "oil_heavy" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "2:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 2, - "requiredFluids:9": { - "0:10": { + }, + "2:10": { "Amount:3": 1000, "FluidName:8": "oil_medium" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "3:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 3, - "requiredFluids:9": { - "0:10": { + }, + "3:10": { "Amount:3": 1000, "FluidName:8": "oil_light" } @@ -21190,7 +21287,7 @@ } } }, - "330:10": { + "333:10": { "preRequisites:11": [ 405 ], @@ -21244,7 +21341,7 @@ } } }, - "331:10": { + "334:10": { "preRequisites:11": [ 427 ], @@ -21298,7 +21395,7 @@ } } }, - "332:10": { + "335:10": { "preRequisites:11": [ 474 ], @@ -21532,7 +21629,7 @@ } } }, - "333:10": { + "336:10": { "preRequisites:11": [ 474 ], @@ -21586,7 +21683,7 @@ } } }, - "334:10": { + "337:10": { "preRequisites:11": [ 458 ], @@ -21658,7 +21755,7 @@ } } }, - "335:10": { + "338:10": { "preRequisites:11": [ 450 ], @@ -21712,7 +21809,7 @@ } } }, - "336:10": { + "339:10": { "preRequisites:11": [ 474 ], @@ -21766,7 +21863,7 @@ } } }, - "337:10": { + "340:10": { "preRequisites:11": [ 474 ], @@ -21820,7 +21917,7 @@ } } }, - "338:10": { + "341:10": { "preRequisites:11": [ 474 ], @@ -21874,7 +21971,7 @@ } } }, - "339:10": { + "342:10": { "preRequisites:11": [ 476, 509 @@ -21929,7 +22026,7 @@ } } }, - "340:10": { + "343:10": { "preRequisites:11": [ 458 ], @@ -21983,7 +22080,7 @@ } } }, - "341:10": { + "344:10": { "preRequisites:11": [ 458 ], @@ -22055,7 +22152,7 @@ } } }, - "342:10": { + "345:10": { "preRequisites:11": [ 474 ], @@ -22109,7 +22206,7 @@ } } }, - "343:10": { + "346:10": { "preRequisiteTypes:7": [ 1 ], @@ -22166,14 +22263,14 @@ } } }, - "344:10": { + "347:10": { "preRequisites:11": [ 474 ], "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "※このクエストはバグを回避するために該当アイテムをクラフトした時のみ達成できるようにしています。\nもし達成できなかったらFTBQuestの編集モードで即時完了してください\n\n高圧アイテムマグネットはアイテムマグネットの強化版です。\n広い範囲からアイテムを吸い寄せることができますが、誤爆に注意しましょう。\n特に熱いインゴットを吸ってしまった場合は高い確率で死に至ります。", + "desc:8": "※このクエストはバグを回避するために該当アイテムをクラフトした時のみ達成できるようにしています。\nもし達成できなかったら編集モードで即時完了してください\n\n高圧アイテムマグネットはアイテムマグネットの強化版です。\n広い範囲からアイテムを吸い寄せることができますが、誤爆に注意しましょう。\n特に熱いインゴットを吸ってしまった場合は高い確率で死に至ります。", "frame:8": "DEFAULT", "globalshare:1": 0, "icon:10": { @@ -22220,7 +22317,7 @@ } } }, - "345:10": { + "348:10": { "preRequisites:11": [ 474 ], @@ -22274,7 +22371,7 @@ } } }, - "346:10": { + "349:10": { "preRequisites:11": [ 446, 493 @@ -22365,7 +22462,7 @@ } } }, - "347:10": { + "350:10": { "preRequisites:11": [ 451 ], @@ -22419,7 +22516,7 @@ } } }, - "348:10": { + "351:10": { "preRequisites:11": [ 450, 469 @@ -22492,7 +22589,7 @@ } } }, - "349:10": { + "352:10": { "preRequisites:11": [ 493 ], @@ -22546,7 +22643,7 @@ } } }, - "350:10": { + "353:10": { "preRequisites:11": [ 480, 294 @@ -22625,7 +22722,7 @@ } } }, - "351:10": { + "354:10": { "preRequisites:11": [ 474 ], @@ -22685,7 +22782,7 @@ } } }, - "352:10": { + "355:10": { "preRequisites:11": [ 497, 451 @@ -22740,7 +22837,7 @@ } } }, - "353:10": { + "356:10": { "preRequisites:11": [ 493 ], @@ -22794,7 +22891,7 @@ } } }, - "354:10": { + "357:10": { "preRequisites:11": [ 490 ], @@ -22848,7 +22945,7 @@ } } }, - "355:10": { + "358:10": { "preRequisites:11": [ 456, 501 @@ -22903,7 +23000,7 @@ } } }, - "356:10": { + "359:10": { "preRequisites:11": [ 458, 461 @@ -22958,7 +23055,7 @@ } } }, - "357:10": { + "360:10": { "preRequisites:11": [ 474 ], @@ -23012,7 +23109,7 @@ } } }, - "358:10": { + "361:10": { "preRequisites:11": [ 475, 484, @@ -23069,7 +23166,7 @@ } } }, - "359:10": { + "362:10": { "preRequisites:11": [ 405, 391 @@ -23124,7 +23221,7 @@ } } }, - "360:10": { + "363:10": { "preRequisites:11": [ 476 ], @@ -23197,7 +23294,7 @@ } } }, - "361:10": { + "364:10": { "preRequisites:11": [ 472 ], @@ -23251,7 +23348,7 @@ } } }, - "362:10": { + "365:10": { "preRequisites:11": [ 487 ], @@ -23305,7 +23402,7 @@ } } }, - "363:10": { + "366:10": { "preRequisites:11": [ 509 ], @@ -23359,7 +23456,7 @@ } } }, - "364:10": { + "367:10": { "preRequisites:11": [ 480 ], @@ -23413,14 +23510,14 @@ } } }, - "365:10": { + "368:10": { "preRequisites:11": [ 474 ], "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "真空冷却器は熱いインゴットを冷却するマルチブロックです。\n工業用電気炉で作ることのできる1750Kを超える温度の全てのインゴットはこれで冷やす必要があります。\nまたGCYMによって冷却器にて熱い液体を直接インゴットに冷やすことも可能です。\n\n大体の場合で電気炉の加工速度がボトルネックになるので、冷却器を急いでオーバークロックする必要はありません。\n\n熱いインゴットを手に持つとダメージを受けるので、アイテムパイプはとても有効です。鉱石辞書フィルターのクエストを参照してください。\n\n\n余談その1\nGTEのCoreModによる更新のおかげでインゴットの他に冷やした液体を直接作成出来たり、プレートやギアなども作成が出来るようになった。", + "desc:8": "真空冷却器は熱いインゴットを冷却するマルチブロックです。\n工業用電気炉で作ることのできる1750Kを超える温度の全てのインゴットはこれで冷やす必要があります。\nまたGCYMによって冷却器にて熱い液体を直接インゴットに冷やすことも可能です。\n\n大体の場合で電気炉の加工速度がボトルネックになるので、冷却器を急いでオーバークロックする必要はありません。\n\n熱いインゴットを手に持つとダメージを受けるので、アイテムパイプはとても有効です。鉱石辞書フィルターのクエストを参照してください。\n\n\n余談その1\nGTExpert Coreの更新でインゴットの他に冷やした液体を直接作成出来たり、プレートやギアなども作成が出来るようになった。", "frame:8": "DEFAULT", "globalshare:1": 0, "icon:10": { @@ -23467,7 +23564,7 @@ } } }, - "366:10": { + "369:10": { "preRequisites:11": [ 458 ], @@ -23557,7 +23654,7 @@ } } }, - "367:10": { + "370:10": { "preRequisites:11": [ 83 ], @@ -23611,7 +23708,7 @@ } } }, - "368:10": { + "371:10": { "preRequisites:11": [ 458 ], @@ -23665,7 +23762,7 @@ } } }, - "369:10": { + "372:10": { "preRequisites:11": [ 488, 505 @@ -23720,7 +23817,7 @@ } } }, - "370:10": { + "373:10": { "preRequisites:11": [ 458 ], @@ -23774,7 +23871,7 @@ } } }, - "371:10": { + "374:10": { "preRequisites:11": [ 487 ], @@ -23828,7 +23925,7 @@ } } }, - "372:10": { + "375:10": { "preRequisites:11": [ 462, 508 @@ -23883,7 +23980,7 @@ } } }, - "373:10": { + "376:10": { "preRequisites:11": [ 505 ], @@ -23937,7 +24034,7 @@ } } }, - "374:10": { + "377:10": { "preRequisites:11": [ 467 ], @@ -23991,7 +24088,7 @@ } } }, - "375:10": { + "378:10": { "preRequisites:11": [ 474 ], @@ -24075,7 +24172,7 @@ } } }, - "376:10": { + "379:10": { "preRequisites:11": [ 509 ], @@ -24153,7 +24250,7 @@ } } }, - "377:10": { + "380:10": { "preRequisites:11": [ 474 ], @@ -24207,7 +24304,7 @@ } } }, - "378:10": { + "381:10": { "preRequisites:11": [ 499 ], @@ -24333,7 +24430,7 @@ } } }, - "379:10": { + "382:10": { "preRequisites:11": [ 451 ], @@ -24387,7 +24484,7 @@ } } }, - "380:10": { + "383:10": { "preRequisites:11": [ 451 ], @@ -24441,7 +24538,7 @@ } } }, - "381:10": { + "384:10": { "preRequisites:11": [ 474 ], @@ -24499,7 +24596,7 @@ } } }, - "382:10": { + "385:10": { "preRequisites:11": [ 474, 99 @@ -24554,7 +24651,7 @@ } } }, - "383:10": { + "386:10": { "preRequisites:11": [ 480, 397 @@ -24609,7 +24706,7 @@ } } }, - "384:10": { + "387:10": { "preRequisites:11": [ 474 ], @@ -24663,7 +24760,7 @@ } } }, - "385:10": { + "388:10": { "preRequisites:11": [ 499 ], @@ -24715,7 +24812,7 @@ } } }, - "386:10": { + "389:10": { "preRequisites:11": [ 458 ], @@ -24769,7 +24866,7 @@ } } }, - "387:10": { + "390:10": { "preRequisites:11": [ 504 ], @@ -24851,7 +24948,7 @@ } } }, - "388:10": { + "391:10": { "preRequisites:11": [ 449 ], @@ -24977,7 +25074,7 @@ } } }, - "389:10": { + "392:10": { "preRequisites:11": [ 465 ], @@ -25055,7 +25152,7 @@ } } }, - "390:10": { + "393:10": { "preRequisites:11": [ 482, 446, @@ -25111,7 +25208,7 @@ } } }, - "391:10": { + "394:10": { "preRequisites:11": [ 494 ], @@ -25165,7 +25262,7 @@ } } }, - "392:10": { + "395:10": { "preRequisites:11": [ 452 ], @@ -25205,7 +25302,7 @@ } } }, - "393:10": { + "396:10": { "preRequisites:11": [ 506 ], @@ -25259,7 +25356,7 @@ } } }, - "394:10": { + "397:10": { "preRequisites:11": [ 474 ], @@ -25349,7 +25446,7 @@ } } }, - "395:10": { + "398:10": { "preRequisites:11": [ 539 ], @@ -25415,7 +25512,7 @@ } } }, - "396:10": { + "399:10": { "preRequisites:11": [ 476, 517 @@ -25454,9 +25551,9 @@ "0:10": { "autoConsume:1": 0, "consume:1": 0, - "entryLogic:8": "AND", + "entryLogic:8": "OR", "groupDetect:1": 0, - "ignoreNBT:1": 0, + "ignoreNBT:1": 1, "index:3": 0, "partialMatch:1": 1, "requiredItems:9": { @@ -25466,13 +25563,20 @@ "OreDict:8": "", "id:8": "appliedenergistics2:energy_cell", "tag:10": {} + }, + "1:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "appliedenergistics2:dense_energy_cell", + "tag:10": {} } }, "taskID:8": "bq_standard:retrieval" } } }, - "397:10": { + "400:10": { "preRequisites:11": [ 525 ], @@ -25538,7 +25642,7 @@ } } }, - "398:10": { + "401:10": { "preRequisites:11": [ 512 ], @@ -25592,7 +25696,7 @@ } } }, - "399:10": { + "402:10": { "preRequisites:11": [ 523 ], @@ -25646,7 +25750,7 @@ } } }, - "400:10": { + "403:10": { "preRequisites:11": [ 518 ], @@ -25730,7 +25834,7 @@ } } }, - "401:10": { + "404:10": { "preRequisites:11": [ 447, 511 @@ -25785,7 +25889,7 @@ } } }, - "402:10": { + "405:10": { "preRequisites:11": [ 458, 535, @@ -25859,7 +25963,7 @@ } } }, - "403:10": { + "406:10": { "preRequisites:11": [ 474 ], @@ -25899,7 +26003,7 @@ } } }, - "404:10": { + "407:10": { "preRequisites:11": [ 516 ], @@ -25995,7 +26099,7 @@ } } }, - "405:10": { + "408:10": { "preRequisites:11": [ 553 ], @@ -26055,7 +26159,7 @@ } } }, - "406:10": { + "409:10": { "preRequisites:11": [ 536 ], @@ -26115,7 +26219,7 @@ } } }, - "407:10": { + "410:10": { "preRequisites:11": [ 549 ], @@ -26175,7 +26279,7 @@ } } }, - "408:10": { + "411:10": { "preRequisites:11": [ 539 ], @@ -26229,14 +26333,14 @@ } } }, - "409:10": { + "412:10": { "preRequisites:11": [ 536 ], "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "ブランクパターンはレシピを記憶しておくための箱です。\nそれ以上でもそれ以下でもありません。\n\n自動クラフトを行うのなら大量に必要になります。", + "desc:8": "ブランクパターンはレシピを記憶しておくための箱です。\nそれ以上でもそれ以下でもありません。\n\n自動クラフトを行うのなら大量に必要になります。\n\n\n余談その1\n元々は作業台レシピしかなかったが、更新でしれっと組立機を利用したお得レシピを追加した経緯がある。", "frame:8": "DEFAULT", "globalshare:1": 0, "icon:10": { @@ -26283,7 +26387,7 @@ } } }, - "410:10": { + "413:10": { "preRequisites:11": [ 529 ], @@ -26355,7 +26459,7 @@ } } }, - "411:10": { + "414:10": { "preRequisites:11": [ 559 ], @@ -26409,7 +26513,7 @@ } } }, - "412:10": { + "415:10": { "preRequisites:11": [ 550 ], @@ -26483,7 +26587,7 @@ } } }, - "413:10": { + "416:10": { "preRequisites:11": [ 555 ], @@ -26543,7 +26647,7 @@ } } }, - "414:10": { + "417:10": { "preRequisites:11": [ 559 ], @@ -26597,7 +26701,7 @@ } } }, - "415:10": { + "418:10": { "preRequisites:11": [ 524 ], @@ -26651,7 +26755,7 @@ } } }, - "416:10": { + "419:10": { "preRequisites:11": [ 555 ], @@ -26705,7 +26809,7 @@ } } }, - "417:10": { + "420:10": { "preRequisites:11": [ 533 ], @@ -26765,7 +26869,7 @@ } } }, - "418:10": { + "421:10": { "preRequisites:11": [ 539 ], @@ -26843,7 +26947,7 @@ } } }, - "419:10": { + "422:10": { "preRequisites:11": [ 536 ], @@ -26897,7 +27001,7 @@ } } }, - "420:10": { + "423:10": { "preRequisites:11": [ 493, 515 @@ -26970,7 +27074,7 @@ } } }, - "421:10": { + "424:10": { "preRequisites:11": [ 519 ], @@ -27030,7 +27134,7 @@ } } }, - "422:10": { + "425:10": { "preRequisites:11": [ 539 ], @@ -27084,7 +27188,7 @@ } } }, - "423:10": { + "426:10": { "preRequisites:11": [ 558 ], @@ -27168,7 +27272,7 @@ } } }, - "424:10": { + "427:10": { "preRequisites:11": [ 536 ], @@ -27234,7 +27338,7 @@ } } }, - "425:10": { + "428:10": { "preRequisites:11": [ 528 ], @@ -27294,7 +27398,7 @@ } } }, - "426:10": { + "429:10": { "preRequisites:11": [ 553 ], @@ -27366,7 +27470,7 @@ } } }, - "427:10": { + "430:10": { "preRequisites:11": [ 539 ], @@ -27420,7 +27524,7 @@ } } }, - "428:10": { + "431:10": { "preRequisites:11": [ 539 ], @@ -27474,7 +27578,7 @@ } } }, - "429:10": { + "432:10": { "preRequisites:11": [ 538, 561, @@ -27555,7 +27659,7 @@ } } }, - "430:10": { + "433:10": { "preRequisites:11": [ 555 ], @@ -27595,14 +27699,14 @@ } } }, - "431:10": { + "434:10": { "preRequisites:11": [ 511 ], "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "MEコントローラはこのModPackでは使う必要がありません。\nネットワークに組み込むことで節電することができますが、正しく使用するにはチャンネルの概念を知る必要があるので、GregTechをやる分には気にしなくていいでしょう。\n\nMEコントローラは大きな箱状のフレームに組み上げることで機能します。\n勿論3*3*3や5*5*5でもコントローラは機能しますが、7*7*\u00277などに挑戦してみてもいいでしょう。\n\nちなみにネットワークを有効化したい場合はAppliedEnergistics2.cfg にある §nnetworkfeatures§r の §nB:Channels§r を §nfalse§r から §ntrue§r に変えて再起動することで有効化可能です。", + "desc:8": "MEコントローラはこのModPackでは使う必要がありません。\nネットワークに組み込むことで節電することができますが、正しく使用するにはチャンネルの概念を知る必要があるので、GregTechをやる分には気にしなくていいでしょう。\n\nMEコントローラは大きな箱状のフレームに組み上げることで機能します。\n勿論3*3*3や5*5*5でもコントローラは機能しますが、7*7*7などに挑戦してみてもいいでしょう。\n\nちなみにチャンネルを有効化したい場合はAppliedEnergistics2.cfg にある §nnetworkfeatures§r の §nB:Channels§r を §nfalse§r から §ntrue§r に変えて再起動することで有効化可能です。", "frame:8": "DEFAULT", "globalshare:1": 0, "icon:10": { @@ -27653,7 +27757,7 @@ } } }, - "432:10": { + "435:10": { "preRequisites:11": [ 559 ], @@ -27713,7 +27817,7 @@ } } }, - "433:10": { + "436:10": { "preRequisites:11": [ 515, 472 @@ -27819,7 +27923,7 @@ } } }, - "434:10": { + "437:10": { "preRequisites:11": [ 536 ], @@ -27880,7 +27984,7 @@ } } }, - "435:10": { + "438:10": { "preRequisites:11": [ 530 ], @@ -27934,7 +28038,7 @@ } } }, - "436:10": { + "439:10": { "preRequisites:11": [ 539 ], @@ -28030,7 +28134,7 @@ } } }, - "437:10": { + "440:10": { "preRequisites:11": [ 519 ], @@ -28084,7 +28188,7 @@ } } }, - "438:10": { + "441:10": { "preRequisites:11": [ 555 ], @@ -28138,7 +28242,7 @@ } } }, - "439:10": { + "442:10": { "preRequisites:11": [ 555 ], @@ -28234,7 +28338,7 @@ } } }, - "440:10": { + "443:10": { "preRequisites:11": [ 530 ], @@ -28302,10 +28406,46 @@ "id:8": "appliedenergistics2:crafting_storage_1k" }, "1:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "appliedenergistics2:crafting_storage_4k" + }, + "2:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "appliedenergistics2:crafting_storage_16k" + }, + "3:10": { "Count:3": 1, "Damage:2": 0, "OreDict:8": "", "id:8": "appliedenergistics2:crafting_storage_64k" + }, + "4:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "nae2:storage_crafting_256k" + }, + "5:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "nae2:storage_crafting_1024k" + }, + "6:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "nae2:storage_crafting_4096k" + }, + "7:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "nae2:storage_crafting_16384k" } }, "taskID:8": "bq_standard:retrieval" @@ -28326,6 +28466,18 @@ "id:8": "appliedenergistics2:crafting_accelerator" }, "1:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "nae2:coprocessor_4x" + }, + "2:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "nae2:coprocessor_16x" + }, + "3:10": { "Count:3": 1, "Damage:2": 0, "OreDict:8": "", @@ -28336,7 +28488,7 @@ } } }, - "441:10": { + "444:10": { "preRequisites:11": [ 536 ], @@ -28428,7 +28580,7 @@ } } }, - "442:10": { + "445:10": { "preRequisites:11": [ 538, 561, @@ -28539,7 +28691,7 @@ } } }, - "443:10": { + "446:10": { "preRequisites:11": [ 556 ], @@ -28604,7 +28756,7 @@ } } }, - "444:10": { + "447:10": { "preRequisites:11": [ 516 ], @@ -28677,7 +28829,7 @@ } } }, - "445:10": { + "448:10": { "preRequisites:11": [ 538 ], @@ -28742,7 +28894,7 @@ } } }, - "446:10": { + "449:10": { "preRequisites:11": [ 560 ], @@ -28802,7 +28954,7 @@ } } }, - "447:10": { + "450:10": { "preRequisites:11": [ 578 ], @@ -28856,7 +29008,7 @@ } } }, - "448:10": { + "451:10": { "preRequisites:11": [ 604 ], @@ -28946,7 +29098,7 @@ } } }, - "449:10": { + "452:10": { "preRequisites:11": [ 602 ], @@ -29018,7 +29170,7 @@ } } }, - "450:10": { + "453:10": { "preRequisites:11": [ 570, 600 @@ -29091,7 +29243,7 @@ } } }, - "451:10": { + "454:10": { "preRequisites:11": [ 601 ], @@ -29159,7 +29311,7 @@ } } }, - "452:10": { + "455:10": { "preRequisites:11": [ 602 ], @@ -29213,7 +29365,7 @@ } } }, - "453:10": { + "456:10": { "preRequisites:11": [ 579 ], @@ -29267,7 +29419,7 @@ } } }, - "454:10": { + "457:10": { "preRequisites:11": [ 579, 585, @@ -29323,7 +29475,7 @@ } } }, - "455:10": { + "458:10": { "preRequisites:11": [ 602 ], @@ -29413,7 +29565,7 @@ } } }, - "456:10": { + "459:10": { "preRequisites:11": [ 606, 612 @@ -29468,7 +29620,7 @@ } } }, - "457:10": { + "460:10": { "preRequisites:11": [ 593 ], @@ -29522,7 +29674,7 @@ } } }, - "458:10": { + "461:10": { "preRequisites:11": [ 614, 593 @@ -29577,7 +29729,7 @@ } } }, - "459:10": { + "462:10": { "preRequisites:11": [ 570, 600 @@ -29650,7 +29802,7 @@ } } }, - "460:10": { + "463:10": { "preRequisites:11": [ 602 ], @@ -29704,7 +29856,7 @@ } } }, - "461:10": { + "464:10": { "preRequisites:11": [ 567 ], @@ -29752,46 +29904,16 @@ "0:10": { "Amount:3": 1000, "FluidName:8": "benzene" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "1:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 1, - "requiredFluids:9": { - "0:10": { + }, + "1:10": { "Amount:3": 1000, "FluidName:8": "butadiene" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "2:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 2, - "requiredFluids:9": { - "0:10": { + }, + "2:10": { "Amount:3": 1000, "FluidName:8": "ethylene" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "3:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 3, - "requiredFluids:9": { - "0:10": { + }, + "3:10": { "Amount:3": 1000, "FluidName:8": "methane" } @@ -29800,7 +29922,7 @@ } } }, - "462:10": { + "465:10": { "preRequisites:11": [ 602, 106 @@ -29885,7 +30007,7 @@ } } }, - "463:10": { + "466:10": { "preRequisites:11": [ 595 ], @@ -29939,7 +30061,7 @@ } } }, - "464:10": { + "467:10": { "preRequisites:11": [ 602, 566 @@ -29994,7 +30116,7 @@ } } }, - "465:10": { + "468:10": { "preRequisites:11": [ 588 ], @@ -30048,7 +30170,7 @@ } } }, - "466:10": { + "469:10": { "preRequisites:11": [ 597 ], @@ -30088,7 +30210,7 @@ } } }, - "467:10": { + "470:10": { "preRequisites:11": [ 591, 593, @@ -30144,7 +30266,7 @@ } } }, - "468:10": { + "471:10": { "preRequisites:11": [ 588 ], @@ -30212,7 +30334,7 @@ } } }, - "469:10": { + "472:10": { "preRequisites:11": [ 580, 610, @@ -30268,7 +30390,7 @@ } } }, - "470:10": { + "473:10": { "preRequisites:11": [ 584 ], @@ -30322,7 +30444,7 @@ } } }, - "471:10": { + "474:10": { "preRequisites:11": [ 593 ], @@ -30376,7 +30498,7 @@ } } }, - "472:10": { + "475:10": { "preRequisites:11": [ 608 ], @@ -30430,7 +30552,7 @@ } } }, - "473:10": { + "476:10": { "preRequisites:11": [ 602 ], @@ -30484,7 +30606,7 @@ } } }, - "474:10": { + "477:10": { "preRequisites:11": [ 582 ], @@ -30562,7 +30684,7 @@ } } }, - "475:10": { + "478:10": { "preRequisites:11": [ 564, 574 @@ -30603,7 +30725,7 @@ } } }, - "476:10": { + "479:10": { "preRequisites:11": [ 563, 578 @@ -30658,7 +30780,7 @@ } } }, - "477:10": { + "480:10": { "preRequisites:11": [ 602 ], @@ -30724,7 +30846,7 @@ } } }, - "478:10": { + "481:10": { "preRequisites:11": [ 602 ], @@ -30778,7 +30900,7 @@ } } }, - "479:10": { + "482:10": { "preRequisites:11": [ 578 ], @@ -30832,7 +30954,7 @@ } } }, - "480:10": { + "483:10": { "preRequisites:11": [ 609 ], @@ -30910,7 +31032,7 @@ } } }, - "481:10": { + "484:10": { "preRequisites:11": [ 588 ], @@ -30964,7 +31086,7 @@ } } }, - "482:10": { + "485:10": { "preRequisites:11": [ 567 ], @@ -31012,46 +31134,16 @@ "0:10": { "Amount:3": 1000, "FluidName:8": "oxygen" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "1:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 1, - "requiredFluids:9": { - "0:10": { + }, + "1:10": { "Amount:3": 1000, "FluidName:8": "nitrogen" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "2:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 2, - "requiredFluids:9": { - "0:10": { + }, + "2:10": { "Amount:3": 1000, "FluidName:8": "helium" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "3:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 3, - "requiredFluids:9": { - "0:10": { + }, + "3:10": { "Amount:3": 1000, "FluidName:8": "argon" } @@ -31060,7 +31152,7 @@ } } }, - "483:10": { + "486:10": { "preRequisites:11": [ 588 ], @@ -31146,7 +31238,7 @@ } } }, - "484:10": { + "487:10": { "preRequisites:11": [ 570, 600 @@ -31201,7 +31293,7 @@ } } }, - "485:10": { + "488:10": { "preRequisites:11": [ 562, 593 @@ -31256,7 +31348,7 @@ } } }, - "486:10": { + "489:10": { "preRequisites:11": [ 602, 98 @@ -31325,7 +31417,7 @@ } } }, - "487:10": { + "490:10": { "preRequisites:11": [ 474, 489 @@ -31380,7 +31472,7 @@ } } }, - "488:10": { + "491:10": { "preRequisites:11": [ 615 ], @@ -31458,7 +31550,7 @@ } } }, - "489:10": { + "492:10": { "preRequisites:11": [ 602 ], @@ -31562,7 +31654,7 @@ } } }, - "490:10": { + "493:10": { "preRequisites:11": [ 567 ], @@ -31610,88 +31702,28 @@ "0:10": { "Amount:3": 1000, "FluidName:8": "phenol" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "1:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 1, - "requiredFluids:9": { - "0:10": { + }, + "1:10": { "Amount:3": 1000, "FluidName:8": "benzene" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "2:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 2, - "requiredFluids:9": { - "0:10": { + }, + "2:10": { "Amount:3": 1000, "FluidName:8": "toluene" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "3:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 3, - "requiredFluids:9": { - "0:10": { + }, + "3:10": { "Amount:3": 1000, "FluidName:8": "dimethylbenzene" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "4:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 4, - "requiredFluids:9": { - "0:10": { + }, + "4:10": { "Amount:3": 1000, "FluidName:8": "acetic_acid" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "5:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 5, - "requiredFluids:9": { - "0:10": { + }, + "5:10": { "Amount:3": 1000, "FluidName:8": "methanol" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "6:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 6, - "requiredFluids:9": { - "0:10": { + }, + "6:10": { "Amount:3": 1000, "FluidName:8": "acetone" } @@ -31700,7 +31732,7 @@ } } }, - "491:10": { + "494:10": { "preRequisites:11": [ 602 ], @@ -31754,7 +31786,7 @@ } } }, - "492:10": { + "495:10": { "preRequisites:11": [ 601, 504 @@ -31833,7 +31865,7 @@ } } }, - "493:10": { + "496:10": { "preRequisites:11": [ 596, 567 @@ -31888,7 +31920,7 @@ } } }, - "494:10": { + "497:10": { "preRequisites:11": [ 602, 104 @@ -31943,7 +31975,7 @@ } } }, - "495:10": { + "498:10": { "preRequisites:11": [ 588 ], @@ -31997,7 +32029,7 @@ } } }, - "496:10": { + "499:10": { "preRequisites:11": [ 567 ], @@ -32051,7 +32083,7 @@ } } }, - "497:10": { + "500:10": { "preRequisites:11": [ 569 ], @@ -32105,7 +32137,7 @@ } } }, - "498:10": { + "501:10": { "preRequisites:11": [ 571 ], @@ -32159,7 +32191,7 @@ } } }, - "499:10": { + "502:10": { "preRequisites:11": [ 595, 627 @@ -32214,7 +32246,7 @@ } } }, - "500:10": { + "503:10": { "preRequisites:11": [ 602 ], @@ -32268,7 +32300,7 @@ } } }, - "501:10": { + "504:10": { "preRequisiteTypes:7": [ 1 ], @@ -32292,7 +32324,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Extrusion Machine", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -32325,7 +32357,7 @@ } } }, - "502:10": { + "505:10": { "preRequisiteTypes:7": [ 1 ], @@ -32349,7 +32381,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Extracting Machine", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -32382,7 +32414,7 @@ } } }, - "503:10": { + "506:10": { "preRequisiteTypes:7": [ 1 ], @@ -32439,7 +32471,7 @@ } } }, - "504:10": { + "507:10": { "preRequisites:11": [ 646 ], @@ -32511,7 +32543,7 @@ } } }, - "505:10": { + "508:10": { "preRequisites:11": [ 621 ], @@ -32551,7 +32583,7 @@ } } }, - "506:10": { + "509:10": { "preRequisites:11": [ 622 ], @@ -32591,7 +32623,7 @@ } } }, - "507:10": { + "510:10": { "preRequisites:11": [ 627 ], @@ -32645,7 +32677,7 @@ } } }, - "508:10": { + "511:10": { "preRequisites:11": [ 649 ], @@ -32699,7 +32731,7 @@ } } }, - "509:10": { + "512:10": { "preRequisiteTypes:7": [ 1 ], @@ -32723,7 +32755,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Sifting Funnel", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -32756,7 +32788,7 @@ } } }, - "510:10": { + "513:10": { "preRequisiteTypes:7": [ 1 ], @@ -32780,7 +32812,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Autoclave Chamber", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -32813,7 +32845,7 @@ } } }, - "511:10": { + "514:10": { "preRequisites:11": [ 632, 582 @@ -32868,7 +32900,7 @@ } } }, - "512:10": { + "515:10": { "preRequisites:11": [ 602, 562 @@ -32923,7 +32955,7 @@ } } }, - "513:10": { + "516:10": { "preRequisiteTypes:7": [ 1 ], @@ -32947,7 +32979,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Electrolysis Plant", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -32980,7 +33012,7 @@ } } }, - "514:10": { + "517:10": { "preRequisites:11": [ 672, 607 @@ -33059,7 +33091,7 @@ } } }, - "515:10": { + "518:10": { "preRequisites:11": [ 626, 653 @@ -33114,7 +33146,7 @@ } } }, - "516:10": { + "519:10": { "preRequisiteTypes:7": [ 1 ], @@ -33138,7 +33170,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Engraving Machine", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -33171,7 +33203,7 @@ } } }, - "517:10": { + "520:10": { "preRequisiteTypes:7": [ 1 ], @@ -33246,7 +33278,7 @@ } } }, - "518:10": { + "521:10": { "preRequisiteTypes:7": [ 1 ], @@ -33270,7 +33302,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Electromagnet", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -33303,7 +33335,7 @@ } } }, - "519:10": { + "522:10": { "preRequisites:11": [ 619 ], @@ -33375,7 +33407,7 @@ } } }, - "520:10": { + "523:10": { "preRequisiteTypes:7": [ 1 ], @@ -33399,7 +33431,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Mixing Vessel", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -33432,7 +33464,7 @@ } } }, - "521:10": { + "524:10": { "preRequisites:11": [ 678 ], @@ -33453,7 +33485,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "脳みその処理能力が上がります", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -33510,7 +33542,7 @@ } } }, - "522:10": { + "525:10": { "preRequisites:11": [ 680 ], @@ -33588,7 +33620,7 @@ } } }, - "523:10": { + "526:10": { "preRequisites:11": [ 650 ], @@ -33642,7 +33674,7 @@ } } }, - "524:10": { + "527:10": { "preRequisites:11": [ 627 ], @@ -33696,7 +33728,7 @@ } } }, - "525:10": { + "528:10": { "preRequisites:11": [ 627 ], @@ -33750,7 +33782,7 @@ } } }, - "526:10": { + "529:10": { "preRequisiteTypes:7": [ 1 ], @@ -33774,7 +33806,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Centrifuge Unit", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -33807,7 +33839,7 @@ } } }, - "527:10": { + "530:10": { "preRequisites:11": [ 563, 627 @@ -33862,7 +33894,7 @@ } } }, - "528:10": { + "531:10": { "preRequisiteTypes:7": [ 0, 1 @@ -33921,7 +33953,7 @@ } } }, - "529:10": { + "532:10": { "preRequisites:11": [ 627 ], @@ -33975,7 +34007,7 @@ } } }, - "530:10": { + "533:10": { "preRequisiteTypes:7": [ 1 ], @@ -34086,7 +34118,7 @@ } } }, - "531:10": { + "534:10": { "preRequisites:11": [ 645, 676 @@ -34141,7 +34173,7 @@ } } }, - "532:10": { + "535:10": { "preRequisiteTypes:7": [ 1 ], @@ -34165,7 +34197,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Wire Factory", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -34198,7 +34230,7 @@ } } }, - "533:10": { + "536:10": { "preRequisiteTypes:7": [ 1 ], @@ -34222,7 +34254,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Material Press", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -34255,7 +34287,7 @@ } } }, - "534:10": { + "537:10": { "preRequisites:11": [ 640 ], @@ -34309,7 +34341,7 @@ } } }, - "535:10": { + "538:10": { "preRequisiteTypes:7": [ 0, 1, @@ -34370,7 +34402,7 @@ } } }, - "536:10": { + "539:10": { "preRequisites:11": [ 679, 655 @@ -34425,7 +34457,7 @@ } } }, - "537:10": { + "540:10": { "preRequisiteTypes:7": [ 1 ], @@ -34449,7 +34481,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Brewing Vat", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -34482,7 +34514,7 @@ } } }, - "538:10": { + "541:10": { "preRequisites:11": [ 604, 627 @@ -34549,7 +34581,7 @@ } } }, - "539:10": { + "542:10": { "preRequisites:11": [ 627 ], @@ -34599,7 +34631,7 @@ } } }, - "540:10": { + "543:10": { "preRequisites:11": [ 627 ], @@ -34653,7 +34685,7 @@ } } }, - "541:10": { + "544:10": { "preRequisites:11": [ 634 ], @@ -34693,7 +34725,7 @@ } } }, - "542:10": { + "545:10": { "preRequisites:11": [ 629, 655 @@ -34748,7 +34780,7 @@ } } }, - "543:10": { + "546:10": { "preRequisites:11": [ 645 ], @@ -34802,7 +34834,7 @@ } } }, - "544:10": { + "547:10": { "preRequisites:11": [ 657, 653, @@ -34882,7 +34914,7 @@ } } }, - "545:10": { + "548:10": { "preRequisiteTypes:7": [ 1 ], @@ -34906,7 +34938,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Assembling Factory", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -34939,7 +34971,7 @@ } } }, - "546:10": { + "549:10": { "preRequisites:11": [ 677 ], @@ -34993,7 +35025,7 @@ } } }, - "547:10": { + "550:10": { "preRequisiteTypes:7": [ 1 ], @@ -35017,7 +35049,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Cutting Machine", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -35050,7 +35082,7 @@ } } }, - "548:10": { + "551:10": { "preRequisites:11": [ 626 ], @@ -35104,7 +35136,7 @@ } } }, - "549:10": { + "552:10": { "preRequisiteTypes:7": [ 1 ], @@ -35128,7 +35160,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Electric Implosion Compressor", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -35161,7 +35193,7 @@ } } }, - "550:10": { + "553:10": { "preRequisiteTypes:7": [ 1 ], @@ -35185,7 +35217,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Fractionating Distillery", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -35218,7 +35250,7 @@ } } }, - "551:10": { + "554:10": { "preRequisites:11": [ 663, 646 @@ -35273,7 +35305,7 @@ } } }, - "552:10": { + "555:10": { "preRequisiteTypes:7": [ 1 ], @@ -35297,7 +35329,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Solidification Array", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -35330,7 +35362,7 @@ } } }, - "553:10": { + "556:10": { "preRequisites:11": [ 678 ], @@ -35351,7 +35383,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "コックさんが増えます", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -35402,7 +35434,7 @@ } } }, - "554:10": { + "557:10": { "preRequisites:11": [ 632 ], @@ -35456,7 +35488,7 @@ } } }, - "555:10": { + "558:10": { "preRequisiteTypes:7": [ 1 ], @@ -35480,7 +35512,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Chemical Bath", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -35513,7 +35545,7 @@ } } }, - "556:10": { + "559:10": { "preRequisites:11": [ 627 ], @@ -35675,7 +35707,7 @@ } } }, - "557:10": { + "560:10": { "preRequisites:11": [ 654, 626 @@ -35802,7 +35834,7 @@ } } }, - "558:10": { + "561:10": { "preRequisites:11": [ 655 ], @@ -35874,7 +35906,7 @@ } } }, - "559:10": { + "562:10": { "preRequisiteTypes:7": [ 1 ], @@ -35898,7 +35930,7 @@ "issilent:1": 0, "lockedprogress:1": 0, "name:8": "Large Arc Smelter", - "questlogic:8": "AND", + "questlogic:8": "OR", "repeat_relative:1": 1, "repeattime:3": -1, "simultaneous:1": 0, @@ -35931,7 +35963,7 @@ } } }, - "560:10": { + "563:10": { "preRequisites:11": [ 644 ], @@ -35991,7 +36023,7 @@ } } }, - "561:10": { + "564:10": { "preRequisites:11": [ 638 ], @@ -36045,7 +36077,7 @@ } } }, - "562:10": { + "565:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -36083,7 +36115,7 @@ } } }, - "563:10": { + "566:10": { "preRequisites:11": [ 627 ], @@ -36173,7 +36205,7 @@ } } }, - "564:10": { + "567:10": { "preRequisites:11": [ 653, 646 @@ -36234,7 +36266,7 @@ } } }, - "565:10": { + "568:10": { "preRequisites:11": [ 699 ], @@ -36288,7 +36320,7 @@ } } }, - "566:10": { + "569:10": { "preRequisites:11": [ 691 ], @@ -36360,7 +36392,7 @@ } } }, - "567:10": { + "570:10": { "preRequisites:11": [ 691 ], @@ -36432,7 +36464,7 @@ } } }, - "568:10": { + "571:10": { "preRequisites:11": [ 704 ], @@ -36486,7 +36518,7 @@ } } }, - "569:10": { + "572:10": { "preRequisites:11": [ 718 ], @@ -36540,7 +36572,7 @@ } } }, - "570:10": { + "573:10": { "preRequisites:11": [ 702 ], @@ -36594,7 +36626,7 @@ } } }, - "571:10": { + "574:10": { "preRequisites:11": [ 713 ], @@ -36648,7 +36680,7 @@ } } }, - "572:10": { + "575:10": { "preRequisites:11": [ 692 ], @@ -36702,7 +36734,7 @@ } } }, - "573:10": { + "576:10": { "preRequisites:11": [ 718, 691 @@ -36761,7 +36793,7 @@ } } }, - "574:10": { + "577:10": { "preRequisites:11": [ 718 ], @@ -36815,7 +36847,7 @@ } } }, - "575:10": { + "578:10": { "preRequisites:11": [ 627, 642 @@ -36870,7 +36902,7 @@ } } }, - "576:10": { + "579:10": { "preRequisites:11": [ 702 ], @@ -36930,7 +36962,7 @@ } } }, - "577:10": { + "580:10": { "preRequisites:11": [ 691 ], @@ -37008,7 +37040,7 @@ } } }, - "578:10": { + "581:10": { "preRequisites:11": [ 703 ], @@ -37062,7 +37094,7 @@ } } }, - "579:10": { + "582:10": { "preRequisites:11": [ 693 ], @@ -37152,7 +37184,7 @@ } } }, - "580:10": { + "583:10": { "preRequisites:11": [ 701 ], @@ -37206,7 +37238,7 @@ } } }, - "581:10": { + "584:10": { "preRequisiteTypes:7": [ 0, 1, @@ -37267,7 +37299,7 @@ } } }, - "582:10": { + "585:10": { "preRequisites:11": [ 692 ], @@ -37327,7 +37359,7 @@ } } }, - "583:10": { + "586:10": { "preRequisites:11": [ 706, 694, @@ -37408,7 +37440,7 @@ } } }, - "584:10": { + "587:10": { "preRequisites:11": [ 714 ], @@ -37462,7 +37494,7 @@ } } }, - "585:10": { + "588:10": { "preRequisites:11": [ 686 ], @@ -37516,7 +37548,7 @@ } } }, - "586:10": { + "589:10": { "preRequisites:11": [ 699 ], @@ -37570,7 +37602,7 @@ } } }, - "587:10": { + "590:10": { "preRequisites:11": [ 718 ], @@ -37628,7 +37660,7 @@ } } }, - "588:10": { + "591:10": { "preRequisites:11": [ 713 ], @@ -37682,7 +37714,7 @@ } } }, - "589:10": { + "592:10": { "preRequisiteTypes:7": [ 0, 1 @@ -37741,7 +37773,7 @@ } } }, - "590:10": { + "593:10": { "preRequisites:11": [ 691 ], @@ -37795,7 +37827,7 @@ } } }, - "591:10": { + "594:10": { "preRequisites:11": [ 696 ], @@ -37849,7 +37881,7 @@ } } }, - "592:10": { + "595:10": { "preRequisites:11": [ 713 ], @@ -37903,7 +37935,7 @@ } } }, - "593:10": { + "596:10": { "preRequisites:11": [ 683 ], @@ -37969,7 +38001,7 @@ } } }, - "594:10": { + "597:10": { "preRequisites:11": [ 691 ], @@ -38023,7 +38055,7 @@ } } }, - "595:10": { + "598:10": { "preRequisites:11": [ 691 ], @@ -38077,7 +38109,7 @@ } } }, - "596:10": { + "599:10": { "preRequisites:11": [ 691 ], @@ -38131,7 +38163,7 @@ } } }, - "597:10": { + "600:10": { "preRequisites:11": [ 699 ], @@ -38185,7 +38217,7 @@ } } }, - "598:10": { + "601:10": { "preRequisites:11": [ 699 ], @@ -38239,7 +38271,7 @@ } } }, - "599:10": { + "602:10": { "preRequisites:11": [ 719 ], @@ -38293,7 +38325,7 @@ } } }, - "600:10": { + "603:10": { "preRequisites:11": [ 682, 683 @@ -38384,7 +38416,7 @@ } } }, - "601:10": { + "604:10": { "preRequisites:11": [ 693, 704 @@ -38439,7 +38471,7 @@ } } }, - "602:10": { + "605:10": { "preRequisites:11": [ 692 ], @@ -38499,7 +38531,7 @@ } } }, - "603:10": { + "606:10": { "preRequisites:11": [ 750, 715 @@ -38554,7 +38586,7 @@ } } }, - "604:10": { + "607:10": { "preRequisites:11": [ 727, 707 @@ -38609,7 +38641,7 @@ } } }, - "605:10": { + "608:10": { "preRequisites:11": [ 733 ], @@ -38663,7 +38695,7 @@ } } }, - "606:10": { + "609:10": { "preRequisites:11": [ 740 ], @@ -38717,7 +38749,7 @@ } } }, - "607:10": { + "610:10": { "preRequisites:11": [ 741, 729 @@ -38772,7 +38804,7 @@ } } }, - "608:10": { + "611:10": { "preRequisites:11": [ 749, 751 @@ -38869,7 +38901,7 @@ } } }, - "609:10": { + "612:10": { "preRequisites:11": [ 738 ], @@ -38923,7 +38955,7 @@ } } }, - "610:10": { + "613:10": { "preRequisites:11": [ 724 ], @@ -38977,7 +39009,7 @@ } } }, - "611:10": { + "614:10": { "preRequisites:11": [ 728, 697 @@ -39032,7 +39064,7 @@ } } }, - "612:10": { + "615:10": { "preRequisites:11": [ 730 ], @@ -39086,7 +39118,7 @@ } } }, - "613:10": { + "616:10": { "preRequisites:11": [ 739, 754 @@ -39141,7 +39173,7 @@ } } }, - "614:10": { + "617:10": { "preRequisites:11": [ 726 ], @@ -39195,7 +39227,7 @@ } } }, - "615:10": { + "618:10": { "preRequisites:11": [ 734 ], @@ -39249,7 +39281,7 @@ } } }, - "616:10": { + "619:10": { "preRequisites:11": [ 730 ], @@ -39303,7 +39335,7 @@ } } }, - "617:10": { + "620:10": { "preRequisites:11": [ 727 ], @@ -39357,7 +39389,7 @@ } } }, - "618:10": { + "621:10": { "preRequisites:11": [ 753 ], @@ -39435,7 +39467,7 @@ } } }, - "619:10": { + "622:10": { "preRequisites:11": [ 750, 681 @@ -39490,7 +39522,7 @@ } } }, - "620:10": { + "623:10": { "preRequisites:11": [ 727 ], @@ -39550,7 +39582,7 @@ } } }, - "621:10": { + "624:10": { "preRequisites:11": [ 724 ], @@ -39604,7 +39636,7 @@ } } }, - "622:10": { + "625:10": { "preRequisites:11": [ 741 ], @@ -39658,7 +39690,7 @@ } } }, - "623:10": { + "626:10": { "preRequisites:11": [ 729 ], @@ -39712,10 +39744,9 @@ } } }, - "624:10": { + "627:10": { "preRequisites:11": [ - 750, - 781 + 750 ], "properties:10": { "betterquesting:10": { @@ -39767,7 +39798,7 @@ } } }, - "625:10": { + "628:10": { "preRequisites:11": [ 730 ], @@ -39821,7 +39852,7 @@ } } }, - "626:10": { + "629:10": { "preRequisites:11": [ 750 ], @@ -39852,7 +39883,7 @@ "simultaneous:1": 0, "snd_complete:8": "minecraft:entity.player.levelup", "snd_update:8": "minecraft:entity.player.levelup", - "tasklogic:8": "OR", + "tasklogic:8": "AND", "visibility:8": "ALWAYS" } }, @@ -39869,18 +39900,8 @@ "0:10": { "Amount:3": 1000, "FluidName:8": "plasma.nitrogen" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "1:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 1, - "requiredFluids:9": { - "0:10": { + }, + "1:10": { "Amount:3": 1000, "FluidName:8": "plasma.oxygen" } @@ -39889,7 +39910,7 @@ } } }, - "627:10": { + "630:10": { "preRequisites:11": [ 753 ], @@ -39943,7 +39964,7 @@ } } }, - "628:10": { + "631:10": { "preRequisiteTypes:7": [ 1, 0 @@ -40026,7 +40047,7 @@ } } }, - "629:10": { + "632:10": { "preRequisites:11": [ 732, 737, @@ -40100,7 +40121,7 @@ } } }, - "630:10": { + "633:10": { "preRequisites:11": [ 753 ], @@ -40208,7 +40229,7 @@ } } }, - "631:10": { + "634:10": { "preRequisiteTypes:7": [ 0, 1 @@ -40267,7 +40288,7 @@ } } }, - "632:10": { + "635:10": { "preRequisites:11": [ 691, 684 @@ -40322,7 +40343,7 @@ } } }, - "633:10": { + "636:10": { "preRequisites:11": [ 727 ], @@ -40388,7 +40409,7 @@ } } }, - "634:10": { + "637:10": { "preRequisites:11": [ 723, 754 @@ -40443,7 +40464,7 @@ } } }, - "635:10": { + "638:10": { "preRequisites:11": [ 766 ], @@ -40497,7 +40518,7 @@ } } }, - "636:10": { + "639:10": { "preRequisites:11": [ 783 ], @@ -40551,7 +40572,7 @@ } } }, - "637:10": { + "640:10": { "preRequisites:11": [ 749 ], @@ -40629,7 +40650,7 @@ } } }, - "638:10": { + "641:10": { "preRequisites:11": [ 781 ], @@ -40683,7 +40704,7 @@ } } }, - "639:10": { + "642:10": { "preRequisiteTypes:7": [ 0, 1 @@ -40742,7 +40763,7 @@ } } }, - "640:10": { + "643:10": { "preRequisites:11": [ 766 ], @@ -40773,7 +40794,7 @@ "simultaneous:1": 0, "snd_complete:8": "minecraft:entity.player.levelup", "snd_update:8": "minecraft:entity.player.levelup", - "tasklogic:8": "OR", + "tasklogic:8": "AND", "visibility:8": "ALWAYS" } }, @@ -40790,18 +40811,8 @@ "0:10": { "Amount:3": 1000, "FluidName:8": "plasma.iron" - } - }, - "taskID:8": "bq_standard:fluid" - }, - "1:10": { - "autoConsume:1": 0, - "consume:1": 1, - "groupDetect:1": 0, - "ignoreNBT:1": 0, - "index:3": 1, - "requiredFluids:9": { - "0:10": { + }, + "1:10": { "Amount:3": 1000, "FluidName:8": "plasma.nickel" } @@ -40810,7 +40821,7 @@ } } }, - "641:10": { + "644:10": { "preRequisites:11": [ 756 ], @@ -40864,7 +40875,7 @@ } } }, - "642:10": { + "645:10": { "preRequisites:11": [ 775, 784 @@ -40919,7 +40930,7 @@ } } }, - "643:10": { + "646:10": { "preRequisites:11": [ 756 ], @@ -40973,7 +40984,7 @@ } } }, - "644:10": { + "647:10": { "preRequisites:11": [ 781 ], @@ -41051,7 +41062,7 @@ } } }, - "645:10": { + "648:10": { "preRequisites:11": [ 779, 767, @@ -41125,7 +41136,7 @@ } } }, - "646:10": { + "649:10": { "preRequisites:11": [ 773 ], @@ -41179,7 +41190,7 @@ } } }, - "647:10": { + "650:10": { "preRequisites:11": [ 783 ], @@ -41233,7 +41244,7 @@ } } }, - "648:10": { + "651:10": { "preRequisites:11": [ 783, 771 @@ -41288,7 +41299,7 @@ } } }, - "649:10": { + "652:10": { "preRequisites:11": [ 765 ], @@ -41342,7 +41353,7 @@ } } }, - "650:10": { + "653:10": { "preRequisites:11": [ 773 ], @@ -41402,7 +41413,7 @@ } } }, - "651:10": { + "654:10": { "preRequisites:11": [ 756 ], @@ -41456,7 +41467,7 @@ } } }, - "652:10": { + "655:10": { "preRequisites:11": [ 758 ], @@ -41510,7 +41521,7 @@ } } }, - "653:10": { + "656:10": { "preRequisites:11": [ 769 ], @@ -41564,7 +41575,7 @@ } } }, - "654:10": { + "657:10": { "preRequisites:11": [ 764, 758 @@ -41643,7 +41654,7 @@ } } }, - "655:10": { + "658:10": { "preRequisites:11": [ 770, 730 @@ -41698,7 +41709,7 @@ } } }, - "656:10": { + "659:10": { "preRequisites:11": [ 765 ], @@ -41752,7 +41763,7 @@ } } }, - "657:10": { + "660:10": { "preRequisites:11": [ 756 ], @@ -41806,7 +41817,7 @@ } } }, - "658:10": { + "661:10": { "preRequisites:11": [ 773, 735 @@ -41861,9 +41872,10 @@ } } }, - "659:10": { + "662:10": { "preRequisites:11": [ - 753 + 753, + 745 ], "properties:10": { "betterquesting:10": { @@ -41915,7 +41927,7 @@ } } }, - "660:10": { + "663:10": { "preRequisites:11": [ 756 ], @@ -41999,7 +42011,7 @@ } } }, - "661:10": { + "664:10": { "preRequisites:11": [ 762 ], @@ -42065,7 +42077,7 @@ } } }, - "662:10": { + "665:10": { "preRequisites:11": [ 756, 781 @@ -42120,7 +42132,7 @@ } } }, - "663:10": { + "666:10": { "preRequisites:11": [ 791 ], @@ -42174,7 +42186,7 @@ } } }, - "664:10": { + "667:10": { "preRequisites:11": [ 797 ], @@ -42228,7 +42240,7 @@ } } }, - "665:10": { + "668:10": { "preRequisites:11": [ 789 ], @@ -42282,7 +42294,7 @@ } } }, - "666:10": { + "669:10": { "preRequisites:11": [ 801 ], @@ -42336,7 +42348,7 @@ } } }, - "667:10": { + "670:10": { "preRequisiteTypes:7": [ 0, 1 @@ -42395,7 +42407,7 @@ } } }, - "668:10": { + "671:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -42447,7 +42459,7 @@ } } }, - "669:10": { + "672:10": { "preRequisites:11": [ 796, 119 @@ -42508,7 +42520,7 @@ } } }, - "670:10": { + "673:10": { "preRequisites:11": [ 118 ], @@ -42596,7 +42608,7 @@ } } }, - "671:10": { + "674:10": { "preRequisites:11": [ 793, 119 @@ -42669,7 +42681,7 @@ } } }, - "672:10": { + "675:10": { "preRequisites:11": [ 799 ], @@ -42723,7 +42735,7 @@ } } }, - "673:10": { + "676:10": { "preRequisites:11": [ 117 ], @@ -42807,7 +42819,7 @@ } } }, - "674:10": { + "677:10": { "preRequisites:11": [ 790 ], @@ -42861,7 +42873,7 @@ } } }, - "675:10": { + "678:10": { "preRequisites:11": [ 121 ], @@ -42933,7 +42945,7 @@ } } }, - "676:10": { + "679:10": { "preRequisites:11": [ 798 ], @@ -43005,7 +43017,7 @@ } } }, - "677:10": { + "680:10": { "preRequisites:11": [ 788 ], @@ -43059,7 +43071,7 @@ } } }, - "678:10": { + "681:10": { "preRequisiteTypes:7": [ 0, 1 @@ -43118,7 +43130,7 @@ } } }, - "679:10": { + "682:10": { "preRequisites:11": [ 814 ], @@ -43172,7 +43184,7 @@ } } }, - "680:10": { + "683:10": { "preRequisites:11": [ 802 ], @@ -43226,7 +43238,7 @@ } } }, - "681:10": { + "684:10": { "preRequisites:11": [ 812, 817, @@ -43282,7 +43294,7 @@ } } }, - "682:10": { + "685:10": { "preRequisites:11": [ 810 ], @@ -43336,7 +43348,7 @@ } } }, - "683:10": { + "686:10": { "preRequisites:11": [ 804 ], @@ -43390,7 +43402,7 @@ } } }, - "684:10": { + "687:10": { "preRequisites:11": [ 816 ], @@ -43444,7 +43456,7 @@ } } }, - "685:10": { + "688:10": { "preRequisites:11": [ 357 ], @@ -43498,7 +43510,7 @@ } } }, - "686:10": { + "689:10": { "preRequisites:11": [ 807 ], @@ -43552,7 +43564,7 @@ } } }, - "687:10": { + "690:10": { "preRequisites:11": [ 809 ], @@ -43606,7 +43618,7 @@ } } }, - "688:10": { + "691:10": { "preRequisites:11": [ 806 ], @@ -43660,7 +43672,7 @@ } } }, - "689:10": { + "692:10": { "preRequisites:11": [ 805 ], @@ -43732,7 +43744,7 @@ } } }, - "690:10": { + "693:10": { "preRequisites:11": [ 805 ], @@ -43810,7 +43822,7 @@ } } }, - "691:10": { + "694:10": { "preRequisites:11": [ 815 ], @@ -43864,7 +43876,7 @@ } } }, - "692:10": { + "695:10": { "preRequisites:11": [ 808, 619, @@ -43920,7 +43932,7 @@ } } }, - "693:10": { + "696:10": { "preRequisites:11": [ 803 ], @@ -43974,7 +43986,7 @@ } } }, - "694:10": { + "697:10": { "preRequisites:11": [ 805 ], @@ -44028,7 +44040,7 @@ } } }, - "695:10": { + "698:10": { "preRequisiteTypes:7": [ 1 ], @@ -44091,7 +44103,7 @@ } } }, - "696:10": { + "699:10": { "preRequisiteTypes:7": [ 1 ], @@ -44166,7 +44178,7 @@ } } }, - "697:10": { + "700:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -44204,7 +44216,7 @@ } } }, - "698:10": { + "701:10": { "preRequisiteTypes:7": [ 1 ], @@ -44303,7 +44315,7 @@ } } }, - "699:10": { + "702:10": { "preRequisiteTypes:7": [ 1 ], @@ -44402,7 +44414,7 @@ } } }, - "700:10": { + "703:10": { "preRequisiteTypes:7": [ 1 ], @@ -44477,7 +44489,7 @@ } } }, - "701:10": { + "704:10": { "preRequisiteTypes:7": [ 1 ], @@ -44576,7 +44588,7 @@ } } }, - "702:10": { + "705:10": { "preRequisiteTypes:7": [ 1 ], @@ -44651,7 +44663,7 @@ } } }, - "703:10": { + "706:10": { "preRequisiteTypes:7": [ 1 ], @@ -44750,7 +44762,7 @@ } } }, - "704:10": { + "707:10": { "preRequisiteTypes:7": [ 1 ], @@ -46155,8 +46167,8 @@ "id:3": 260, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 152, - "y:3": 240 + "x:3": 200, + "y:3": 192 }, "14:10": { "id:3": 261, @@ -46282,7 +46294,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 200, - "y:3": 192 + "y:3": 240 }, "32:10": { "id:3": 279, @@ -46365,7 +46377,7 @@ "id:3": 290, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 200, + "x:3": 152, "y:3": 240 }, "44:10": { @@ -47171,7 +47183,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 192, - "y:3": 288 + "y:3": 240 }, "18:10": { "id:3": 401, @@ -47219,7 +47231,7 @@ "id:3": 407, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 0, + "x:3": 48, "y:3": 192 }, "25:10": { @@ -47241,13 +47253,13 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 192, - "y:3": 240 + "y:3": 192 }, "28:10": { "id:3": 411, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, + "x:3": 144, "y:3": 240 }, "29:10": { @@ -47255,7 +47267,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 0, - "y:3": 240 + "y:3": 288 }, "30:10": { "id:3": 413, @@ -47338,7 +47350,7 @@ "id:3": 425, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, + "x:3": 96, "y:3": 240 }, "42:10": { @@ -47556,14 +47568,14 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 192, - "y:3": 192 + "y:3": 240 }, "8:10": { "id:3": 447, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 384, - "y:3": 288 + "x:3": 240, + "y:3": 336 }, "9:10": { "id:3": 448, @@ -47591,7 +47603,7 @@ "sizeX:3": 40, "sizeY:3": 40, "x:3": 472, - "y:3": 232 + "y:3": 184 }, "13:10": { "id:3": 452, @@ -47604,7 +47616,7 @@ "id:3": 454, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 240, + "x:3": 96, "y:3": 384 }, "15:10": { @@ -47682,21 +47694,21 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 432, - "y:3": 384 + "y:3": 336 }, "26:10": { "id:3": 466, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 432, - "y:3": 192 + "x:3": 336, + "y:3": 288 }, "27:10": { "id:3": 467, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 480, - "y:3": 288 + "x:3": 432, + "y:3": 240 }, "28:10": { "id:3": 468, @@ -47730,14 +47742,14 @@ "id:3": 472, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 240, + "x:3": 192, "y:3": 288 }, "33:10": { "id:3": 473, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, + "x:3": 48, "y:3": 384 }, "34:10": { @@ -47751,14 +47763,14 @@ "id:3": 475, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, + "x:3": 96, "y:3": 336 }, "36:10": { "id:3": 476, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 240, + "x:3": 144, "y:3": 336 }, "37:10": { @@ -47780,14 +47792,14 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 384, - "y:3": 384 + "y:3": 336 }, "40:10": { "id:3": 480, "sizeX:3": 24, "sizeY:3": 24, "x:3": 384, - "y:3": 336 + "y:3": 288 }, "41:10": { "id:3": 481, @@ -47800,7 +47812,7 @@ "id:3": 482, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, + "x:3": 0, "y:3": 240 }, "43:10": { @@ -47814,7 +47826,7 @@ "id:3": 484, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, + "x:3": 48, "y:3": 336 }, "45:10": { @@ -47842,14 +47854,14 @@ "id:3": 488, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, + "x:3": 96, "y:3": 288 }, "49:10": { "id:3": 489, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 528, + "x:3": 480, "y:3": 288 }, "50:10": { @@ -47871,7 +47883,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 192, - "y:3": 288 + "y:3": 336 }, "53:10": { "id:3": 493, @@ -47892,28 +47904,28 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 480, - "y:3": 192 + "y:3": 240 }, "56:10": { "id:3": 496, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, - "y:3": 240 + "x:3": 240, + "y:3": 192 }, "57:10": { "id:3": 497, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 432, - "y:3": 288 + "x:3": 384, + "y:3": 240 }, "58:10": { "id:3": 498, "sizeX:3": 24, "sizeY:3": 24, "x:3": 432, - "y:3": 336 + "y:3": 288 }, "59:10": { "id:3": 499, @@ -47941,7 +47953,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 528, - "y:3": 384 + "y:3": 336 }, "63:10": { "id:3": 503, @@ -47955,13 +47967,13 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 480, - "y:3": 384 + "y:3": 336 }, "65:10": { "id:3": 505, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, + "x:3": 48, "y:3": 240 }, "66:10": { @@ -48042,363 +48054,370 @@ "y:3": 288 }, "4:10": { + "id:3": 134, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": 432, + "y:3": 288 + }, + "5:10": { "id:3": 510, "sizeX:3": 24, "sizeY:3": 24, "x:3": 528, "y:3": 48 }, - "5:10": { + "6:10": { "id:3": 511, "sizeX:3": 24, "sizeY:3": 24, "x:3": 192, "y:3": 0 }, - "6:10": { + "7:10": { "id:3": 512, "sizeX:3": 24, "sizeY:3": 24, "x:3": 240, "y:3": 192 }, - "7:10": { + "8:10": { "id:3": 513, "sizeX:3": 24, "sizeY:3": 24, "x:3": 240, "y:3": 240 }, - "8:10": { + "9:10": { "id:3": 514, "sizeX:3": 24, "sizeY:3": 24, "x:3": 528, "y:3": 144 }, - "9:10": { + "10:10": { "id:3": 515, "sizeX:3": 24, "sizeY:3": 24, "x:3": 48, "y:3": 0 }, - "10:10": { + "11:10": { "id:3": 516, "sizeX:3": 24, "sizeY:3": 24, "x:3": 240, "y:3": 0 }, - "11:10": { + "12:10": { "id:3": 517, "sizeX:3": 24, "sizeY:3": 24, "x:3": 144, "y:3": 0 }, - "12:10": { + "13:10": { "id:3": 518, "sizeX:3": 24, "sizeY:3": 24, "x:3": 0, "y:3": 0 }, - "13:10": { + "14:10": { "id:3": 519, "sizeX:3": 24, "sizeY:3": 24, "x:3": 288, "y:3": 0 }, - "14:10": { + "15:10": { "id:3": 520, "sizeX:3": 24, "sizeY:3": 24, "x:3": 528, "y:3": 240 }, - "15:10": { + "16:10": { "id:3": 521, "sizeX:3": 24, "sizeY:3": 24, "x:3": 288, "y:3": 48 }, - "16:10": { + "17:10": { "id:3": 522, "sizeX:3": 24, "sizeY:3": 24, "x:3": 288, "y:3": 192 }, - "17:10": { + "18:10": { "id:3": 523, "sizeX:3": 24, "sizeY:3": 24, "x:3": 480, "y:3": 144 }, - "18:10": { + "19:10": { "id:3": 524, "sizeX:3": 24, "sizeY:3": 24, "x:3": 336, "y:3": 192 }, - "19:10": { + "20:10": { "id:3": 525, "sizeX:3": 24, "sizeY:3": 24, "x:3": 240, "y:3": 144 }, - "20:10": { + "21:10": { "id:3": 526, "sizeX:3": 24, "sizeY:3": 24, "x:3": 192, "y:3": 48 }, - "21:10": { + "22:10": { "id:3": 527, "sizeX:3": 24, "sizeY:3": 24, "x:3": 336, "y:3": 336 }, - "22:10": { + "23:10": { "id:3": 528, "sizeX:3": 24, "sizeY:3": 24, "x:3": 480, "y:3": 288 }, - "23:10": { + "24:10": { "id:3": 529, "sizeX:3": 24, "sizeY:3": 24, "x:3": 240, "y:3": 96 }, - "24:10": { + "25:10": { "id:3": 530, "sizeX:3": 24, "sizeY:3": 24, "x:3": 336, "y:3": 240 }, - "25:10": { + "26:10": { "id:3": 531, "sizeX:3": 24, "sizeY:3": 24, "x:3": 480, "y:3": 192 }, - "26:10": { + "27:10": { "id:3": 532, "sizeX:3": 24, "sizeY:3": 24, "x:3": 528, "y:3": 96 }, - "27:10": { + "28:10": { "id:3": 533, "sizeX:3": 24, "sizeY:3": 24, "x:3": 480, "y:3": 96 }, - "28:10": { + "29:10": { "id:3": 534, "sizeX:3": 24, "sizeY:3": 24, "x:3": 288, "y:3": 96 }, - "29:10": { + "30:10": { "id:3": 535, "sizeX:3": 24, "sizeY:3": 24, "x:3": 96, "y:3": 0 }, - "30:10": { + "31:10": { "id:3": 536, "sizeX:3": 40, "sizeY:3": 40, "x:3": 328, "y:3": 40 }, - "31:10": { + "32:10": { "id:3": 537, "sizeX:3": 24, "sizeY:3": 24, "x:3": 432, "y:3": 144 }, - "32:10": { + "33:10": { "id:3": 538, "sizeX:3": 24, "sizeY:3": 24, "x:3": 576, "y:3": 48 }, - "33:10": { + "34:10": { "id:3": 539, "sizeX:3": 40, "sizeY:3": 40, "x:3": 376, "y:3": 88 }, - "34:10": { + "35:10": { "id:3": 540, "sizeX:3": 24, "sizeY:3": 24, "x:3": 528, "y:3": 288 }, - "35:10": { + "36:10": { "id:3": 541, "sizeX:3": 24, "sizeY:3": 24, "x:3": 528, "y:3": 192 }, - "36:10": { + "37:10": { "id:3": 542, "sizeX:3": 24, "sizeY:3": 24, "x:3": 480, "y:3": 48 }, - "37:10": { + "38:10": { "id:3": 543, "sizeX:3": 24, "sizeY:3": 24, "x:3": 432, "y:3": 48 }, - "38:10": { + "39:10": { "id:3": 544, "sizeX:3": 24, "sizeY:3": 24, "x:3": 632, "y:3": 96 }, - "39:10": { + "40:10": { "id:3": 545, "sizeX:3": 24, "sizeY:3": 24, "x:3": 384, "y:3": 192 }, - "40:10": { + "41:10": { "id:3": 546, "sizeX:3": 24, "sizeY:3": 24, "x:3": 144, "y:3": 48 }, - "41:10": { + "42:10": { "id:3": 547, "sizeX:3": 24, "sizeY:3": 24, "x:3": 192, "y:3": 96 }, - "42:10": { + "43:10": { "id:3": 548, "sizeX:3": 24, "sizeY:3": 24, "x:3": 48, "y:3": 48 }, - "43:10": { + "44:10": { "id:3": 549, "sizeX:3": 24, "sizeY:3": 24, "x:3": 288, "y:3": 144 }, - "44:10": { + "45:10": { "id:3": 550, "sizeX:3": 24, "sizeY:3": 24, "x:3": 336, "y:3": 288 }, - "45:10": { + "46:10": { "id:3": 551, "sizeX:3": 24, "sizeY:3": 24, "x:3": 384, "y:3": 144 }, - "46:10": { + "47:10": { "id:3": 552, "sizeX:3": 24, "sizeY:3": 24, "x:3": 336, "y:3": 0 }, - "47:10": { + "48:10": { "id:3": 553, "sizeX:3": 24, "sizeY:3": 24, "x:3": 480, "y:3": 240 }, - "48:10": { + "49:10": { "id:3": 554, "sizeX:3": 24, "sizeY:3": 24, "x:3": 432, "y:3": 192 }, - "49:10": { + "50:10": { "id:3": 555, "sizeX:3": 24, "sizeY:3": 24, "x:3": 384, "y:3": 240 }, - "50:10": { + "51:10": { "id:3": 556, "sizeX:3": 24, "sizeY:3": 24, "x:3": 432, "y:3": 0 }, - "51:10": { + "52:10": { "id:3": 557, "sizeX:3": 24, "sizeY:3": 24, "x:3": 632, "y:3": 48 }, - "52:10": { + "53:10": { "id:3": 558, "sizeX:3": 24, "sizeY:3": 24, "x:3": 576, "y:3": 0 }, - "53:10": { + "54:10": { "id:3": 559, "sizeX:3": 24, "sizeY:3": 24, "x:3": 240, "y:3": 48 }, - "54:10": { + "55:10": { "id:3": 560, "sizeX:3": 24, "sizeY:3": 24, "x:3": 576, "y:3": 96 }, - "55:10": { + "56:10": { "id:3": 561, "sizeX:3": 24, "sizeY:3": 24, @@ -48430,14 +48449,14 @@ "id:3": 562, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 576, + "x:3": 528, "y:3": 384 }, "1:10": { "id:3": 563, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 480, + "x:3": 576, "y:3": 144 }, "2:10": { @@ -48459,7 +48478,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 384, - "y:3": 96 + "y:3": 48 }, "5:10": { "id:3": 567, @@ -48479,7 +48498,7 @@ "id:3": 569, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, + "x:3": 96, "y:3": 0 }, "8:10": { @@ -48493,7 +48512,7 @@ "id:3": 571, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 240, + "x:3": 192, "y:3": 48 }, "10:10": { @@ -48521,7 +48540,7 @@ "id:3": 575, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, + "x:3": 240, "y:3": 96 }, "14:10": { @@ -48535,15 +48554,15 @@ "id:3": 577, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 336, + "x:3": 144, "y:3": 240 }, "16:10": { "id:3": 578, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 576, - "y:3": 288 + "x:3": 528, + "y:3": 240 }, "17:10": { "id:3": 579, @@ -48570,7 +48589,7 @@ "id:3": 582, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 432, + "x:3": 480, "y:3": 288 }, "21:10": { @@ -48633,15 +48652,15 @@ "id:3": 591, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 480, - "y:3": 288 + "x:3": 576, + "y:3": 240 }, "30:10": { "id:3": 592, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 240 + "x:3": 288, + "y:3": 96 }, "31:10": { "id:3": 593, @@ -48654,15 +48673,15 @@ "id:3": 594, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 624, - "y:3": 288 + "x:3": 528, + "y:3": 200 }, "33:10": { "id:3": 595, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 576, - "y:3": 96 + "x:3": 480, + "y:3": 240 }, "34:10": { "id:3": 596, @@ -48704,21 +48723,21 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 384, - "y:3": 192 + "y:3": 96 }, "40:10": { "id:3": 602, "sizeX:3": 40, "sizeY:3": 40, - "x:3": 184, + "x:3": 232, "y:3": 184 }, "41:10": { "id:3": 603, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 96 + "x:3": 96, + "y:3": 48 }, "42:10": { "id:3": 604, @@ -48738,7 +48757,7 @@ "id:3": 606, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 240, + "x:3": 192, "y:3": 96 }, "45:10": { @@ -48746,7 +48765,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 432, - "y:3": 192 + "y:3": 96 }, "46:10": { "id:3": 608, @@ -48760,7 +48779,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 432, - "y:3": 96 + "y:3": 192 }, "48:10": { "id:3": 610, @@ -48774,35 +48793,35 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 144, - "y:3": 384 + "y:3": 336 }, "50:10": { "id:3": 612, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, + "x:3": 144, "y:3": 48 }, "51:10": { "id:3": 613, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 288, + "x:3": 240, "y:3": 48 }, "52:10": { "id:3": 614, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 528, + "x:3": 432, "y:3": 240 }, "53:10": { "id:3": 615, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 144 + "x:3": 96, + "y:3": 96 } } }, @@ -48836,14 +48855,14 @@ "id:3": 620, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, + "x:3": 96, "y:3": 48 }, "2:10": { "id:3": 621, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, + "x:3": 144, "y:3": 48 }, "3:10": { @@ -48851,7 +48870,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 192, - "y:3": 96 + "y:3": 48 }, "4:10": { "id:3": 623, @@ -48864,7 +48883,7 @@ "id:3": 626, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 336, + "x:3": 288, "y:3": 0 }, "6:10": { @@ -48879,13 +48898,13 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 288, - "y:3": 288 + "y:3": 336 }, "8:10": { "id:3": 630, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, + "x:3": 144, "y:3": 144 }, "9:10": { @@ -48991,14 +49010,14 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 336, - "y:3": 144 + "y:3": 96 }, "24:10": { "id:3": 655, "sizeX:3": 24, "sizeY:3": 24, "x:3": 336, - "y:3": 192 + "y:3": 144 }, "25:10": { "id:3": 656, @@ -49011,7 +49030,7 @@ "id:3": 657, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 288, + "x:3": 336, "y:3": 384 }, "27:10": { @@ -49039,7 +49058,7 @@ "id:3": 663, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 288, + "x:3": 240, "y:3": 0 }, "31:10": { @@ -49068,14 +49087,14 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 336, - "y:3": 96 + "y:3": 48 }, "35:10": { "id:3": 674, "sizeX:3": 24, "sizeY:3": 24, "x:3": 384, - "y:3": 192 + "y:3": 144 }, "36:10": { "id:3": 676, @@ -49130,267 +49149,281 @@ "id:3": 131, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 248, + "x:3": 0, "y:3": 0 }, "1:10": { - "id:3": 681, + "id:3": 132, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 288 + "x:3": 0, + "y:3": 48 }, "2:10": { - "id:3": 682, + "id:3": 133, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, - "y:3": 144 + "x:3": 0, + "y:3": 96 }, "3:10": { - "id:3": 683, + "id:3": 681, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 192 + "x:3": 288, + "y:3": 240 }, "4:10": { - "id:3": 684, + "id:3": 682, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 0 + "x:3": 144, + "y:3": 48 }, "5:10": { - "id:3": 685, + "id:3": 683, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 248, - "y:3": 192 + "x:3": 192, + "y:3": 96 }, "6:10": { - "id:3": 686, + "id:3": 684, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 336 + "x:3": 0, + "y:3": 240 }, "7:10": { - "id:3": 687, + "id:3": 685, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, + "x:3": 240, "y:3": 0 }, "8:10": { - "id:3": 688, + "id:3": 686, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 336 + "x:3": 336, + "y:3": 144 }, "9:10": { - "id:3": 689, + "id:3": 687, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 248, - "y:3": 96 + "x:3": 0, + "y:3": 192 }, "10:10": { - "id:3": 690, + "id:3": 688, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 248, + "x:3": 336, "y:3": 240 }, "11:10": { + "id:3": 689, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": 96, + "y:3": 48 + }, + "12:10": { + "id:3": 690, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": 240, + "y:3": 40 + }, + "13:10": { "id:3": 691, "sizeX:3": 40, "sizeY:3": 40, "x:3": 88, "y:3": 88 }, - "12:10": { + "14:10": { "id:3": 692, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, - "y:3": 336 + "x:3": 336, + "y:3": 192 }, - "13:10": { + "15:10": { "id:3": 693, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 144 + "x:3": 144, + "y:3": 192 }, - "14:10": { + "16:10": { "id:3": 694, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 288 + "x:3": 288, + "y:3": 144 }, - "15:10": { + "17:10": { "id:3": 695, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, + "x:3": 192, "y:3": 192 }, - "16:10": { + "18:10": { "id:3": 696, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, - "y:3": 384 + "x:3": 336, + "y:3": 48 }, - "17:10": { + "19:10": { "id:3": 697, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 248, + "x:3": 48, "y:3": 48 }, - "18:10": { + "20:10": { "id:3": 698, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, - "y:3": 384 + "x:3": 384, + "y:3": 192 }, - "19:10": { + "21:10": { "id:3": 699, "sizeX:3": 40, "sizeY:3": 40, - "x:3": 88, - "y:3": 232 + "x:3": 232, + "y:3": 184 }, - "20:10": { + "22:10": { "id:3": 700, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 0, - "y:3": 240 + "x:3": 240, + "y:3": 288 }, - "21:10": { + "23:10": { "id:3": 701, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 384 + "x:3": 336, + "y:3": 96 }, - "22:10": { + "24:10": { "id:3": 702, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, - "y:3": 288 + "x:3": 288, + "y:3": 192 }, - "23:10": { + "25:10": { "id:3": 703, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, - "y:3": 288 + "x:3": 288, + "y:3": 96 }, - "24:10": { + "26:10": { "id:3": 704, "sizeX:3": 24, "sizeY:3": 24, "x:3": 48, - "y:3": 48 + "y:3": 240 }, - "25:10": { + "27:10": { "id:3": 706, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, + "x:3": 192, "y:3": 144 }, - "26:10": { + "28:10": { "id:3": 707, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 240, - "y:3": 384 + "x:3": 336, + "y:3": 0 }, - "27:10": { + "29:10": { "id:3": 708, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 0 + "x:3": 0, + "y:3": 144 }, - "28:10": { + "30:10": { "id:3": 709, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 240 + "x:3": 240, + "y:3": 96 }, - "29:10": { + "31:10": { "id:3": 710, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 96 + "x:3": 96, + "y:3": 192 }, - "30:10": { + "32:10": { "id:3": 712, "sizeX:3": 24, "sizeY:3": 24, "x:3": 144, "y:3": 144 }, - "31:10": { + "33:10": { "id:3": 713, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, - "y:3": 48 + "x:3": 48, + "y:3": 144 }, - "32:10": { + "34:10": { "id:3": 714, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, + "x:3": 240, "y:3": 240 }, - "33:10": { + "35:10": { "id:3": 715, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 0, + "x:3": 288, "y:3": 288 }, - "34:10": { + "36:10": { "id:3": 716, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 0, - "y:3": 0 + "x:3": 192, + "y:3": 240 }, - "35:10": { + "37:10": { "id:3": 718, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, - "y:3": 192 + "x:3": 144, + "y:3": 0 }, - "36:10": { + "38:10": { "id:3": 719, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 0, - "y:3": 192 + "x:3": 144, + "y:3": 240 }, - "37:10": { + "39:10": { "id:3": 720, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 384 + "x:3": 384, + "y:3": 240 } } }, @@ -49417,218 +49450,218 @@ "id:3": 721, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 0, - "y:3": 48 + "x:3": 120, + "y:3": 248 }, "1:10": { "id:3": 723, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 192 + "x:3": 216, + "y:3": 152 }, "2:10": { "id:3": 724, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 288 + "x:3": 360, + "y:3": 152 }, "3:10": { "id:3": 725, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, - "y:3": 144 + "x:3": 360, + "y:3": 104 }, "4:10": { "id:3": 726, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, - "y:3": 336 + "x:3": 408, + "y:3": 200 }, "5:10": { "id:3": 727, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": 48, - "y:3": 192 + "sizeX:3": 40, + "sizeY:3": 40, + "x:3": 256, + "y:3": 96 }, "6:10": { "id:3": 728, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 48 + "x:3": 120, + "y:3": 104 }, "7:10": { "id:3": 729, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, - "y:3": 288 + "x:3": 408, + "y:3": 152 }, "8:10": { "id:3": 730, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, - "y:3": 48 + "x:3": 120, + "y:3": 152 }, "9:10": { "id:3": 732, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 48 + "x:3": 120, + "y:3": 200 }, "10:10": { "id:3": 733, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 240 + "x:3": 312, + "y:3": 200 }, "11:10": { "id:3": 734, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 336 + "x:3": 408, + "y:3": 248 }, "12:10": { "id:3": 735, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, - "y:3": 336 + "x:3": 408, + "y:3": 296 }, "13:10": { "id:3": 736, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, - "y:3": 0 + "x:3": 72, + "y:3": 152 }, "14:10": { "id:3": 737, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 144 + "x:3": 168, + "y:3": 152 }, "15:10": { "id:3": 738, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, - "y:3": 48 + "x:3": 120, + "y:3": 56 }, "16:10": { "id:3": 739, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 0, - "y:3": 192 + "x:3": 216, + "y:3": 200 }, "17:10": { "id:3": 740, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 144 + "x:3": 312, + "y:3": 104 }, "18:10": { "id:3": 741, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 336 + "x:3": 360, + "y:3": 200 }, "19:10": { "id:3": 742, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 0, - "y:3": 336 + "x:3": 360, + "y:3": 248 }, "20:10": { "id:3": 743, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 288 + "x:3": 408, + "y:3": 104 }, "21:10": { "id:3": 745, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 0, - "y:3": 144 + "x:3": 216, + "y:3": 248 }, "22:10": { "id:3": 746, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 48, - "y:3": 0 + "x:3": 72, + "y:3": 200 }, "23:10": { "id:3": 747, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 0, - "y:3": 96 + "x:3": 168, + "y:3": 248 }, "24:10": { "id:3": 748, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 248, - "y:3": 96 + "x:3": 168, + "y:3": 8 }, "25:10": { "id:3": 749, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 96, - "y:3": 96 + "x:3": 168, + "y:3": 104 }, "26:10": { "id:3": 750, "sizeX:3": 40, "sizeY:3": 40, - "x:3": 40, - "y:3": 88 + "x:3": 160, + "y:3": 192 }, "27:10": { "id:3": 751, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 96 + "x:3": 216, + "y:3": 56 }, "28:10": { "id:3": 753, "sizeX:3": 40, "sizeY:3": 40, - "x:3": 184, - "y:3": 88 + "x:3": 160, + "y:3": 48 }, "29:10": { "id:3": 754, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 144, - "y:3": 240 + "x:3": 312, + "y:3": 152 }, "30:10": { "id:3": 755, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 192, - "y:3": 192 + "x:3": 264, + "y:3": 152 } } }, @@ -50646,4 +50679,4 @@ "party_enable:1": 1 } } -} \ No newline at end of file +} diff --git a/overrides/config/bhmenu.cfg b/overrides/config/bhmenu.cfg deleted file mode 100644 index 1c474cee..00000000 --- a/overrides/config/bhmenu.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Configuration file - -general { - # Set this to false to disable pack config screen and enable user configs instead. - # This should always be done by the pack author once they are done with configuring the pack. - # To re-enable Pack Edit Mode, please edit the config file. - B:pack_edit_mode=false - - # The id of this modpack. - # (This is BH internal pack id; Find the id here: https://www.bisecthosting.com/partners/console.php) - S:pack_id=18860 - - # Your partner ID to use in during the ordering process. - # Without this you will not be credited for the purchases. - # (Your partner id is not the same as your referral link, please check your client area to find your partner id at https://www.bisecthosting.com/partners/console.php). - S:partner_id=5346 -} - - -public_server_list { - I:button_width=0 - I:button_x=-1 - I:button_y=-1 - B:enabled=false - B:vanilla_button=false -} - - -server_creator_banner { - S:description=Click me to get your own server! - B:enabled=true - S:title=Need a server? - B:use_language_files=false -} - - diff --git a/overrides/config/craftpresence.json b/overrides/config/craftpresence.json old mode 100644 new mode 100755 index 47d4c30a..739dee88 --- a/overrides/config/craftpresence.json +++ b/overrides/config/craftpresence.json @@ -185,6 +185,9 @@ } } } + }, + "realmData": { + "textOverride": "Playing on {server.motd.raw}" } }, "advancedSettings": { @@ -278,7 +281,8 @@ "serverIconEndpoint": "https://api.mcsrvstat.us/icon/{server.address.short}", "playerSkinEndpoint": "https://mc-heads.net/avatar/{getOrDefault(player.uuid.short, player.name)}", "allowDuplicatePackets": false, - "maxConnectionAttempts": 10 + "maxConnectionAttempts": 10, + "enableClassGraph": false }, "accessibilitySettings": { "tooltipBackground": { diff --git a/overrides/config/gtexpert/core.cfg b/overrides/config/gtexpert/gtexpert.cfg old mode 100644 new mode 100755 similarity index 92% rename from overrides/config/gtexpert/core.cfg rename to overrides/config/gtexpert/gtexpert.cfg index 474cdd47..5046456d --- a/overrides/config/gtexpert/core.cfg +++ b/overrides/config/gtexpert/gtexpert.cfg @@ -15,6 +15,8 @@ gtexpert-core { # Activate changes in the replacement schedule. # 1. When enabled, the following structure and mte name changes: # Large Cracking Unit + # 2. When enabled, the recipe of the following items will be changed: + # Logic Processor, Calc Processor, Engineer Processor # Default: false B:featureFlag=false diff --git a/overrides/config/gtexpert/ae_integration.cfg b/overrides/config/gtexpert/integration/ae_integration.cfg old mode 100644 new mode 100755 similarity index 100% rename from overrides/config/gtexpert/ae_integration.cfg rename to overrides/config/gtexpert/integration/ae_integration.cfg diff --git a/overrides/config/gtexpert/aeadditions_integration.cfg b/overrides/config/gtexpert/integration/aeadditions_integration.cfg old mode 100644 new mode 100755 similarity index 100% rename from overrides/config/gtexpert/aeadditions_integration.cfg rename to overrides/config/gtexpert/integration/aeadditions_integration.cfg diff --git a/overrides/config/gtexpert/chisel_integration.cfg b/overrides/config/gtexpert/integration/chisel_integration.cfg old mode 100644 new mode 100755 similarity index 100% rename from overrides/config/gtexpert/chisel_integration.cfg rename to overrides/config/gtexpert/integration/chisel_integration.cfg diff --git a/overrides/config/gtexpert/deda_integration.cfg b/overrides/config/gtexpert/integration/deda_integration.cfg old mode 100644 new mode 100755 similarity index 100% rename from overrides/config/gtexpert/deda_integration.cfg rename to overrides/config/gtexpert/integration/deda_integration.cfg diff --git a/overrides/config/gtexpert/eio_integration.cfg b/overrides/config/gtexpert/integration/eio_integration.cfg old mode 100644 new mode 100755 similarity index 100% rename from overrides/config/gtexpert/eio_integration.cfg rename to overrides/config/gtexpert/integration/eio_integration.cfg diff --git a/overrides/config/gtexpert/integration/extracpus_integration.cfg b/overrides/config/gtexpert/integration/extracpus_integration.cfg new file mode 100755 index 00000000..fb023bb7 --- /dev/null +++ b/overrides/config/gtexpert/integration/extracpus_integration.cfg @@ -0,0 +1,10 @@ +# Configuration file + +"extra cpus" { + # Do you want to migrate the recipes to NAE2. + # If not changed, the recipes will remain in ExtraCPUs. + # Default: false + B:migrateToNAE2=true +} + + diff --git a/overrides/config/gtexpert/ffm_integration.cfg b/overrides/config/gtexpert/integration/ffm_integration.cfg old mode 100644 new mode 100755 similarity index 87% rename from overrides/config/gtexpert/ffm_integration.cfg rename to overrides/config/gtexpert/integration/ffm_integration.cfg index 8b8e0086..87a12458 --- a/overrides/config/gtexpert/ffm_integration.cfg +++ b/overrides/config/gtexpert/integration/ffm_integration.cfg @@ -4,7 +4,7 @@ forestry { # Recipes for various items in Forestry will be more difficult # default: NORMAL # valid: [NORMAL, HARD] - S:gameMode=HARD + S:gameMode=NORMAL } diff --git a/overrides/config/gtexpert/gendustry_integration.cfg b/overrides/config/gtexpert/integration/gendustry_integration.cfg old mode 100644 new mode 100755 similarity index 100% rename from overrides/config/gtexpert/gendustry_integration.cfg rename to overrides/config/gtexpert/integration/gendustry_integration.cfg diff --git a/overrides/config/gtexpert/integration/nae2_integration.cfg b/overrides/config/gtexpert/integration/nae2_integration.cfg new file mode 100755 index 00000000..896f5147 --- /dev/null +++ b/overrides/config/gtexpert/integration/nae2_integration.cfg @@ -0,0 +1,10 @@ +# Configuration file + +"neeve's ae2" { + # Do you want to change the recipe to one that utilizes items from AEAdditions. + # If not changed, the recipe will utilize NAE2 items. + # Default: false + B:enableAEAdditions=true +} + + diff --git a/overrides/config/gtexpert/tc_integration.cfg b/overrides/config/gtexpert/integration/tc_integration.cfg old mode 100644 new mode 100755 similarity index 100% rename from overrides/config/gtexpert/tc_integration.cfg rename to overrides/config/gtexpert/integration/tc_integration.cfg diff --git a/overrides/config/gtexpert/extracpus_integration.cfg b/overrides/config/gtexpert/integration/te_integration.cfg similarity index 100% rename from overrides/config/gtexpert/extracpus_integration.cfg rename to overrides/config/gtexpert/integration/te_integration.cfg diff --git a/overrides/config/gtexpert/modules.cfg b/overrides/config/gtexpert/modules.cfg old mode 100644 new mode 100755 index 92b5f2a5..770e6f0b --- a/overrides/config/gtexpert/modules.cfg +++ b/overrides/config/gtexpert/modules.cfg @@ -22,6 +22,16 @@ modules { # Mod Dependencies: [ avaritia ] B:"gtexpert:avaritia_integration"=true + # Binnie's Mods Integration Module + # Module Dependencies: [ gtexpert:integration ] + # Mod Dependencies: [ forestry, genetics, botany, extrabees, extratrees ] + B:"gtexpert:binnies_integration"=true + + # Botany(Binnie's Mods) Integration Module + # Module Dependencies: [ gtexpert:integration ] + # Mod Dependencies: [ forestry, botany ] + B:"gtexpert:botany_integration"=true + # Chisel Integration Module # Module Dependencies: [ gtexpert:integration ] # Mod Dependencies: [ chisel ] @@ -45,16 +55,36 @@ modules { # Mod Dependencies: [ enderio ] B:"gtexpert:eio_integration"=true + # Extra Bees(Binnie's Mods) Integration Module + # Module Dependencies: [ gtexpert:integration ] + # Mod Dependencies: [ forestry, extrabees ] + B:"gtexpert:extrabees_integration"=true + # Extra CPUs Integration Module # Module Dependencies: [ gtexpert:integration ] # Mod Dependencies: [ appliedenergistics2, aeadditions, extracpus ] B:"gtexpert:extracpus_integration"=true + # Extra Trees(Binnie's Mods) Integration Module + # Module Dependencies: [ gtexpert:integration ] + # Mod Dependencies: [ forestry, extratrees ] + B:"gtexpert:extratrees_integration"=true + # Forestry For Minecraft Integration Module # Module Dependencies: [ gtexpert:integration ] # Mod Dependencies: [ forestry ] B:"gtexpert:ffm_integration"=true + # Gendustry Integration Module + # Module Dependencies: [ gtexpert:integration ] + # Mod Dependencies: [ forestry, gendustry ] + B:"gtexpert:gendustry_integration"=true + + # Genetics(Binnie's Mods) Integration Module + # Module Dependencies: [ gtexpert:integration ] + # Mod Dependencies: [ forestry, genetics ] + B:"gtexpert:genetics_integration"=true + # GregTech Food Option Integration Module # Module Dependencies: [ gtexpert:integration ] # Mod Dependencies: [ gregtechfoodoption ] diff --git a/overrides/config/gtexpert/nae2_integration.cfg b/overrides/config/gtexpert/nae2_integration.cfg deleted file mode 100644 index d68983e0..00000000 --- a/overrides/config/gtexpert/nae2_integration.cfg +++ /dev/null @@ -1,2 +0,0 @@ -# Configuration file - diff --git a/overrides/config/itlt.cfg b/overrides/config/itlt.cfg deleted file mode 100644 index b7bf436a..00000000 --- a/overrides/config/itlt.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Configuration file - -bitdetection { - # If ShouldYellAt32BitUsers is set to true, this is the message that will be displayed to the user. - S:ErrorMessage=You are using a 32 bit version of java. This is not recommended with this modpack. - - # Set to true to make itlt yell at people attempting to use 32x java for the modpack. - B:ShouldYellAt32BitUsers=true -} - - -display { - # Set to true to make minecraft attempt to maximize itself on startup (This is kinda unstable right now, so don't trust it too much) - B:ShouldMaximizeDisplay=false - - # Set to true to load a custom icon from config\itlt\icon.png - B:loadCustomIcon=true - - # Set to true to attempt to get the display name of the pack of the info json file - # This will take priority over windowDisplayTitle - B:useTechnicDisplayName=false - - # Set to true to attempt to use the icon assigned to the modpack by the technic launcher. - # This will take priority over loadCustomIcon - B:useTechnicIcon=false - - # Change this value to change the name of the MineCraft window - S:windowDisplayTitle=GregTech Expert 2 -} - - -server { - # Set to true to have a dedicated server added to the server list ingame. The server will not overwrite others servers. - B:AddDedicatedServer=false - - # The ip of the dedicated server to add. - S:ServerIP=127.0.0.1:25555 - - # The name of the dedicated server to add. - S:ServerName=Localhost -} - - diff --git a/overrides/config/loliasm.cfg b/overrides/config/loliasm.cfg index 699203ab..9709f03f 100644 --- a/overrides/config/loliasm.cfg +++ b/overrides/config/loliasm.cfg @@ -342,7 +342,7 @@ spark { textures { # Calculate and send animated textures only when needed to the GPU, better than VanillaFix's textureFixes config - - B:onDemandAnimatedTextures=false + B:onDemandAnimatedTextures=true # Releases TextureAtlasSprite's framesTextureData. Won't touch custom TextureAtlasSprite implementations - B:releaseSpriteFramesCache=true diff --git a/overrides/config/nae2.cfg b/overrides/config/nae2.cfg index 6a6243e4..c89de9d0 100644 --- a/overrides/config/nae2.cfg +++ b/overrides/config/nae2.cfg @@ -63,6 +63,9 @@ upgrades { B:auto_complete=true B:enabled=true + # Enable GregTech Circuit Card for ME Interfaces + B:gregtech_circuit=true + # Enable Hyper-Acceleration Upgrade cards for ME IO Ports B:hyper_acceleration=true } diff --git a/overrides/config/nothirium.cfg b/overrides/config/nothirium.cfg deleted file mode 100644 index ffc3463e..00000000 --- a/overrides/config/nothirium.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# Configuration file - -general { - # Valid values: - # AUTOMATIC - # GL43 - # GL42 - # GL20 - # GL15 - S:renderEngine=AUTOMATIC -} - - diff --git a/overrides/config/nutrition/nutrition.cfg b/overrides/config/nutrition/nutrition.cfg index 8e5cbf0b..7d975e3e 100644 --- a/overrides/config/nutrition/nutrition.cfg +++ b/overrides/config/nutrition/nutrition.cfg @@ -9,7 +9,7 @@ # On death, should nutrition be reset to DeathPenaltyMin if it's fallen below that value? # This is recommended to prevent death loops caused by negative effects. [default: true] - B:DeathPenaltyReset=true + B:DeathPenaltyReset=false } diff --git a/overrides/config/renderlib.cfg b/overrides/config/renderlib.cfg index 39c77c87..27e60164 100644 --- a/overrides/config/renderlib.cfg +++ b/overrides/config/renderlib.cfg @@ -30,20 +30,30 @@ general { I:tileEntityCachedBoundingBoxUpdateInterval=100 opengldebugoutput { + # Enable/Disable crashing when an OpenGL error occurs. If disabled OpenGL errors are likely to go unnoticed unless the log is checked manually. + B:crashOnError=false + # Better debugging of OpenGL errors. Might not be supported by your hardware/driver. B:enabled=false - # Enable/Disable logging of high severity non-error messages. (You probably never want to enable this as a normal user) - B:logHighSeverity=false - - # Enable/Disable logging of low severity non-error messages. (You probably never want to enable this as a normal user) - B:logLowSeverity=false - - # Enable/Disable logging of medium severity non-error messages. (You probably never want to enable this as a normal user) - B:logMediumSeverity=false - - # Enable/Disable logging of notification severity non-error messages. (You probably never want to enable this as a normal user) - B:logNotificationSeverity=false + # Enable/Disable appending of the stack trace when logging a debug message. + # Valid values: + # DISABLED + # ALWAYS + # ERRORS_ONLY + S:logStackTrace=ERRORS_ONLY + + # Enable/Disable debug messages matching the specified filters. + # Format: 'source, type, severity, enabled' + # Valid source values: [ ANY, API, WINDOW_SYSTEM, SHADER_COMPILER, THIRD_PARTY, APPLICATION, OTHER ] + # Valid type values: [ ANY, ERROR, DEPRECATED_BEHAVIOR, UNDEFINED_BEHAVIOR, PORTABILITY, PERFORMANCE, MARKER, PUSH_GROUP, POP_GROUP, OTHER ] + # Valid severity values: [ ANY, HIGH, MEDIUM, LOW, NOTIFICATION ] + S:messageFilters < + ANY;ERROR;ANY;true + > + + # May be required by some systems to generate OpenGL debug output. (Enabling might have a negative impact on performance) + B:setContextDebugBit=false } } diff --git a/overrides/config/spiceoflife.cfg b/overrides/config/spiceoflife.cfg index 5f5349e6..c5cc49f4 100644 --- a/overrides/config/spiceoflife.cfg +++ b/overrides/config/spiceoflife.cfg @@ -87,7 +87,7 @@ server { I:food.history.length=20 # If true, food history will not get reset after every death - B:food.history.persists.through.death=true + B:food.history.persists.through.death=false # Rounding mode used on the hunger value of foods # Valid options: 'round', 'floor', 'ceiling' diff --git a/overrides/config/vintagefix.properties b/overrides/config/vintagefix.properties index 6934759b..68ecda38 100644 --- a/overrides/config/vintagefix.properties +++ b/overrides/config/vintagefix.properties @@ -1,5 +1,6 @@ # VintageFix config file +mixin.allocation_rate=true mixin.backports.new_world_name=true mixin.backports.white_button_text=true mixin.blockstates=false diff --git a/overrides/config/itlt/icon.png b/overrides/resourcepacks/icons/icon_128.png similarity index 100% rename from overrides/config/itlt/icon.png rename to overrides/resourcepacks/icons/icon_128.png diff --git a/overrides/resourcepacks/icons/icon_16.png b/overrides/resourcepacks/icons/icon_16.png new file mode 100644 index 00000000..db9f6a3b Binary files /dev/null and b/overrides/resourcepacks/icons/icon_16.png differ diff --git a/overrides/resourcepacks/icons/icon_256.png b/overrides/resourcepacks/icons/icon_256.png new file mode 100644 index 00000000..f8ad7a18 Binary files /dev/null and b/overrides/resourcepacks/icons/icon_256.png differ diff --git a/overrides/resourcepacks/icons/icon_32.png b/overrides/resourcepacks/icons/icon_32.png new file mode 100644 index 00000000..5e1fbb7e Binary files /dev/null and b/overrides/resourcepacks/icons/icon_32.png differ diff --git a/overrides/resourcepacks/icons/icon_48.png b/overrides/resourcepacks/icons/icon_48.png new file mode 100644 index 00000000..ccbce0d4 Binary files /dev/null and b/overrides/resourcepacks/icons/icon_48.png differ diff --git a/overrides/scripts/normal/AppliedEnergistics.zs b/overrides/scripts/normal/AppliedEnergistics.zs index 32527d9c..90e0104f 100644 --- a/overrides/scripts/normal/AppliedEnergistics.zs +++ b/overrides/scripts/normal/AppliedEnergistics.zs @@ -100,6 +100,18 @@ recipes.addShaped( * 2, [ [, , ], [, , ] ]); +assembler.recipeBuilder() + .circuit(1) + .inputs([ + , + * 2, + * 2, + + ]) + .outputs([ * 4]) + .duration(20) + .EUt(1920) + .buildAndRegister(); # Creative Storage Cell JEI.hide(); diff --git a/overrides/scripts/normal/CatWalks.zs b/overrides/scripts/normal/CatWalks.zs index d4e5d5a8..173352ad 100644 --- a/overrides/scripts/normal/CatWalks.zs +++ b/overrides/scripts/normal/CatWalks.zs @@ -35,7 +35,7 @@ assembler.recipeBuilder() assembler.recipeBuilder() .circuit(7) .inputs([ - , + , * 2, * 4 ]) @@ -68,7 +68,7 @@ assembler.recipeBuilder() assembler.recipeBuilder() .circuit(7) .inputs([ - , + , * 3, * 4 ]) diff --git a/overrides/scripts/normal/NAE2.zs b/overrides/scripts/normal/NAE2.zs index 9e375839..fd527489 100644 --- a/overrides/scripts/normal/NAE2.zs +++ b/overrides/scripts/normal/NAE2.zs @@ -89,17 +89,15 @@ packer.recipeBuilder() .EUt(7) .buildAndRegister(); +# Programmed Circuit Card +recipes.remove(); +recipes.addShapeless(, [,]); + ######################################## # Blocks ######################################## -# Crafting Storage -JEI.removeAndHide(); -JEI.removeAndHide(); -JEI.removeAndHide(); -JEI.removeAndHide(); - # ME Storage Exposer recipes.remove(); recipes.addShaped(, [