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

433 tweaks #1550

Merged
merged 15 commits into from
Oct 10, 2022
1 change: 1 addition & 0 deletions config/apotheosis/spawner.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ spawn_eggs {
productivebees:yellow_black_carpenter_bee
artifacts:mimic
twilightforest:swarm_spider
twilightforest:hedge_spider
>
}

Expand Down
72 changes: 0 additions & 72 deletions config/ftbquests/quests/chapters/industrial_foregoing.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,6 @@
Count: 1b
tag: {
mekData: {
owner: [I;
-1699457496
663964002
-2000923315
-13829450
]
FluidTanks: [{
Tank: 0b
stored: {
Expand All @@ -187,27 +181,6 @@
ForgeCaps: { }
Items: [ ]
id: "mekanism:basic_fluid_tank"
Security: {
owner: [I;
-1699457496
663964002
-2000923315
-13829450
]
name: "Security"
securityMode: 0
override: 0b
publicFreq: 1b
}
componentSecurity: {
owner: [I;
-1699457496
663964002
-2000923315
-13829450
]
securityMode: 0
}
redstone: 0b
}
display: {
Expand Down Expand Up @@ -331,12 +304,6 @@
Count: 1b
tag: {
mekData: {
owner: [I;
-1699457496
663964002
-2000923315
-13829450
]
FluidTanks: [{
Tank: 0b
stored: {
Expand All @@ -358,12 +325,6 @@
Count: 1b
tag: {
mekData: {
owner: [I;
-1699457496
663964002
-2000923315
-13829450
]
FluidTanks: [{
Tank: 0b
stored: {
Expand Down Expand Up @@ -881,12 +842,6 @@
Count: 1b
tag: {
mekData: {
owner: [I;
-1699457496
663964002
-2000923315
-13829450
]
FluidTanks: [{
Tank: 0b
stored: {
Expand All @@ -912,33 +867,6 @@
ForgeCaps: { }
Items: [ ]
id: "mekanism:basic_fluid_tank"
Security: {
owner: [I;
-1699457496
663964002
-2000923315
-13829450
]
trusted: [[I;
-1699457496
663964002
-2000923315
-13829450
]]
name: "Security"
securityMode: 1
override: 0b
publicFreq: 1b
}
componentSecurity: {
owner: [I;
-1699457496
663964002
-2000923315
-13829450
]
securityMode: 0
}
redstone: 0b
}
display: {
Expand Down
49 changes: 37 additions & 12 deletions config/ftbquests/quests/chapters/productive_bees.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@
}
{
x: -5.0d
y: 0.5d
y: 0.2d
shape: "hexagon"
subtitle: "Increases Bee Productivity by 140%"
dependencies: ["66324D7D0C51AEAC"]
Expand All @@ -962,7 +962,7 @@
}
{
x: -2.5d
y: -0.5d
y: -0.6d
subtitle: "Sonic Bees"
description: [
"Can be placed in a hive or centrifuge."
Expand Down Expand Up @@ -994,8 +994,8 @@
]
}
{
x: -3.5d
y: 2.0d
x: -3.0d
y: 1.9d
shape: "hexagon"
subtitle: "Making Babies"
description: [
Expand Down Expand Up @@ -1027,7 +1027,7 @@
}
{
x: -4.5d
y: -0.5d
y: -0.6d
shape: "hexagon"
subtitle: "Lumber and Quarry Bees will give Blocks instead of Chips"
dependencies: ["66324D7D0C51AEAC"]
Expand Down Expand Up @@ -1077,8 +1077,8 @@
]
}
{
x: -2.5d
y: 1.5d
x: -2.2d
y: 1.3d
shape: "hexagon"
subtitle: "Increases the Range of a Machine"
description: ["Mostly for the Catcher."]
Expand All @@ -1103,8 +1103,8 @@
]
}
{
x: -4.5d
y: 1.5d
x: -4.8d
y: 1.2d
shape: "hexagon"
subtitle: "Used to add Bees to a Filter"
dependencies: ["66324D7D0C51AEAC"]
Expand All @@ -1129,7 +1129,7 @@
}
{
x: -2.0d
y: 0.5d
y: 0.2d
subtitle: "Extracts Genes from Bees in Hives"
dependencies: ["66324D7D0C51AEAC"]
id: "1DF026030780AE96"
Expand Down Expand Up @@ -3219,7 +3219,7 @@
Count: 1b
tag: {
EntityTag: {
type: "productivebees:pepto_bismol"
type: "productivebees:sugarbag_honeycomb"
}
}
}
Expand All @@ -3229,7 +3229,7 @@
tag: {
value: {
EntityTag: {
type: "productivebees:pepto_bismol"
type: "productivebees:sugarbag_honeycomb"
}
}
}
Expand Down Expand Up @@ -4880,5 +4880,30 @@
xp: 100
}]
}
{
x: -4.0d
y: 1.9d
subtitle: "Self Contained"
description: ["When installed, this upgrade makes your bees permanently stay in the beehive. Because of this, you'll need to place the required flower block directly in front of the hive."]
dependencies: ["66324D7D0C51AEAC"]
id: "61AE0ECD03F2AB88"
tasks: [{
id: "524FB14DE5E8DB8E"
type: "item"
item: "productivebees:upgrade_simulator"
}]
rewards: [
{
id: "21BDE3CBAF62A2C2"
type: "item"
item: "productivebees:honey_treat"
}
{
id: "65E721E100F6AF24"
type: "xp"
xp: 100
}
]
}
]
}
2 changes: 1 addition & 1 deletion config/reliquary-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ mobDropsEnabled = true
#Whether entities get angry at player if stealing fails
angerOnStealFailure = true
#Allows switching stealing from player on and off
stealFromPlayers = true
stealFromPlayers = false

#Seeker Shot settings
[items.seekerShot]
Expand Down
2 changes: 2 additions & 0 deletions config/supplementaries-registry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,5 @@
#WIP
present = true

[items]
shulker_shell = false
3 changes: 3 additions & 0 deletions kubejs/client_scripts/jei_removals.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ onEvent('jei.hide.items', e => {
'thermal:raw_lead',
'thermal:raw_silver',
'thermal:raw_nickel',
'ftbic:diamond_dust',
'thermal:diamond_dust',
'createaddition:diamond_grit'
])

ftbicMetals.forEach(metal => {
Expand Down
23 changes: 23 additions & 0 deletions kubejs/data/hostilenetworks/data_models/thermal_basalz.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"type": "thermal:basalz",
"name": "entity.thermal.basalz",
"name_color": "0xE8E8E8",
"gui_scale": 1,
"gui_x_offset": 0,
"gui_y_offset": 0,
"gui_z_offset": 0,
"sim_cost": 128,
"input": {
"item": "hostilenetworks:empty_prediction"
},
"base_drop": {
"item": "hostilenetworks:nether_prediction"
},
"trivia": "",
"fabricator_drops": [
{
"item": "thermal:basalz_rod",
"count": 4
}
]
}
23 changes: 23 additions & 0 deletions kubejs/data/hostilenetworks/data_models/thermal_blitz.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"type": "thermal:blitz",
"name": "entity.thermal.blitz",
"name_color": "0xE8E8E8",
"gui_scale": 1,
"gui_x_offset": 0,
"gui_y_offset": 0,
"gui_z_offset": 0,
"sim_cost": 128,
"input": {
"item": "hostilenetworks:empty_prediction"
},
"base_drop": {
"item": "hostilenetworks:nether_prediction"
},
"trivia": "",
"fabricator_drops": [
{
"item": "thermal:blitz_rod",
"count": 4
}
]
}
23 changes: 23 additions & 0 deletions kubejs/data/hostilenetworks/data_models/thermal_blizz.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"type": "thermal:blizz",
"name": "entity.thermal.blizz",
"name_color": "0xE8E8E8",
"gui_scale": 1,
"gui_x_offset": 0,
"gui_y_offset": 0,
"gui_z_offset": 0,
"sim_cost": 128,
"input": {
"item": "hostilenetworks:empty_prediction"
},
"base_drop": {
"item": "hostilenetworks:nether_prediction"
},
"trivia": "",
"fabricator_drops": [
{
"item": "thermal:blizz_rod",
"count": 4
}
]
}
10 changes: 5 additions & 5 deletions kubejs/server_scripts/mod_specific/_allthemods/atm_star.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ onEvent('recipes', e => {
B: 'minecraft:dragon_breath',
S: 'botania:dragonstone',
E: 'forbidden_arcanus:golden_dragon_scale',
I: Item.of('blue_skies:nature_arc', '{ArcLevel:2}')
I: [Item.of('blue_skies:nature_arc', '{ArcLevel:2}'),Item.of('blue_skies:nature_arc', '{ArcLevel:1}')]
}).id('kubejs:allthetweaks/dragon_soul')
//#endregion

//#region Dimensional Seed
maInfusion(e, 'allthetweaks:dimensional_seed',
'allthecompressed:emerald_block_6x',
'allthecompressed:blackstone_block_7x',
'allthecompressed:emerald_block_5x',
'allthecompressed:blackstone_block_6x',
'allthecompressed:end_stone_block_5x',
'allthecompressed:netherrack_block_7x',
'allthecompressed:netherrack_block_6x',
'allthecompressed:clay_block_5x',
'allthecompressed:soul_sand_block_4x',
'allthecompressed:red_sand_block_4x',
'allthecompressed:red_sand_block_4x',
'allthecompressed:obsidian_block_6x')
'allthecompressed:obsidian_block_5x')
//#endregion

//#region Withers Compass
Expand Down
15 changes: 14 additions & 1 deletion kubejs/server_scripts/mod_specific/mekanism/cobalt.js
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,17 @@ onEvent('recipes', event => {
"item": "kubejs:cobalt_dust"
}
}).id('kubejs:processing/cobalt/dust/from_dirty_dust')
})

event.custom({
"type": "mekanism:enriching",
"input": {
"ingredient": {
"tag": "forge:storage_blocks/raw_cobalt"
}
},
"output": {
"item": "kubejs:cobalt_dust",
"count": 12
}
}).id('kubejs:processing/cobalt/dust/from_raw_block')
})
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
})
removeRecipeByID(e, [
'extradisks:part/1024k_storage_part',
'refinedstorage:part/4096k_fluid_storage_part',
'refinedstorage:4096k_fluid_storage_part',
'extradisks:part/4096k_storage_part',
'extradisks:part/16384k_fluid_storage_part',
'extradisks:part/16384k_storage_part',
Expand Down
Loading