Skip to content

Commit

Permalink
Merge pull request #3098 from AllTheMods/Staging
Browse files Browse the repository at this point in the history
Release 1.8.25
  • Loading branch information
jeremiahwinsley authored Jun 2, 2022
2 parents 985c724 + 2c67631 commit 8e63854
Show file tree
Hide file tree
Showing 96 changed files with 1,057 additions and 154 deletions.
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.25
- 1.8.24
- 1.8.23
- 1.8.22
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.25
- 1.8.24
- 1.8.23
- 1.8.22
Expand Down
59 changes: 59 additions & 0 deletions changelog/1.8.25.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
## Release 1.8.25

### Mod Additions
- entitycollisionfpsfix-1.16-1.0.1.jar
### Mod Updates
- archers_paradox-1.16.5-1.5.0.2.jar
- architectury-1.32.63.jar
- ars_nouveau-1.16.5-1.25.1.jar
- BloodMagic-1.16.4-3.1.10-32.jar
- BotanyPots-1.16.5-7.1.39.jar
- cabletiers-1.16.5-0.5442.jar
- cloth-config-4.14.64-forge.jar
- cofh_core-1.16.5-1.5.0.11.jar
- corail_woodcutter-1.16-2.0.2.jar
- CyclopsCore-1.16.5-1.12.4.jar
- DarkUtilities-1.16.5-8.0.14.jar
- ensorcellation-1.16.5-1.5.0.4.jar
- FramedBlocks-2.16.0.jar
- ftb-ranks-forge-1605.1.6-build.33.jar
- geckolib-forge-1.16.5-3.0.71.jar
- globalxp-1.16.5-v1.10.jar
- Iceberg-1.16.5-1.0.41.jar
- ImmersiveEngineering-1.16.5-5.1.0-148.jar
- incontrol-1.16-5.2.7.jar
- IntegratedCrafting-1.16.5-1.0.22.jar
- jeiintegration_1.16.5-7.1.0.22.jar
- LegendaryTooltips-1.16.5-1.1.7.jar
- logprot-1.16-1.6.jar
- lootr-1.16.5-0.1.12.43.jar
- mahoutsukai-1.16.5-v1.34.16.jar
- mcw-bridges-2.0.3-mc1.16.5.jar
- minecolonies-1.16.5-1.0.736-RELEASE.jar
- omgourd-1.16.5-1.5.0.2.jar
- pneumaticcraft-repressurized-1.16.5-2.15.9-326.jar
- pylons-1.16.5-1.1.0.jar
- ResourcefulBees-1.16.5-0.10.7.jar
- rftoolsbuilder-1.16-3.1.9.jar
- rftoolsutility-1.16-3.1.15.jar
- structurize-1.16.5-1.0.392-RELEASE.jar
- thermal_cultivation-1.16.5-1.5.0.4.jar
- thermal_expansion-1.16.5-1.5.0.7.jar
- thermal_foundation-1.16.5-1.5.0.14.jar
- thermal_innovation-1.16.5-1.5.0.4.jar
- thermal_locomotion-1.16.5-1.5.0.4.jar
- tombstone-6.7.6-1.16.5.jar
### Other Changes
- Recipe fixes for Environmental Materials slabs and walls
- Fix Mekanism slurry unification again
- Clean up extra ingot/nugget/block recipes
- Reduce recipe requirements for Explorer's Compass
- Fix recipe for Apotheosis book
- Fix drops for Boon of the Earth enchant
- Fix block not dropping for Creative Source Jar
- Add draconium to Ender Dragon drops in Woot
- Disable moving tile entities with RFTools Builder
- Add igneous extruder recipes for more vanilla stone (thanks to Pandas)
- Fix charcoal dupe (#3086 - thanks to Pandas)
- Add reversed dragon forge recipes for ATM alloys
- Add alternate crafting recipes for naturally spawning bees
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 = 24
minorrev = 25
8 changes: 0 additions & 8 deletions config/apotheosis/spawner.cfg
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
ignore_spawn_cap {
S:item=minecraft:barrier
}

ignore_spawn_conditions {
S:item=allthemodium:allthemodium_ingot
}

spawn_eggs {
S:"Banned Mobs" <
resourcefulbees:allthemodium_bee
Expand Down
35 changes: 34 additions & 1 deletion config/ftbquests/quests/chapters/tips_and_tricks.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
}]
}
{
title: "Compact Machines"
x: -1.0d
y: -1.0d
subtitle: "When an infinite world is too small"
Expand All @@ -158,7 +159,39 @@
tasks: [{
id: "029DB3044D5E30A0"
type: "item"
item: "compactmachines:machine_tiny"
title: "Any Compact Machine"
item: {
id: "itemfilters:or"
Count: 1b
tag: {
items: [
{
id: "compactmachines:machine_tiny"
Count: 1b
}
{
id: "compactmachines:machine_small"
Count: 1b
}
{
id: "compactmachines:machine_normal"
Count: 1b
}
{
id: "compactmachines:machine_large"
Count: 1b
}
{
id: "compactmachines:machine_giant"
Count: 1b
}
{
id: "compactmachines:machine_maximum"
Count: 1b
}
]
}
}
}]
rewards: [{
id: "17FAC4A27147E065"
Expand Down
5 changes: 5 additions & 0 deletions defaultconfigs/rftoolsbuilder-server.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Settings for the builder
[builder]
#Can Tile Entities be moved? 'forbidden' means never, 'whitelist' means only whitelisted, 'blacklist' means all except blacklisted, 'allowed' means all
#Allowed Values: MOVE_FORBIDDEN, MOVE_WHITELIST, MOVE_BLACKLIST, MOVE_ALLOWED
tileEntityMode = "MOVE_FORBIDDEN"
19 changes: 19 additions & 0 deletions kubejs/client_scripts/constants.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//priority: 1
let colors = ['white', 'orange', 'magenta', 'light_blue', 'yellow', 'lime', 'pink', 'gray', 'light_gray', 'cyan', 'purple', 'blue', 'brown', 'green', 'red', 'black']
let maDisabledSeeds = ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon', 'lumium', 'enderium']
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 createMetals = ['copper', 'zinc']
let createAlloys = ['brass']
let iceAndFireMetals = ['copper', 'silver']
let projectRedMetals = ['copper', 'tin', 'silver']
let tconstructMetals = ['copper']
let tmechworksMetals = ['copper', 'aluminum']
let eidolonMetals = ['lead']
80 changes: 68 additions & 12 deletions kubejs/client_scripts/jei_removals.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
onEvent('jei.hide.items', e => {
//#region consts
let refined = ['controller', 'creative_controller', 'grid', 'crafting_grid', 'pattern_grid', 'fluid_grid', 'network_receiver', 'network_transmitter', 'relay', 'detector', 'security_manager', 'wireless_transmitter', 'disk_manipulator', 'crafter', 'crafter_manager', 'crafting_monitor']
let colors = ['white', 'light_gray', 'gray', 'black', 'red', 'orange', 'yellow', 'lime', 'green', 'light_blue', 'cyan', 'blue', 'purple', 'magenta', 'pink', 'brown']
let typeFirst = ['mekanism', 'immersiveengineering']
let enviroStonesMats = ['basalt', 'hardened_stone', 'granodiorite', 'marble', 'pumice', 'travertine']
//#endregion
//#region functions
function hideMetal(mod, name, types) {
Expand All @@ -12,12 +10,14 @@ onEvent('jei.hide.items', e => {
if (!Ingredient.of(id).stacks.empty) e.hide(id)
})
}

function hideStuff(mod, type, names) {
names.forEach(name => {
let id = typeFirst.includes(mod) ? `${mod}:${type}_${name}` : `${mod}:${name}_${type}`
if (!Ingredient.of(id).stacks.empty) e.hide(id)
})
}

//#endregion

e.hide([
Expand Down Expand Up @@ -103,7 +103,6 @@ onEvent('jei.hide.items', e => {
'eidolon:lead_ingot',
'eidolon:lead_block',
'eidolon:lead_nugget',
/resourcefulbees:.*spawn_egg/,
'cyclic:honey_bucket',
'create:honey_bucket',
'thermal:creosote_bucket',
Expand All @@ -130,7 +129,67 @@ onEvent('jei.hide.items', e => {
'projectred-core:copper_ingot'
])

enviroStonesMats.forEach(stone => e.hide(`/enviromats:${stone}_.*/`))
// only hide uncraftable spawn eggs
e.hide([
'resourcefulbees:abbee_bee_spawn_egg',
'resourcefulbees:allthemodium_bee_spawn_egg',
'resourcefulbees:aluminum_bee_spawn_egg',
'resourcefulbees:awakened_bee_spawn_egg',
'resourcefulbees:beediddy_bee_spawn_egg',
'resourcefulbees:blazing_bee_spawn_egg',
'resourcefulbees:certus_bee_spawn_egg',
'resourcefulbees:chaotic_bee_spawn_egg',
'resourcefulbees:coal_bee_spawn_egg',
'resourcefulbees:copper_bee_spawn_egg',
'resourcefulbees:cotton_candy_bee_spawn_egg',
'resourcefulbees:dense_copper_bee_spawn_egg',
'resourcefulbees:dense_gold_bee_spawn_egg',
'resourcefulbees:dense_iron_bee_spawn_egg',
'resourcefulbees:dense_lead_bee_spawn_egg',
'resourcefulbees:dense_netherite_bee_spawn_egg',
'resourcefulbees:dense_nickel_bee_spawn_egg',
'resourcefulbees:dense_osmium_bee_spawn_egg',
'resourcefulbees:dense_platinum_bee_spawn_egg',
'resourcefulbees:dense_silver_bee_spawn_egg',
'resourcefulbees:dense_tin_bee_spawn_egg',
'resourcefulbees:dense_uranium_bee_spawn_egg',
'resourcefulbees:dense_zinc_bee_spawn_egg',
'resourcefulbees:diamond_bee_spawn_egg',
'resourcefulbees:draconium_bee_spawn_egg',
'resourcefulbees:dragonic_bee_spawn_egg',
'resourcefulbees:emerald_bee_spawn_egg',
'resourcefulbees:fluorite_bee_spawn_egg',
'resourcefulbees:ghastly_bee_spawn_egg',
'resourcefulbees:gold_bee_spawn_egg',
'resourcefulbees:iron_bee_spawn_egg',
'resourcefulbees:kitten_bee_spawn_egg',
'resourcefulbees:kobee_beef_bee_spawn_egg',
'resourcefulbees:lapis_bee_spawn_egg',
'resourcefulbees:lead_bee_spawn_egg',
'resourcefulbees:netherite_bee_spawn_egg',
'resourcefulbees:nickel_bee_spawn_egg',
'resourcefulbees:obsidian_bee_spawn_egg',
'resourcefulbees:oreo_bee_spawn_egg',
'resourcefulbees:osmium_bee_spawn_egg',
'resourcefulbees:papa_beemeritus_bee_spawn_egg',
'resourcefulbees:platinum_bee_spawn_egg',
'resourcefulbees:redstone_bee_spawn_egg',
'resourcefulbees:silver_bee_spawn_egg',
'resourcefulbees:soul_lava_bee_spawn_egg',
'resourcefulbees:starry_bee_spawn_egg',
'resourcefulbees:stoned_bee_spawn_egg',
'resourcefulbees:tin_bee_spawn_egg',
'resourcefulbees:unobtainium_bee_spawn_egg',
'resourcefulbees:uraninite_bee_spawn_egg',
'resourcefulbees:uranium_bee_spawn_egg',
'resourcefulbees:vibranium_bee_spawn_egg',
'resourcefulbees:wither_bee_spawn_egg',
'resourcefulbees:withered_bee_spawn_egg',
'resourcefulbees:yeti_bee_spawn_egg',
'resourcefulbees:zinc_bee_spawn_egg'
])


colors.forEach(color => {
refined.forEach(refin => e.hide([`refinedstorage:${color}_${refin}`]))
e.hide([
Expand All @@ -149,11 +208,9 @@ onEvent('jei.hide.items', e => {
hideMetal('immersiveengineering', 'steel', ['ingot', 'dust', 'nugget', 'storage', 'slab_storage'])
hideMetal('immersiveengineering', 'electrum', ['ingot', 'dust', 'nugget', 'storage', 'slab_storage'])
hideMetal('immersiveengineering', 'constantan', ['ingot', 'dust', 'nugget', 'storage', 'slab_storage'])
hideMetal('mekanism', 'copper', ['ingot', 'dust', 'nugget', 'block'])
hideMetal('mekanism', 'tin', ['ingot', 'dust', 'nugget', 'block'])
hideMetal('mekanism', 'uranium', ['ingot', 'dust', 'nugget', 'block'])
hideMetal('mekanism', 'lead', ['ingot', 'dust', 'nugget', 'block'])
hideMetal('mekanism', 'osmium', ['ingot', 'dust', 'nugget', 'block'])
mekanismMetals.forEach(metal => {
hideMetal('mekanism', metal, ['ingot', 'dust', 'nugget', 'block', 'clean', 'dirty']);
})
hideMetal('mekanism', 'bronze', ['ingot', 'dust', 'nugget', 'block'])
hideMetal('create', 'copper', ['ingot', 'ore', 'nugget', 'block'])
hideMetal('create', 'zinc', ['ingot', 'ore', 'nugget', 'block'])
Expand All @@ -176,10 +233,9 @@ onEvent('jei.hide.items', e => {
hideStuff('create', 'sheet', ['iron', 'golden', 'copper'])
hideStuff('iceandfire', 'ore', ['silver', 'copper'])
hideStuff('tmechworks', 'ore', ['aluminum', 'copper'])
hideStuff('solarflux', 'sp', [6, 7, 8])
hideStuff('quark', 'crate', ['apple', 'carrot', 'beetroot', 'potato'])
hideStuff('quark', 'block', ['bamboo', 'charcoal', 'sugar_cane'])
hideStuff('mysticalagriculture', 'seeds', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon', 'lumium', 'enderium'])
hideStuff('mysticalagriculture', 'essence', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon', 'lumium', 'enderium'])
hideStuff('mysticalagriculture', 'seeds', maDisabledSeeds)
hideStuff('mysticalagriculture', 'essence', maDisabledSeeds)
//#endregion
})
70 changes: 0 additions & 70 deletions kubejs/data/allthetweaks/recipes/factory/ender_dragon.json

This file was deleted.

20 changes: 20 additions & 0 deletions kubejs/data/apotheosis/recipes/book.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shapeless",
"conditions": [{
"type": "forge:mod_loaded",
"modid": "patchouli"
}],
"group": "something",
"ingredients": [{
"item": "minecraft:book"
},
{
"tag": "forge:ingots/gold"
}
],
"result": {
"item": "patchouli:guide_book",
"nbt": "{\"patchouli:book\": \"apotheosis:apoth_chronicle\"}",
"count": 1
}
}
Loading

0 comments on commit 8e63854

Please sign in to comment.