diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml index 42e5d003..2517dcc3 100644 --- a/config/allthetweaks-common.toml +++ b/config/allthetweaks-common.toml @@ -21,5 +21,5 @@ [packversionminrev] #Pack Minor Version Revision : X #Range: 0 ~ 32768 - minorrev = 10 + minorrev = 11 diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml index 8fe93609..c929177c 100644 --- a/config/chiselsandbits-client.toml +++ b/config/chiselsandbits-client.toml @@ -1,7 +1,7 @@ [client] - #Configuration entries related to the settings of gameplay aspects. + #mod.chiselsandbits.config.client.settings.comment [client.settings] #When enabled allows cycling through the tool modes of the chisel using (sneak) right clicks. enable-right-click-mode-change = false @@ -77,16 +77,7 @@ [client.client.performance.models] [client.client.performance.models.cache] - #The size of the model cache. + #mod.chiselsandbits.config.client.performance.models.cache.size.comment #Range: 0 ~ 2000 size = 1000 - [client.client.client] - - #client.gui - [client.client.client.gui] - - [client.client.client.gui.radial-menu] - #radial-menu.mouse-indicator - mouse-indicator = false - diff --git a/config/chiselsandbits-common.toml b/config/chiselsandbits-common.toml index da74c11d..ce4fa384 100644 --- a/config/chiselsandbits-common.toml +++ b/config/chiselsandbits-common.toml @@ -1,18 +1,18 @@ [common] - #Configuration entries related to the help system. + #mod.chiselsandbits.config.common.help.comment [common.help] [common.help.common] [common.help.common.help] - #Common configuration entries related to the help system and which features are enabled or not during displayment. + #mod.chiselsandbits.config.common.help.common.help.enabled.comment enabled = true [common.common] - #Configuration entries related to performance. + #mod.chiselsandbits.config.common.performance.comment [common.common.performance] [common.common.performance.common] @@ -22,7 +22,7 @@ [common.common.performance.common.performance.collisions] [common.common.performance.common.performance.collisions.cache] - #common.performance.collisions.cache.size + #mod.chiselsandbits.config.common.performance.common.performance.collisions.cache.size.comment #Range: -9223372036854775808 ~ 9223372036854775807 size = 10000 diff --git a/defaultconfigs/travel_anchors-server.toml b/defaultconfigs/travel_anchors-server.toml new file mode 100644 index 00000000..8c983b95 --- /dev/null +++ b/defaultconfigs/travel_anchors-server.toml @@ -0,0 +1,11 @@ + +[travel-anchor-settings] + #The maximum angle you can look at the Travel Anchor to teleport. + #Be sure to write a .0 after a whole number because forges config system can not handle whole numbers without it. + #Range: 1.0 ~ 1.7976931348623157E308 + maxAngle = 30.0 + #The maximum distance you are allowed to teleport. + #Be sure to write a .0 after a whole number because forges config system can not handle whole numbers without it. + #Range: 1.0 ~ 1.7976931348623157E308 + maxDistance = 64.0 + diff --git a/kubejs/client_scripts/jei_removals.js b/kubejs/client_scripts/jei_removals.js index d9da0457..8eaa8bd0 100644 --- a/kubejs/client_scripts/jei_removals.js +++ b/kubejs/client_scripts/jei_removals.js @@ -3,7 +3,6 @@ onEvent(`jei.hide.items`, e => { const 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`] const colors = [`white`, `light_gray`, `gray`, `black`, `red`, `orange`, `yellow`, `lime`, `green`, `light_blue`, `cyan`, `blue`, `purple`, `magenta`, `pink`, `brown`] const typeFirst = ['mekanism', 'immersiveengineering'] - const enviroStonesCore = ['litherite', 'erodium', 'kyronite', 'pladium', 'ionite', 'aethium', 'nanorite', 'xerothium'] const enviroStonesMats = ['basalt', 'hardened_stone', 'granodiorite', 'marble', 'pumice', 'travertine'] //#endregion //#region functions @@ -20,7 +19,7 @@ onEvent(`jei.hide.items`, e => { }) } //#endregion - + e.hide([ /chisel:.*\/.*/, '@chipped', @@ -119,9 +118,6 @@ onEvent(`jei.hide.items`, e => { 'thermal:machine_catalyst_creative_augment' ]) - enviroStonesCore.forEach(stone => { - e.hide(`/envirocore:${stone}_.*/`) - }) enviroStonesMats.forEach(stone => { e.hide(`/enviromats:${stone}_.*/`) }) diff --git a/kubejs/data/forbidden_arcanus/loot_modifiers/spawner_additions.json b/kubejs/data/forbidden_arcanus/loot_modifiers/spawner_additions.json new file mode 100644 index 00000000..7c760580 --- /dev/null +++ b/kubejs/data/forbidden_arcanus/loot_modifiers/spawner_additions.json @@ -0,0 +1,10 @@ +{ + "add_loot": "forbidden_arcanus:blocks/additions/spawner_additions", + "conditions": [ + { + "condition": "forge:loot_table_id", + "loot_table_id": "minecraft:blocks/spawner" + } + ], + "type": "valhelsia_core:append_loot" +} \ No newline at end of file diff --git a/kubejs/server_scripts/recipe_additions.js b/kubejs/server_scripts/recipe_additions.js index ab47fa4f..8b9a5ee0 100644 --- a/kubejs/server_scripts/recipe_additions.js +++ b/kubejs/server_scripts/recipe_additions.js @@ -2,7 +2,7 @@ onEvent('recipes', e => { //#region CONST const quarkWoodTypes = ['oak', 'dark_oak', 'acacia', 'spruce', 'birch', 'jungle', 'warped', 'crimson'] const solars = ['1', '2', '3', '4', '5', 'custom_allthemodium', 'custom_vibranium', 'custom_unobtainium'] - const caTypes = [`importer`, `exporter`, `constructor`, `destructor`] + const caTypes = [`importer`, `exporter`, `constructor`, `destructor`, `disk_manipulator`] const tiersPowah = ['starter', 'basic', 'hardened', 'blazing', 'niotic', 'spirited', 'nitro'] const typesPowah = ['energy_cell', 'reactor', 'furnator', 'magmator', 'thermo_generator', 'solar_panel', 'player_transmitter', 'energy_hopper', 'energy_discharger', 'energizing_rod'] const resetNBT = ['rftoolsbase:filter_module', 'rftoolspower:dimensionalcell_simple', 'rftoolspower:dimensionalcell', 'rftoolspower:dimensionalcell_advanced', 'rftoolspower:powercell_card', 'rftoolsutility:syringe'] diff --git a/kubejs/startup_scripts/modification.js b/kubejs/startup_scripts/modification.js index eca49f0a..ce7da738 100644 --- a/kubejs/startup_scripts/modification.js +++ b/kubejs/startup_scripts/modification.js @@ -14,7 +14,32 @@ onEvent('item.modification', e => { 'minecraft:snowball', 'minecraft:armor_stand', 'minecraft:bucket', - '#minecraft:signs', + 'minecraft:oak_sign', + 'minecraft:spruce_sign', + 'minecraft:oak_sign', + 'minecraft:spruce_sign', + 'minecraft:birch_sign', + 'minecraft:acacia_sign', + 'minecraft:jungle_sign', + 'minecraft:dark_oak_sign', + 'minecraft:crimson_sign', + 'minecraft:warped_sign', + 'forbidden_arcanus:cherrywood_sign', + 'forbidden_arcanus:edelwood_sign', + 'forbidden_arcanus:mysterywood_sign', + 'twilightforest:twilight_oak_sign', + 'twilightforest:canopy_sign', + 'twilightforest:mangrove_sign', + 'twilightforest:darkwood_sign', + 'twilightforest:time_sign', + 'twilightforest:trans_sign', + 'twilightforest:mine_sign', + 'twilightforest:sort_sign', + 'upgrade_aquatic:driftwood_sign', + 'upgrade_aquatic:river_sign', + 'tconstruct:greenheart_sign', + 'tconstruct:skyroot_sign', + 'tconstruct:bloodshroom_sign', 'powah:charged_snowball', 'resourcefulbees:bee_jar', 'resourcefulbees:rainbow_honey_bottle',