diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index b4e1b11f..d53c9bab 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -26,6 +26,7 @@ body: label: Modpack Version description: What version of the pack are you using? options: + - 1.8.28 - 1.8.27 - 1.8.26 - 1.8.25 diff --git a/.github/ISSUE_TEMPLATE/crash.yaml b/.github/ISSUE_TEMPLATE/crash.yaml index 542607c7..7d18b443 100644 --- a/.github/ISSUE_TEMPLATE/crash.yaml +++ b/.github/ISSUE_TEMPLATE/crash.yaml @@ -25,6 +25,7 @@ body: label: Modpack Version description: What version of the pack are you using? options: + - 1.8.28 - 1.8.27 - 1.8.26 - 1.8.25 diff --git a/changelog/1.8.28.md b/changelog/1.8.28.md new file mode 100644 index 00000000..e4324279 --- /dev/null +++ b/changelog/1.8.28.md @@ -0,0 +1,40 @@ +## Release 1.8.28 + +### Mod Additions +- parry-2.1.jar +### Mod Updates +- advancedperipherals-1.16.5-0.7.10r.jar +- architectury-1.32.66.jar +- ars_nouveau-1.16.5-1.25.5.jar +- BloodMagic-1.16.4-3.1.13-39.jar +- cabletiers-1.16.5-0.545.jar +- cc-tweaked-1.16.5-1.100.9.jar +- Cyclic-1.16.5-1.5.18.jar +- CyclopsCore-1.16.5-1.13.0.jar +- Draconic-Evolution-1.16.5-3.0.27.462-universal.jar +- engineersdecor-1.16.5-forge-1.1.19.jar +- ImmersivePetroleum-1.16.5-3.4.0-13.jar +- incontrol-1.16-5.2.12.jar +- IntegratedDynamics-1.16.5-1.10.13.jar +- IntegratedTunnels-1.16.5-1.8.10.jar +- lootr-1.16.5-0.1.13.44.jar +- mahoutsukai-1.16.5-v1.34.31.jar +- mcw-fences-1.0.6-mc1.16.5.jar +- mcw-trapdoors-1.0.7-mc1.16.5.jar +- minecolonies-1.16.5-1.0.890-RELEASE.jar +- mininggadgets-1.7.6.jar +- pedestals-0.8t_hotfix_1.jar +- pneumaticcraft-repressurized-1.16.5-2.15.11-334.jar +- simplemagnets-1.1.8-forge-mc1.16.jar +- sophisticatedbackpacks-1.16.5-3.15.16.669.jar +- supplementaries-1.16.5-0.18.4b.jar +- tombstone-6.7.9-1.16.5.jar +### Other Changes +- Add Aquaculture fish to Harvestcraft recipes +- Disable gold jetpack recipe +- Fix flower for Dense Lead Bee +- Add insolator recipes for basalt, limestone, and marble MA seeds +- Add extruder recipe for soulstone +- Move Zycraft Quartz out of void miner crystal card, add inert crystal ore +- Block Mana & Artifice mobs from spawners due to world corruption +- Disable Cyclic golden hopper due to dupe bug diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml index fe5c978a..891568ff 100644 --- a/config/allthetweaks-common.toml +++ b/config/allthetweaks-common.toml @@ -8,4 +8,4 @@ [packversionmin] minor = 8 [packversionminrev] - minorrev = 27 + minorrev = 28 diff --git a/config/apotheosis/spawner.cfg b/config/apotheosis/spawner.cfg index a811c39f..82c91f50 100644 --- a/config/apotheosis/spawner.cfg +++ b/config/apotheosis/spawner.cfg @@ -96,5 +96,13 @@ spawn_eggs { iceandfire:myrmex_swarmer iceandfire:myrmex_worker artifacts:mimic + mana-and-artifice:demon_imp + mana-and-artifice:hulking_zombie + mana-and-artifice:lantern_wraith + mana-and-artifice:mushroom_soldier + mana-and-artifice:pixie + mana-and-artifice:skeleton_assassin + mana-and-artifice:spell_breaker + mana-and-artifice:witch_hunter > } diff --git a/config/brandon3055/DraconicEvolution.cfg b/config/brandon3055/DraconicEvolution.cfg index e242570b..bf05c802 100644 --- a/config/brandon3055/DraconicEvolution.cfg +++ b/config/brandon3055/DraconicEvolution.cfg @@ -101,6 +101,14 @@ iceandfire:myrmex_swarmer iceandfire:myrmex_worker artifacts:mimic + mana-and-artifice:demon_imp + mana-and-artifice:hulking_zombie + mana-and-artifice:lantern_wraith + mana-and-artifice:mushroom_soldier + mana-and-artifice:pixie + mana-and-artifice:skeleton_assassin + mana-and-artifice:spell_breaker + mana-and-artifice:witch_hunter > } } diff --git a/config/ftbquests/quests/chapters/refined_storage.snbt b/config/ftbquests/quests/chapters/refined_storage.snbt index 9216d825..b6973ca2 100644 --- a/config/ftbquests/quests/chapters/refined_storage.snbt +++ b/config/ftbquests/quests/chapters/refined_storage.snbt @@ -1480,31 +1480,6 @@ item: "rsrequestify:requester" }] } - { - x: 0.0d - y: -19.5d - description: ["Infinite item storage!"] - hide_dependency_lines: false - dependencies: ["718A2040D868E09F"] - id: "61D4080EC66A57DE" - tasks: [{ - id: "4A52CA691C535DE8" - type: "item" - item: "extradisks:infinite_storage_part" - }] - rewards: [ - { - id: "5D22142FFE9C5004" - type: "random" - table_id: 3567941291661635734L - } - { - id: "4B33D2CCD34DB34B" - type: "random" - table_id: 4001436279668650237L - } - ] - } { x: 1.0d y: -17.5d diff --git a/config/ftbquests/quests/chapters/tips_and_tricks.snbt b/config/ftbquests/quests/chapters/tips_and_tricks.snbt index 186cb5da..ec0973e4 100644 --- a/config/ftbquests/quests/chapters/tips_and_tricks.snbt +++ b/config/ftbquests/quests/chapters/tips_and_tricks.snbt @@ -561,5 +561,22 @@ xp_levels: 5 }] } + { + title: "Metal Block Variants" + icon: "minecraft:stonecutter" + x: 0.0d + y: 3.0d + description: [ + "Metal block recipes have been unified in this pack, but if you need another mod's variant for decorative purposes, fear not!" + "" + "You can use the Bench Saw to convert metal blocks to any other variant." + ] + id: "2B551CE390BD2231" + tasks: [{ + id: "0BA119E165152033" + type: "item" + item: "minecraft:stonecutter" + }] + } ] } diff --git a/config/ironjetpacks/jetpacks/gold.json b/config/ironjetpacks/jetpacks/gold.json index d7a701c1..6e346d2d 100644 --- a/config/ironjetpacks/jetpacks/gold.json +++ b/config/ironjetpacks/jetpacks/gold.json @@ -5,7 +5,7 @@ "color": "dede00", "armorPoints": 2, "enchantability": 25, - "craftingMaterial": "tag:forge:ingots/gold", + "craftingMaterial": "null", "rarity": 0, "capacity": 10000000, "usage": 300, @@ -20,4 +20,4 @@ "creative": false, "toughness": 0.0, "knockbackResistance": 0.0 -} \ No newline at end of file +} diff --git a/config/resourcefulbees/bees/Dense/Dense Lead.json b/config/resourcefulbees/bees/Dense/Dense Lead.json index 8944cee8..f298271f 100644 --- a/config/resourcefulbees/bees/Dense/Dense Lead.json +++ b/config/resourcefulbees/bees/Dense/Dense Lead.json @@ -1,5 +1,5 @@ { - "flower": "allthecompressed:iron_block_4x", + "flower": "allthecompressed:lead_block_4x", "maxTimeInHive": 2400, "traits": [ "dense" diff --git a/kubejs/client_scripts/jei_removals.js b/kubejs/client_scripts/jei_removals.js index a04e1df5..e88409f8 100644 --- a/kubejs/client_scripts/jei_removals.js +++ b/kubejs/client_scripts/jei_removals.js @@ -40,9 +40,11 @@ onEvent('jei.hide.items', e => { 'appliedenergistics2:silicon', 'appliedenergistics2:flour', 'cyclic:tile_transporter_empty', + 'cyclic:hopper_gold', 'cyclic:trash', 'cyclic:crafting_bag', /cyclic:.*pipe/, + 'quark:pipe', 'naturesaura:chunk_loader', /extrastorage:disk_.+/, /extrastorage:block_.+/, @@ -129,6 +131,7 @@ onEvent('jei.hide.items', e => { 'exchangers:tuberous_exchanger', 'projectred-core:copper_ingot', /^extradisks:infinite.*/, + 'ironjetpacks:gold_jetpack', ]) // only hide uncraftable spawn eggs diff --git a/kubejs/data/envirotech/envirotech/void_miner_drops/ore/inert_crystal_ore.json b/kubejs/data/envirotech/envirotech/void_miner_drops/ore/inert_crystal_ore.json new file mode 100644 index 00000000..17560552 --- /dev/null +++ b/kubejs/data/envirotech/envirotech/void_miner_drops/ore/inert_crystal_ore.json @@ -0,0 +1,10 @@ +{ + "program": ["envirotech:ore", "envirotech:gemstone_ore"], + "item": {"raw:item": "elementalcraft:crystalore", "count":1}, + "config": [ + { + "dimensions": ["minecraft:overworld"], + "weight": 200 + } + ] +} diff --git a/kubejs/data/envirotech/envirotech/void_miner_drops/crystal/zycraft_quartz.json b/kubejs/data/envirotech/envirotech/void_miner_drops/ore/zycraft_quartz.json similarity index 72% rename from kubejs/data/envirotech/envirotech/void_miner_drops/crystal/zycraft_quartz.json rename to kubejs/data/envirotech/envirotech/void_miner_drops/ore/zycraft_quartz.json index d9c5a139..3298d329 100644 --- a/kubejs/data/envirotech/envirotech/void_miner_drops/crystal/zycraft_quartz.json +++ b/kubejs/data/envirotech/envirotech/void_miner_drops/ore/zycraft_quartz.json @@ -1,5 +1,5 @@ { - "program": "envirotech:crystal", + "program": ["envirotech:ore", "envirotech:gemstone_ore"], "item": {"raw:item": "zycraft:quartz_crystal", "count":1}, "config": [ { diff --git a/kubejs/data/thermal/recipes/compat/mysticalagriculture/insolator_mysticalag_basalt_seeds.json b/kubejs/data/thermal/recipes/compat/mysticalagriculture/insolator_mysticalag_basalt_seeds.json new file mode 100644 index 00000000..579c5bbe --- /dev/null +++ b/kubejs/data/thermal/recipes/compat/mysticalagriculture/insolator_mysticalag_basalt_seeds.json @@ -0,0 +1,23 @@ +{ + "type": "thermal:insolator", + "ingredient": { + "item": "mysticalagriculture:basalt_seeds" + }, + "result": [ + { + "item": "mysticalagriculture:basalt_essence", + "count": 1 + }, + { + "item": "mysticalagriculture:basalt_seeds", + "count": 1 + } + ], + "energy": 100000, + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "mysticalagriculture" + } + ] +} diff --git a/kubejs/data/thermal/recipes/compat/mysticalagriculture/insolator_mysticalag_limestone_seeds.json b/kubejs/data/thermal/recipes/compat/mysticalagriculture/insolator_mysticalag_limestone_seeds.json new file mode 100644 index 00000000..b235e248 --- /dev/null +++ b/kubejs/data/thermal/recipes/compat/mysticalagriculture/insolator_mysticalag_limestone_seeds.json @@ -0,0 +1,23 @@ +{ + "type": "thermal:insolator", + "ingredient": { + "item": "mysticalagriculture:limestone_seeds" + }, + "result": [ + { + "item": "mysticalagriculture:limestone_essence", + "count": 1 + }, + { + "item": "mysticalagriculture:limestone_seeds", + "count": 1 + } + ], + "energy": 100000, + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "mysticalagriculture" + } + ] +} diff --git a/kubejs/data/thermal/recipes/compat/mysticalagriculture/insolator_mysticalag_marble_seeds.json b/kubejs/data/thermal/recipes/compat/mysticalagriculture/insolator_mysticalag_marble_seeds.json new file mode 100644 index 00000000..1beb1413 --- /dev/null +++ b/kubejs/data/thermal/recipes/compat/mysticalagriculture/insolator_mysticalag_marble_seeds.json @@ -0,0 +1,23 @@ +{ + "type": "thermal:insolator", + "ingredient": { + "item": "mysticalagriculture:marble_seeds" + }, + "result": [ + { + "item": "mysticalagriculture:marble_essence", + "count": 1 + }, + { + "item": "mysticalagriculture:marble_seeds", + "count": 1 + } + ], + "energy": 100000, + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "mysticalagriculture" + } + ] +} diff --git a/kubejs/server_scripts/mod_specific/cyclic/cyclic.js b/kubejs/server_scripts/mod_specific/cyclic/cyclic.js index ab6f405a..84c6f8e6 100644 --- a/kubejs/server_scripts/mod_specific/cyclic/cyclic.js +++ b/kubejs/server_scripts/mod_specific/cyclic/cyclic.js @@ -35,6 +35,7 @@ onEvent('recipes', e => { 'cyclic:packager', // lag issues 'cyclic:uncrafter', 'cyclic:tile_transporter_empty', + 'cyclic:hopper_gold', // dupe bug 'cyclic:trash' ]) }) diff --git a/kubejs/server_scripts/mod_specific/thermal/thermal.js b/kubejs/server_scripts/mod_specific/thermal/thermal.js index a6e03b0e..dd754870 100644 --- a/kubejs/server_scripts/mod_specific/thermal/thermal.js +++ b/kubejs/server_scripts/mod_specific/thermal/thermal.js @@ -54,6 +54,7 @@ onEvent('recipes', e => { extruderRecipe(e, "minecraft:blackstone", "minecraft:water", "minecraft:gilded_blackstone") extruderRecipe(e, "minecraft:diorite", "minecraft:water", "minecraft:quartz_block") extruderRecipe(e, "minecraft:granite", "minecraft:water", "minecraft:red_sand") + extruderRecipe(e, "mysticalagriculture:soulstone", "minecraft:lava", "mysticalagriculture:soulium_block") removeRecipeByID(e, [ 'thermal:machine/press/packing2x2/press_honeycomb_packing', diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js index 8f4b5d5f..6b83e7b0 100644 --- a/kubejs/server_scripts/tags.js +++ b/kubejs/server_scripts/tags.js @@ -143,6 +143,7 @@ onEvent('item.tags', e => { 'mana-and-artifice:decoration/redstone_arcane_sandstone_pillar', ]) e.add('pedestals:filters', /^pedestals:filter\/filter\w+$/); + e.add('forge:rawfishes', '#forge:raw_fishes'); //#endregion //#region removals e.remove(`minecraft:small_flowers`, `#botania:special_flowers`) @@ -238,8 +239,8 @@ onEvent('block.tags', e => { //#region ENTITY TAGS onEvent('entity_type.tags', e => { - e.add('industrialforegoing:mob_imprisonment_tool_blacklist', [/resourcefulbees:.+_bee/, /iceandfire:myrmex.+/, /iceandfire:.+_dragon/, 'iceandfire:dragon_multipart', 'iceandfire:dragon_egg', 'artifacts:mimic',]) - e.add('mob_grinding_utils:noswab', [/resourcefulbees:.+_bee/, /iceandfire:myrmex.+/, /iceandfire:.+_dragon/, 'iceandfire:dragon_multipart', 'iceandfire:dragon_egg', 'artifacts:mimic',]) + e.add('industrialforegoing:mob_imprisonment_tool_blacklist', [/resourcefulbees:.+_bee/, /iceandfire:myrmex.+/, /iceandfire:.+_dragon/, 'iceandfire:dragon_multipart', 'iceandfire:dragon_egg', 'artifacts:mimic',/mana-and-artifice:.+/]) + e.add('mob_grinding_utils:noswab', [/resourcefulbees:.+_bee/, /iceandfire:myrmex.+/, /iceandfire:.+_dragon/, 'iceandfire:dragon_multipart', 'iceandfire:dragon_egg', 'artifacts:mimic', /mana-and-artifice:.+/]) e.add('mob_grinding_utils:no_spawn', '#mob_grinding_utils:noswab') }) //#endregion