diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 285e3d1c..517a3beb 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.20 - 1.8.19 - 1.8.18 - 1.8.17 diff --git a/.github/ISSUE_TEMPLATE/crash.yaml b/.github/ISSUE_TEMPLATE/crash.yaml index 6794436d..fad02006 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.20 - 1.8.19 - 1.8.18 - 1.8.17 diff --git a/changelog/1.8.20.md b/changelog/1.8.20.md new file mode 100644 index 00000000..a1e6ed65 --- /dev/null +++ b/changelog/1.8.20.md @@ -0,0 +1,55 @@ +## Release 1.8.20 + +### Mod Additions +- actuallycompatible-0.1.2.jar +### Mod Updates +- absentbydesign-1.16.5-1.5.2.jar +- Aquaculture-1.16.5-2.1.22.jar +- architectury-1.30.53.jar +- ars_nouveau-1.16.5-1.24.17.jar +- botanicalmachinery-1.16.4-0.4.5.jar +- BotanyPots-1.16.5-7.1.31.jar +- BrandonsCore-1.16.5-3.0.12.240-universal.jar +- cloth-config-4.14.54-forge.jar +- Clumps-6.0.0.28.jar +- CodeChickenLib-1.16.5-4.0.7.444-universal.jar +- comforts-forge-1.16.5-4.0.1.4.jar +- dankstorage-1.16.5-3.20.jar +- Draconic-Evolution-1.16.5-3.0.20.440-universal.jar +- entityculling-forge-mc1.16.5-1.5.0.jar +- extremeSoundMuffler-3.18_1.16.5.jar +- forbidden_arcanus-16.2.3.jar +- ImmersivePosts-1.16.5-4.3.0-1.jar +- incontrol-1.16-5.2.3.jar +- IntegratedDynamics-1.16.5-1.10.7.jar +- IntegratedTerminals-1.16.5-1.2.12.jar +- jei-1.16.5-7.7.1.150.jar +- lootr-1.16.5-0.1.11.38.jar +- mahoutsukai-1.16.5-v1.34.8.jar +- mana-and-artifice-1.5.1.7.jar +- mcjtylib-1.16-5.1.4.jar +- Mekanism-1.16.5-10.1.2.457.jar +- MekanismAdditions-1.16.5-10.1.2.457.jar +- MekanismGenerators-1.16.5-10.1.2.457.jar +- MekanismTools-1.16.5-10.1.2.457.jar +- minecolonies-1.16.5-1.0.443-BETA.jar +- moreminecarts-1.3.15.jar +- Quark-r2.4-322.jar +- rftoolsbuilder-1.16-3.1.6.jar +- rsgauges-1.16.5-1.2.14.jar +- sophisticatedbackpacks-1.16.5-3.15.7.531.jar +- structurize-1.16.5-1.0.343-RELEASE.jar +- supplementaries-1.16.5-0.18.4.jar +- tinyredstone-1.16.5-1.13.3.jar +- tombstone-6.7.3-1.16.5.jar +- xptome-1.16.5-v2.1.4.jar +### Other Changes +- Update Forge to 36.2.28 +- Block windowlogging from Building Gadgets +- Fix Item Transfer Node not dropping when broken +- Remove duplicate slurry recipes (#2937) +- Add forge:stone tag to Quark deepslate (#2949) +- Fix dense comb outputs (#2960) +- Add more missing lang entries (thanks to Gazzzaa) +- Increase turtle spawns in overworld +- Add some missing Chisel tags diff --git a/config/actuallycompatible-common.toml b/config/actuallycompatible-common.toml new file mode 100644 index 00000000..a0591965 --- /dev/null +++ b/config/actuallycompatible-common.toml @@ -0,0 +1,4 @@ +["Ignored Mods"] + #Client-side mod IDs that will be ignored if not present on the server. + clientIgnoredMods = ["jeresources", "advancementplaques", "equipmentcompare"] + diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml index e6ce2d5d..d7f69a9a 100644 --- a/config/allthetweaks-common.toml +++ b/config/allthetweaks-common.toml @@ -8,4 +8,4 @@ [packversionmin] minor = 8 [packversionminrev] - minorrev = 19 + minorrev = 20 diff --git a/config/delogger2.json b/config/delogger2.json new file mode 100644 index 00000000..8aeabcfd --- /dev/null +++ b/config/delogger2.json @@ -0,0 +1,28 @@ +{ + "dontChangeMe": "RandomString", + "printWarningMessage": true, + "enableDebugLog": false, + "whitelistLoggersTypes": [ + "DebugFile" + ], + "loggers": [ + "net.minecraft.client.renderer.model.BlockModel", + "net.minecraft.client.renderer.texture.AtlasTexture", + "com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService", + "net.minecraft.client.renderer.model.ModelBakery", + "net.minecraft.client.util.ClientRecipeBook", + "net.minecraft.command.Commands", + "net.minecraft.util.Util", + "net.minecraft.entity.EntityType", + "net.minecraft.loot.LootTableManager", + "net.minecraft.world.chunk.storage.ChunkSerializer", + "net.minecraftforge.registries.GameData", + "net.minecraftforge.common.ForgeConfigSpec", + "net.minecraftforge.fml.VersionChecker", + "mezz.jei.load.PluginCaller", + "configured" + ], + "ignoredExceptions": [ + "com.mojang.authlib.exceptions.AuthenticationUnavailableException" + ] +} diff --git a/config/resourcefulbees/bees/Dense/Dense Copper.json b/config/resourcefulbees/bees/Dense/Dense Copper.json index 49133dd8..c2d7aee1 100644 --- a/config/resourcefulbees/bees/Dense/Dense Copper.json +++ b/config/resourcefulbees/bees/Dense/Dense Copper.json @@ -47,10 +47,10 @@ "mainInputCount": 1, "mainOutput": "alltheores:ore_copper", "mainOutputWeight": 0.50, - "mainOutputCount": 2, + "mainOutputCount": 4, "secondaryOutput": "alltheores:copper_ingot", "secondaryOutputWeight": 0.01, - "secondaryOutputCount": 4, + "secondaryOutputCount": 8, "bottleOutput": "minecraft:honey_bottle", "bottleOutputWeight": 0.25, "bottleOutputCount": 1, diff --git a/config/resourcefulbees/bees/Dense/Dense Nickel.json b/config/resourcefulbees/bees/Dense/Dense Nickel.json index 7e421572..fffd61b5 100644 --- a/config/resourcefulbees/bees/Dense/Dense Nickel.json +++ b/config/resourcefulbees/bees/Dense/Dense Nickel.json @@ -44,10 +44,9 @@ }, "CentrifugeData": { "hasCentrifugeOutput": true, - "mainInputCount": 4, "mainOutput": "alltheores:ore_nickel", "mainOutputWeight": 0.50, - "mainOutputCount": 1, + "mainOutputCount": 4, "secondaryOutput": "alltheores:nickel_ingot", "secondaryOutputWeight": 0.01, "secondaryOutputCount": 8, diff --git a/config/resourcefulbees/bees/Dense/Dense Osmium.json b/config/resourcefulbees/bees/Dense/Dense Osmium.json index ed39382e..221115d0 100644 --- a/config/resourcefulbees/bees/Dense/Dense Osmium.json +++ b/config/resourcefulbees/bees/Dense/Dense Osmium.json @@ -44,10 +44,9 @@ }, "CentrifugeData": { "hasCentrifugeOutput": true, - "mainInputCount": 4, "mainOutput": "alltheores:ore_osmium", "mainOutputWeight": 0.50, - "mainOutputCount": 1, + "mainOutputCount": 4, "secondaryOutput": "alltheores:osmium_ingot", "secondaryOutputWeight": 0.01, "secondaryOutputCount": 8, diff --git a/kubejs/assets/allthemods/lang/en_us.json b/kubejs/assets/allthemods/lang/en_us.json index 74727366..a3cab343 100644 --- a/kubejs/assets/allthemods/lang/en_us.json +++ b/kubejs/assets/allthemods/lang/en_us.json @@ -13,11 +13,28 @@ "fluid.allthemodium.vapor_allthemodium": "AllTheModium Vapor", "fluid.allthemodium.vapor_vibranium": "Vibranium Vapor", "fluid.allthemodium.vapor_unobtainium": "Unobtainium Vapor", - "fluid.bloodmagic.life_essence_fluid": "Life Essence", "enchantment.minecolonies.raider_damage_enchant.desc": "Increases damage against MineColonies raiders.", "enchantment.draconicevolution.reaper_enchantment.desc": "Killing mobs has a chance to drop the corresponding Mob Soul.", "enchantment.create.capacity.desc": "Increases the air capacity of a Copper Backtank.", "enchantment.create.potato_recovery.desc": "Potato Cannon ammo has a chance to drop as an item on hit.", "enchantment.mythicbotany.hammer_mobility.desc": "Increases Mjöllnir attack speed.", - "enchantment.mahoutsukai.projector.desc": "Decorative magic circles applied by the Mahoujin Projector." + "enchantment.mahoutsukai.projector.desc": "Decorative magic circles applied by the Mahoujin Projector.", + "block.bloodmagic.mimic": "Mimic", + "block.bloodmagic.ethereal_mimic": "Ethereal Mimic", + "block.bloodmagic.nether_soil": "Nether Soil", + "block.bloodmagic.dungeon_regular_cracked_brick1": "Cracked Demon Brick", + "block.bloodmagic.dungeon_cracked_brick1": "Accented Demon Brick", + "block.bloodmagic.inversion_pillar": "Inversion Pillar", + "block.bloodmagic.dungeon_controller": "Dungeon Controller", + "block.bloodmagic.dungeon_seal": "Dungeon Seal", + "item.bloodmagic.doubt_bucket": "Doubt Bucket", + "item.bloodmagic.will_power_anointment": "Will Power Anointment", + "fluid.bloodmagic.life_essence_fluid": "Life Essence", + "fluid.bloodmagic.doubt_fluid": "Doubt Fluid", + "lens_focus.envirotech.erodium": "Erodium Lens", + "fluid.envirocore.distilled_water": "Distilled Water", + "item.minecolonies.mummyarcheregg": "Mummy Archer Egg", + "item.minecolonies.mummyegg": "Mummy Egg", + "item.minecolonies.pharaoegg": "Pharao Egg" } + diff --git a/kubejs/data/cyclic/loot_tables/blocks/wireless_item.json b/kubejs/data/cyclic/loot_tables/blocks/wireless_item.json new file mode 100644 index 00000000..98871875 --- /dev/null +++ b/kubejs/data/cyclic/loot_tables/blocks/wireless_item.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "pool1", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "cyclic:wireless_item" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/kubejs/server_scripts/mod_specific/_allthemods/alltheores.js b/kubejs/server_scripts/mod_specific/_allthemods/alltheores.js new file mode 100644 index 00000000..1042da8c --- /dev/null +++ b/kubejs/server_scripts/mod_specific/_allthemods/alltheores.js @@ -0,0 +1,12 @@ +onEvent('recipes', e => { + + const slurries = [ + 'uranium', + 'copper', + 'osmium', + 'lead', + 'tin' + ] + + slurries.forEach(type => e.remove({id: `alltheores:mek_processing/${type}/slurry/dirty`})) +}); diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js index 51d90bb9..e6944052 100644 --- a/kubejs/server_scripts/tags.js +++ b/kubejs/server_scripts/tags.js @@ -26,10 +26,20 @@ onEvent('item.tags', e => { e.add(`mekanism:crystals/${item}`, `alltheores:${item}_crystal`) e.add(`mekanism:crystals`, `#mekanism:crystals/${item}`) }) + e.add('forge:stone', ['quark:deepslate']) e.add('forge:marble', '#chisel:marble') e.add('integrateddynamics:menril_logs', 'integrateddynamics:menril_log_filled') e.add('chisel:marble', ['astralsorcery:marble_raw', 'enviromats:marble', 'quark:marble']) e.add('chisel:limestone', ['create:limestone', 'create:weathered_limestone', 'quark:limestone']) + e.add('chisel:basalt', ['minecraft:basalt', 'minecraft:polished_basalt']) + e.add('chisel:sandstone', ['minecraft:sandstone', 'minecraft:chiseled_sandstone', 'minecraft:cut_sandstone', 'minecraft:smooth_sandstone']) + e.add('chisel:metals/aluminum', 'alltheores:aluminum_block') + e.add('chisel:metals/bronze', 'thermal:bronze_block') + e.add('chisel:emerald', 'minecraft:emerald_block') + e.add('chisel:redstone', 'minecraft:redstone_block') + e.add('chisel:coal', 'minecraft:coal_block') + e.add('chisel:charcoal', 'thermal:charcoal_block') + e.add('chisel:end_stone', 'minecraft:end_stone') e.add('forge:ingots/aluminum', 'zycraft:aluminium') e.add('forge:ingots/aluminium', 'zycraft:aluminium') e.add('forge:ingots/uru', 'kubejs:uru_ingot') @@ -147,6 +157,17 @@ onEvent('block.tags', e => { e.add('pedestals:quarry/blacklist', ['allthemodium:allthemodium_ore', 'allthemodium:vibranium_ore', 'allthemodium:unobtainium_ore']) e.add('forge:gems/quartz', 'zycraft:quartz_crystal') e.add('forge:marble', '#chisel:marble') + e.add('chisel:marble', ['astralsorcery:marble_raw', 'enviromats:marble', 'quark:marble']) + e.add('chisel:limestone', ['create:limestone', 'create:weathered_limestone', 'quark:limestone']) + e.add('chisel:basalt', ['minecraft:basalt', 'minecraft:polished_basalt']) + e.add('chisel:sandstone', ['minecraft:sandstone', 'minecraft:chiseled_sandstone', 'minecraft:cut_sandstone', 'minecraft:smooth_sandstone']) + e.add('chisel:metals/aluminum', 'alltheores:aluminum_block') + e.add('chisel:metals/bronze', 'thermal:bronze_block') + e.add('chisel:emerald', 'minecraft:emerald_block') + e.add('chisel:redstone', 'minecraft:redstone_block') + e.add('chisel:coal', 'minecraft:coal_block') + e.add('chisel:charcoal', 'thermal:charcoal_block') + e.add('chisel:end_stone', 'minecraft:end_stone') e.add('forge:ores/certus_quartz', ['appliedenergistics2:quartz_ore', 'appliedenergistics2:charged_quartz_ore']) e.add('forge:ores/quartz', '#forge:ores/certus_quartz') e.add('forge:ores/arcane_brick', 'ars_nouveau:arcane_ore') @@ -185,8 +206,8 @@ onEvent('block.tags', e => { e.add('cyclic:scythe_brush', '#minecraft:flowers') e.add('mcwwindows:window', '/mcwwindows:.+_win/') e.add('misctags:concrete', '/minecraft:.+_concrete/') - e.add('buildinggadgets:blacklist/copy_paste', /^refinedstorage:.+$/) - e.add('buildinggadgets:blacklist/building', /^refinedstorage:.+$/) + e.add('buildinggadgets:blacklist/copy_paste', [/^refinedstorage:.+$/, /^windowlogging:.+$/]) + e.add('buildinggadgets:blacklist/building', [/^refinedstorage:.+$/, /^windowlogging:.+$/]) //#endregion //#region removals e.removeAll('minecraft:enderman_holdable') diff --git a/kubejs/startup_scripts/worldgen_add.js b/kubejs/startup_scripts/worldgen_add.js new file mode 100644 index 00000000..fefff648 --- /dev/null +++ b/kubejs/startup_scripts/worldgen_add.js @@ -0,0 +1,14 @@ +onEvent('worldgen.add', event => { + event.addSpawn(spawn => { + spawn.category = 'creature' + spawn.entity = 'minecraft:turtle' + spawn.weight = 50 + spawn.minCount = 2 + spawn.maxCount = 6 + spawn.biomes.blacklist = false + spawn.biomes.values = [ + '#beach', + '#ocean' + ] + }) +})