Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.8.23 #3044

Merged
merged 16 commits into from
Apr 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ body:
label: Modpack Version
description: What version of the pack are you using?
options:
- 1.8.23
- 1.8.22
- 1.8.21
- 1.8.20
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/crash.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ body:
label: Modpack Version
description: What version of the pack are you using?
options:
- 1.8.23
- 1.8.22
- 1.8.21
- 1.8.20
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [![ATM6](https://i.imgur.com/YqebipQ.png)](https://discord.gg/K5FBPYa)
# [![ATM6](https://i.imgur.com/YqebipQ.png)](https://discord.gg/3paFjuRfz9)


All The Mods 6
Expand All @@ -13,7 +13,7 @@ When reporting an issue put the version number before the issue title! Such as [

|You can also find us on Discord for help<br>or just to chat as well as Reddit|
|:------------:|
|<a href="https://discordapp.com/invite/rbSZNDQ"><img src="https://discordapp.com/assets/fc0b01fe10a0b8c602fb0106d8189d9b.png" alt="Join us on Discord!" width="200" height="68"></a>|
|<a href="https://discord.gg/3paFjuRfz9"><img src="https://discordapp.com/assets/fc0b01fe10a0b8c602fb0106d8189d9b.png" alt="Join us on Discord!" width="200" height="68"></a>|
|<a href="https://www.reddit.com/r/allthemods"><img src="https://www.redditstatic.com/about/assets/reddit-logo.png" alt="/r/AllTheMods on Reddit" width="200" height="67"></a>|
<br>

Expand Down
46 changes: 46 additions & 0 deletions changelog/1.8.23.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
## Release 1.8.23

### Mod Updates
- architectury-1.31.59.jar
- ars_nouveau-1.16.5-1.24.22.jar
- AttributeFix-1.16.5-10.1.4.jar
- BiomesOPlenty-1.16.5-13.1.0.486-universal.jar
- Bookshelf-Forge-1.16.5-10.4.32.jar
- BotanyPots-1.16.5-7.1.32.jar
- BotanyTrees-1.16.5-3.0.7.jar
- CosmeticArmorReworked-1.16.5-v5.jar
- creativecrafter-1.16.5-0.1522.jar
- Cyclic-1.16.5-1.5.15.jar
- DarkUtilities-1.16.5-8.0.13.jar
- EnchantmentDescriptions-1.16.5-7.0.19.jar
- EnderStorage-1.16.5-2.8.0.170-universal.jar
- engineersdecor-1.16.5-1.1.17.jar
- FramedBlocks-2.14.4.jar
- geckolib-forge-1.16.5-3.0.68.jar
- globalxp-1.16.5-v1.9.2.jar
- HammerLib-1.16.5-16.3.30.jar
- lootr-1.16.5-0.1.12.42.jar
- mahoutsukai-1.16.5-v1.34.11.jar
- mcjtylib-1.16-5.1.5.jar
- mcw-fences-1.0.4-mc1.16.5.jar
- minecolonies-1.16.5-1.0.591-BETA.jar
- mob_grinding_utils-1.16.5-0.4.35.jar
- pneumaticcraft-repressurized-1.16.5-2.15.6-315.jar
- rftoolsbase-1.16-2.1.3.jar
- rftoolsbuilder-1.16-3.1.8.jar
- rftoolscontrol-1.16-4.0.16.jar
- rftoolsutility-1.16-3.1.14.jar
- rsgauges-1.16.5-1.2.15.jar
- Runelic-1.16.5-7.0.3.jar
- simplylight-1.16.5-1.4.2-build.32.jar
- structurize-1.16.5-1.0.380-BETA.jar
- theoneprobe-1.16-3.1.7.jar
- trashcans-1.0.14-mc1.16.jar
- universalgrid-1.16.5-1.032.jar
- xptome-1.16.5-v2.1.5.jar
### Other Changes
- Also disable the /warp command by default on new worlds
- Add Draconic Evolution to Mahou Projection blacklist
- Add stonecutting recipes for metal block variants
- Fixes for Mekanism slurry and combiner unification (#3019, #3031)
- Add Creative Crafter to cardboard box blacklist (#3029)
2 changes: 1 addition & 1 deletion config/allthetweaks-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
[packversionmin]
minor = 8
[packversionminrev]
minorrev = 22
minorrev = 23
2 changes: 1 addition & 1 deletion config/pneumaticcraft-common.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[General]
oil_world_gen_blacklist = ["minecraft:soul_sand_valley", "minecraft:crimson_forest", "minecraft:warped_forest", "minecraft:nether_wastes", "minecraft:the_void", "minecraft:the_end", "minecraft:small_end_islands", "minecraft:end_midlands", "minecraft:end_highlands", "minecraft:end_barrens", "allthemodium:mining"]

vacuum_trap_blacklist = ["#mob_grinding_utils:noswab"]
12 changes: 12 additions & 0 deletions defaultconfigs/ftbessentials-server.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,17 @@
# Default: true
enabled: true
}

# Allows admins to create 'warps', which are fixed points in the world that users may teleport to using /warp
warp: {
# Cooldown between /warp commands (in seconds)
# You can override this with FTB Ranks using ftbessentials.warp.cooldown
# Default: 10
# Range: 0 ~ 604800
cooldown: 10

# Default: true
enabled: false
}
}
}
2 changes: 1 addition & 1 deletion defaultconfigs/mahoutsukai-server.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[projection]
PROJECTION_BLACKLIST = ["silentgear"]
PROJECTION_BLACKLIST = ["silentgear", "draconicevolution", "mysticalagriculture", "thermal"]
POWER_CONSOLIDATION_TIERS = [10000.0, 50000.0, 500000.0, 1000000.0, 5000000.0]
POWER_CONSOLIDATION_TIER_UPGRADE_ITEM = ["atmadditions:atm_star"]
#Projection Enchantment Blacklist
Expand Down
8 changes: 4 additions & 4 deletions kubejs/server_scripts/advanced_interactions/atm_shards.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
onEvent('block.left_click', e => {
let hammer = e.getBlock()
let anvil = hammer.getDown().getDown()
let bedrock = anvil.getDown()
if (hammer === 'mythicbotany:mjoellnir') {
let anvil = hammer.getDown().getDown()
let bedrock = anvil.getDown()
if (anvil === 'minecraft:anvil') {
if (bedrock === 'minecraft:bedrock') {
let entities = e.world.getEntitiesWithin(AABB.ofBlock(hammer.getDown().getPos()))
Expand All @@ -20,9 +20,9 @@ onEvent('block.left_click', e => {
frame.kill()

let dimension = e.world.getDimension()
e.server.schedule(1000, () => {
e.server.scheduleInTicks(20, () => {
e.server.runCommandSilent(`/execute in ${dimension} run summon minecraft:item ${anvil.x} ${anvil.y + 1} ${anvil.z} {Item:{id:"atmadditions:atm_star_shard",Count:5}}`)
}).call()
});
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions kubejs/server_scripts/constants.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
//priority: 1
let colors = ['white', 'orange', 'magenta', 'light_blue', 'yellow', 'lime', 'pink', 'gray', 'light_gray', 'cyan', 'purple', 'blue', 'brown', 'green', 'red', 'black']
let vanillaMetals = ['iron', 'gold']
let atoMetals = ['aluminum', 'osmium', 'platinum', 'zinc', 'uranium', 'tin', 'lead', 'silver', 'nickel', 'zinc', 'copper']
let atmMetals = ['allthemodium', 'vibranium', 'unobtainium']
let immersiveMetals = ['aluminum', 'lead', 'nickel', 'silver', 'uranium', 'copper']
let immersiveAlloys = ['steel', 'electrum', 'constantan']
let mekanismMetals = ['osmium', 'lead', 'tin', 'uranium', 'copper']
let mekanismAlloys = ['steel', 'refined_obsidian', 'refined_glowstone', 'bronze']
let thermalMetals = ['copper', 'tin', 'lead', 'silver', 'nickel']
let thermalAlloys = ['bronze', 'electrum', 'invar', 'constantan', 'signalum', 'enderium', 'lumium']

let draconicFusion = (e, output, craftingTier, energy, middleItem, ingredientList) => {
//crafting tier: 1.draconium, 2.wyvern, 3.draconic, 4.chaotic
Expand Down
11 changes: 1 addition & 10 deletions kubejs/server_scripts/mod_specific/_allthemods/alltheores.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
onEvent('recipes', e => {

const slurries = [
'uranium',
'copper',
'osmium',
'lead',
'tin'
]

slurries.forEach(type => e.remove({id: `alltheores:mek_processing/${type}/slurry/dirty`}))
mekanismMetals.forEach(type => e.remove({id: `alltheores:mek_processing/${type}/slurry/dirty`}))
});
4 changes: 4 additions & 0 deletions kubejs/server_scripts/mod_specific/mekanism/mekanism.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ onEvent('recipes', e => {
).id(`kubejs:saw/byg_log_${type}`)
})

mekanismMetals.forEach(metal => {
e.remove({id: `mekanism:processing/${metal}/ore/from_dust`})
})

removeRecipeByID(e, [
/^mekanism:processing\/.*\/storage_blocks\/from_ingots/,
'mekanism:storage_blocks/bronze',
Expand Down
20 changes: 20 additions & 0 deletions kubejs/server_scripts/stonecutting.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
onEvent('recipes', e => {
function stonecutting(inputs, formatter) {
inputs.forEach(metal => {
let output = formatter(metal);
e.stonecutting(output, `#forge:storage_blocks/${metal}`)
.id(`kubejs:stonecutting/${output.replace(':', '/')}`)
});
}

stonecutting(immersiveMetals.concat(immersiveAlloys), metal => `immersiveengineering:storage_${metal}`)
stonecutting(mekanismMetals.concat(mekanismAlloys), metal => `mekanism:block_${metal}`)
stonecutting(thermalMetals.concat(thermalAlloys), metal => `thermal:${metal}_block`)
stonecutting(atoMetals, metal => `alltheores:${metal}_block`)
stonecutting(['tin', 'silver', 'copper'], metal => `projectred-exploration:${metal}_block`)
stonecutting(['brass', 'zinc', 'copper'], metal => `create:${metal}_block`)
stonecutting(['aluminum', 'copper'], metal => `tmechworks:${metal}_block`)
stonecutting(['silver', 'copper'], metal => `iceandfire:${metal}_block`)
stonecutting(['copper'], metal => `tconstruct:${metal}_block`)
stonecutting(['lead'], metal => `eidolon:${metal}_block`)
})
4 changes: 3 additions & 1 deletion kubejs/server_scripts/tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ onEvent('block.tags', e => {
e.add('forge:storage_blocks/uru', 'kubejs:uru_block')
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:stone', ['quark:deepslate'])
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'])
Expand All @@ -173,7 +174,7 @@ onEvent('block.tags', e => {
e.add('forge:ores/arcane_brick', 'ars_nouveau:arcane_ore')
e.add('forge:ores/dimensionalshard', ['rftoolsbase:dimensionalshard_overworld', 'rftoolsbase:dimensionalshard_nether', 'rftoolsbase:dimensionalshard_end'])
e.add('forge:ores', ['#forge:ores/certus_quartz', '#forge:ores/oratchalcum', '#forge:ores/rat_gem', '#forge:ores/dimensionalshard', '#forge:ores/arcane_brick'])
e.add('misctags:no_moving', ['#minecraft:wither_immune', 'potionsmaster:cauldron', 'appliedenergistics2:cable_bus', 'cookingforblockheads:fridge', /^refinedstorage:/, /^extrastorage:/, /^waystones:/, /^compactmachines:/, /^appliedenergistics2:/, /^thermal:/, /^mekanism:/])
e.add('misctags:no_moving', ['#minecraft:wither_immune', 'potionsmaster:cauldron', 'appliedenergistics2:cable_bus', 'cookingforblockheads:fridge', /^refinedstorage:/, /^extrastorage:/, /^waystones:/, /^compactmachines:/, /^appliedenergistics2:/, /^thermal:/, /^mekanism:/, /^creativecrafter:/])
e.add('mekanism:cardboard_blacklist', '#misctags:no_moving')
e.add('bagofyurting:blacklist', '#misctags:no_moving')
e.add('create:brittle', '#misctags:no_moving')
Expand Down Expand Up @@ -222,6 +223,7 @@ onEvent('block.tags', e => {
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('mob_grinding_utils:no_spawn', '#mob_grinding_utils:noswab')
})
//#endregion

Expand Down
4 changes: 2 additions & 2 deletions packmenu/resources/assets/atm/buttons/discord.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"height": 30,
"langKey": "packmenu.atm.discord",
"action": "OPEN_URL",
"data": "https://discord.gg/K5FBPYa",
"data": "https://discord.gg/3paFjuRfz9",
"u": 0,
"v": 0,
"hoverU": 0,
Expand All @@ -18,4 +18,4 @@
"dropShadow": false,
"textXOffset": 5,
"textYOffset": -6
}
}