diff --git a/kubejs/client_scripts/mods/gtceu.js b/kubejs/client_scripts/mods/gtceu.js index 4f099ff1b..72acf827d 100644 --- a/kubejs/client_scripts/mods/gtceu.js +++ b/kubejs/client_scripts/mods/gtceu.js @@ -47,9 +47,9 @@ const groupGTCEUStuff = (event) => { event.groupItemsByTag('tfg:rei_groups/gems/flawed', 'Flawed Gems', 'forge:flawed_gems') event.groupItemsByTag('tfg:rei_groups/gems/chipped', 'Chipped Gems', 'forge:chipped_gems') - event.groupItemsByTag('tfg:rei_groups/material_blocks/raw', 'Raw Material Blocks', 'forge:material_blocks/raw') - event.groupItemsByTag('tfg:rei_groups/material_blocks/block', 'Material Blocks', 'forge:material_blocks/block') - event.groupItemsByTag('tfg:rei_groups/material_blocks/frame', 'Frames', 'forge:material_blocks/frame') + event.groupItemsByTag('tfg:rei_groups/blocks/raw', 'Raw Material Blocks', 'forge:raw_blocks') + event.groupItemsByTag('tfg:rei_groups/blocks/material_blocks', 'Material Blocks', 'forge:material_blocks') + event.groupItemsByTag('tfg:rei_groups/blocks/frame', 'Frames', 'forge:frame_blocks') event.groupItemsByTag('tfg:rei_groups/sword_heads', 'Sword Heads', 'forge:sword_heads') event.groupItemsByTag('tfg:rei_groups/butchery_knife_heads', 'Butchery Knife Heads', 'forge:butchery_knife_heads') diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 937acb57c..a60ba3a14 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -137,7 +137,7 @@ const registerAE2Recipes = (event) => { .id('tfg:crafting/equal_distribution_card') // Energy Card - event.shapeless('ae2:energy_card', ['ae2:advanced_card','2x ae2:dense_energy_cell']) + event.shapeless('ae2:energy_card', ['ae2:advanced_card','2x gtceu:hv_lithium_battery']) .id('tfg:crafting/energy_card') // Quartz Fixture @@ -186,7 +186,7 @@ const registerAE2Recipes = (event) => { B: 'ae2:crafting_terminal', C: 'ae2:engineering_processor', D: '#forge:circuits/hv', - E: 'ae2:dense_energy_cell', + E: 'gtceu:hv_lithium_battery', F: '#forge:plates/nether_quartz' }).id('tfg:crafting/wireless_terminal') @@ -508,7 +508,7 @@ const registerAE2Recipes = (event) => { A: '#forge:plates/steel', B: 'ae2:formation_core', C: 'ae2:cell_component_4k', - D: 'ae2:dense_energy_cell' + D: 'gtceu:hv_lithium_battery' }).id('tfg:crafting/matter_cannon') // Color Applicator @@ -520,7 +520,7 @@ const registerAE2Recipes = (event) => { A: '#forge:wires/single/aluminium', B: 'ae2:formation_core', C: 'ae2:cell_component_4k', - D: 'ae2:dense_energy_cell', + D: 'gtceu:hv_lithium_battery', E: '#forge:rods/steel', }).id('tfg:crafting/color_applicator') @@ -785,7 +785,7 @@ const registerAE2Recipes = (event) => { // Wireless Crafting Terminal event.recipes.gtceu.assembler('ae2:wireless_crafting_terminal') .itemInputs( - '2x ae2:dense_energy_cell', + '2x gtceu:hv_lithium_battery', '2x gtceu:luv_sensor', 'gtceu:luv_emitter', '2x #forge:rods/osmiridium', @@ -1119,34 +1119,6 @@ const registerAE2Recipes = (event) => { .duration(200) .EUt(480) .cleanroom(CleanroomType.CLEANROOM) - - // Energy Cell - event.recipes.gtceu.assembler('ae2:energy_cell') - .itemInputs( - '#forge:plates/certus_quartz', - '#forge:batteries/hv', - '2x #forge:circuits/hv', - '#ae2:covered_cable') - .inputFluids(Fluid.of('gtceu:polyethylene', 144)) - .itemOutputs('ae2:energy_cell') - .circuit(1) - .duration(200) - .EUt(500) - - // Dense Energy Cell - event.recipes.gtceu.assembler('ae2:dense_energy_cell') - .itemInputs( - '8x ae2:energy_cell', - 'gtceu:ev_battery_buffer_16x', - '3x ae2:formation_core', - '#forge:circuits/ev', - '#ae2:covered_dense_cable') - .inputFluids(Fluid.of('gtceu:polyethylene', 144)) - .itemOutputs('ae2:dense_energy_cell') - .circuit(1) - .duration(20) - .EUt(7680) - .cleanroom(CleanroomType.CLEANROOM) //#region ME Interfaces @@ -1273,7 +1245,7 @@ const registerAE2Recipes = (event) => { .itemInputs( 'ae2:chest', 'ae2:cell_component_1k', - 'ae2:energy_cell', + 'gtceu:mv_sodium_battery', 'ae2:item_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_item_cell_1k') @@ -1285,7 +1257,7 @@ const registerAE2Recipes = (event) => { .itemInputs( 'ae2:chest', 'ae2:cell_component_4k', - 'ae2:energy_cell', + 'gtceu:mv_sodium_battery', 'ae2:item_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_item_cell_4k') @@ -1298,7 +1270,7 @@ const registerAE2Recipes = (event) => { .itemInputs( 'ae2:chest', 'ae2:cell_component_16k', - 'ae2:energy_cell', + 'gtceu:mv_sodium_battery', 'ae2:item_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_item_cell_16k') @@ -1311,7 +1283,7 @@ const registerAE2Recipes = (event) => { .itemInputs( 'ae2:chest', 'ae2:cell_component_64k', - 'ae2:energy_cell', + 'gtceu:mv_sodium_battery', 'ae2:item_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_item_cell_64k') @@ -1324,7 +1296,7 @@ const registerAE2Recipes = (event) => { .itemInputs( 'ae2:chest', 'ae2:cell_component_256k', - 'ae2:energy_cell', + 'gtceu:mv_sodium_battery', 'ae2:item_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_item_cell_256k') @@ -1341,7 +1313,7 @@ const registerAE2Recipes = (event) => { .itemInputs( 'ae2:chest', 'ae2:cell_component_1k', - 'ae2:energy_cell', + 'gtceu:mv_sodium_battery', 'ae2:fluid_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_fluid_cell_1k') @@ -1353,7 +1325,7 @@ const registerAE2Recipes = (event) => { .itemInputs( 'ae2:chest', 'ae2:cell_component_4k', - 'ae2:energy_cell', + 'gtceu:mv_sodium_battery', 'ae2:fluid_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_fluid_cell_4k') @@ -1366,7 +1338,7 @@ const registerAE2Recipes = (event) => { .itemInputs( 'ae2:chest', 'ae2:cell_component_16k', - 'ae2:energy_cell', + 'gtceu:mv_sodium_battery', 'ae2:fluid_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_fluid_cell_16k') @@ -1379,7 +1351,7 @@ const registerAE2Recipes = (event) => { .itemInputs( 'ae2:chest', 'ae2:cell_component_64k', - 'ae2:energy_cell', + 'gtceu:mv_sodium_battery', 'ae2:fluid_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_fluid_cell_64k') @@ -1392,7 +1364,7 @@ const registerAE2Recipes = (event) => { .itemInputs( 'ae2:chest', 'ae2:cell_component_256k', - 'ae2:energy_cell', + 'gtceu:mv_sodium_battery', 'ae2:fluid_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_fluid_cell_256k') @@ -1531,20 +1503,20 @@ const registerAE2Recipes = (event) => { // GT Chemical Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_GLASS_CABLE[i] + '_gtceu_dye') + event.recipes.gtceu.chemical_bath(global.AE2_GLASS_CABLES[i] + '_gtceu_dye') .itemInputs('ae2:fluix_glass_cable') .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) - .itemOutputs(global.AE2_GLASS_CABLE[i]) + .itemOutputs(global.AE2_GLASS_CABLES[i]) .duration(20) .EUt(7) }; // TFC Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_GLASS_CABLE[i] + '_tfc_dye') + event.recipes.gtceu.chemical_bath(global.AE2_GLASS_CABLES[i] + '_tfc_dye') .itemInputs('ae2:fluix_glass_cable') .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 250)) - .itemOutputs(global.AE2_GLASS_CABLE[i]) + .itemOutputs(global.AE2_GLASS_CABLES[i]) .duration(20) .EUt(7) }; @@ -1559,20 +1531,20 @@ const registerAE2Recipes = (event) => { // GT Chemical Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_COVERED_CABLE[i] + '_gtceu_dye') + event.recipes.gtceu.chemical_bath(global.AE2_COVERED_CABLES[i] + '_gtceu_dye') .itemInputs('ae2:fluix_covered_cable') .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) - .itemOutputs(global.AE2_COVERED_CABLE[i]) + .itemOutputs(global.AE2_COVERED_CABLES[i]) .duration(20) .EUt(7) }; // TFC Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_COVERED_CABLE[i] + '_tfc_dye') + event.recipes.gtceu.chemical_bath(global.AE2_COVERED_CABLES[i] + '_tfc_dye') .itemInputs('ae2:fluix_covered_cable') .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 250)) - .itemOutputs(global.AE2_COVERED_CABLE[i]) + .itemOutputs(global.AE2_COVERED_CABLES[i]) .duration(20) .EUt(7) }; @@ -1587,20 +1559,20 @@ const registerAE2Recipes = (event) => { // GT Chemical Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_COVERED_DENSE_CABLE[i] + '_gtceu_dye') + event.recipes.gtceu.chemical_bath(global.AE2_COVERED_DENSE_CABLES[i] + '_gtceu_dye') .itemInputs('ae2:fluix_covered_dense_cable') .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) - .itemOutputs(global.AE2_COVERED_DENSE_CABLE[i]) + .itemOutputs(global.AE2_COVERED_DENSE_CABLES[i]) .duration(20) .EUt(7) }; // TFC Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_COVERED_DENSE_CABLE[i] + '_tfc_dye') + event.recipes.gtceu.chemical_bath(global.AE2_COVERED_DENSE_CABLES[i] + '_tfc_dye') .itemInputs('ae2:fluix_covered_dense_cable') .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 250)) - .itemOutputs(global.AE2_COVERED_DENSE_CABLE[i]) + .itemOutputs(global.AE2_COVERED_DENSE_CABLES[i]) .duration(20) .EUt(7) }; @@ -1615,20 +1587,20 @@ const registerAE2Recipes = (event) => { // GT Chemical Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_SMART_CABLE[i] + '_gtceu_dye') + event.recipes.gtceu.chemical_bath(global.AE2_SMART_CABLES[i] + '_gtceu_dye') .itemInputs('ae2:fluix_smart_cable') .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) - .itemOutputs(global.AE2_SMART_CABLE[i]) + .itemOutputs(global.AE2_SMART_CABLES[i]) .duration(20) .EUt(7) }; // TFC Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_SMART_CABLE[i] + '_tfc_dye') + event.recipes.gtceu.chemical_bath(global.AE2_SMART_CABLES[i] + '_tfc_dye') .itemInputs('ae2:fluix_smart_cable') .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 250)) - .itemOutputs(global.AE2_SMART_CABLE[i]) + .itemOutputs(global.AE2_SMART_CABLES[i]) .duration(20) .EUt(7) }; @@ -1643,20 +1615,20 @@ const registerAE2Recipes = (event) => { // GT Chemical Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_SMART_DENSE_CABLE[i] + '_gtceu_dye') + event.recipes.gtceu.chemical_bath(global.AE2_SMART_DENSE_CABLES[i] + '_gtceu_dye') .itemInputs('ae2:fluix_smart_dense_cable') .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) - .itemOutputs(global.AE2_SMART_DENSE_CABLE[i]) + .itemOutputs(global.AE2_SMART_DENSE_CABLES[i]) .duration(20) .EUt(7) }; // TFC Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_SMART_DENSE_CABLE[i] + '_tfc_dye') + event.recipes.gtceu.chemical_bath(global.AE2_SMART_DENSE_CABLES[i] + '_tfc_dye') .itemInputs('ae2:fluix_smart_dense_cable') .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 250)) - .itemOutputs(global.AE2_SMART_DENSE_CABLE[i]) + .itemOutputs(global.AE2_SMART_DENSE_CABLES[i]) .duration(20) .EUt(7) }; @@ -1665,30 +1637,30 @@ const registerAE2Recipes = (event) => { // GT Chemical Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_PAINTBALL[i] + '_gtceu_dye') + event.recipes.gtceu.chemical_bath(global.AE2_PAINTBALLS[i] + '_gtceu_dye') .itemInputs('ae2:matter_ball') .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 36)) - .itemOutputs(global.AE2_PAINTBALL[i]) + .itemOutputs(global.AE2_PAINTBALLS[i]) .duration(20) .EUt(7) }; // TFC Dyes for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_PAINTBALL[i] + '_tfc_dye') + event.recipes.gtceu.chemical_bath(global.AE2_PAINTBALLS[i] + '_tfc_dye') .itemInputs('ae2:matter_ball') .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 125)) - .itemOutputs(global.AE2_PAINTBALL[i]) + .itemOutputs(global.AE2_PAINTBALLS[i]) .duration(20) .EUt(7) }; // Lumen Paint Ball for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_LUMEN_PAINTBALL[i] + '_gtceu_dye') - .itemInputs(global.AE2_PAINTBALL[i]) + event.recipes.gtceu.chemical_bath(global.AE2_LUMEN_PAINTBALLS[i] + '_gtceu_dye') + .itemInputs(global.AE2_PAINTBALLS[i]) .inputFluids(Fluid.of('gtceu:glowstone', 125)) - .itemOutputs(global.AE2_LUMEN_PAINTBALL[i]) + .itemOutputs(global.AE2_LUMEN_PAINTBALLS[i]) .duration(20) .EUt(7) }; @@ -1791,16 +1763,6 @@ const registerAE2Recipes = (event) => { .duration(400) .EUt(160) - - //fluix block - //event.recipes.gtceu.compressor('ae2:fluix_block') - // .itemInputs( - // '9x #forge:gems/fluix') - // .itemOutputs( - // 'ae2:fluix_block') - // .duration(300) - // .EUt(2) - //#region Cell Packing event.recipes.gtceu.packer('ae2:view_cell') @@ -2088,15 +2050,6 @@ const registerAE2Recipes = (event) => { .duration(10) .EUt(12) .cleanroom(CleanroomType.CLEANROOM) - - - //event.recipes.gtceu.macerator('ae2:fluix_dust') - // .itemInputs( - // '#forge:gems/fluix') - // .itemOutputs( - // 'ae2:fluix_dust') - // .duration(56) - // .EUt(2) // Cable Anchor event.recipes.gtceu.extruder('ae2:cable_anchor') @@ -2109,12 +2062,11 @@ const registerAE2Recipes = (event) => { // Quantum Ring event.recipes.gtceu.assembly_line('ae2:quantum_ring') .itemInputs( - '4x #forge:batteries/hv', + '6x #forge:batteries/hv', '12x #forge:circuits/iv', '16x gtceu:iv_emitter', '8x ae2:engineering_processor', '14x gtceu:iv_sensor', - '2x ae2:dense_energy_cell', 'ae2:logic_processor',) .inputFluids(Fluid.of('gtceu:titanium', 1440)) .itemOutputs('ae2:quantum_ring') @@ -2129,7 +2081,7 @@ const registerAE2Recipes = (event) => { '6x ae2:quartz_vibrant_glass', '8x ae2:engineering_processor', '14x gtceu:iv_sensor', - '2x ae2:dense_energy_cell') + '2x gtceu:hv_lithium_battery') .inputFluids(Fluid.of('gtceu:titanium', 1088)) .itemOutputs('ae2:quantum_link') .duration(700) diff --git a/kubejs/startup_scripts/ae2/constants.js b/kubejs/startup_scripts/ae2/constants.js index cb9117310..20c09d2a7 100644 --- a/kubejs/startup_scripts/ae2/constants.js +++ b/kubejs/startup_scripts/ae2/constants.js @@ -1,7 +1,7 @@ // priority: 199 global.AE2_DISABLED_ITEMS = [ - //инструменты + // Инструменты 'ae2:certus_quartz_sword', 'ae2:nether_quartz_sword', 'ae2:fluix_sword', @@ -24,14 +24,40 @@ global.AE2_DISABLED_ITEMS = [ 'ae2:charged_staff', '#ae2:knife', 'ae2:name_press', - //budding - '#forge:buds', - 'ae2:flawless_budding_quartz', - 'ae2:flawed_budding_quartz', - 'ae2:chipped_budding_quartz', - 'ae2:damaged_budding_quartz', - 'ae2:quartz_cluster', - //sky stone + + // Блоки + 'ae2:vibration_chamber', + 'ae2:crank', + 'ae2:charger', + 'ae2:spatial_anchor', + 'ae2:inscriber', + 'ae2:growth_accelerator', + 'ae2:cut_quartz_block', + 'ae2:smooth_quartz_block', + 'ae2:quartz_bricks', + 'ae2:quartz_pillar', + 'ae2:chiseled_quartz_block', + 'ae2:quartz_stairs', + 'ae2:cut_quartz_stairs', + 'ae2:smooth_quartz_stairs', + 'ae2:quartz_brick_stairs', + 'ae2:chiseled_quartz_stairs', + 'ae2:quartz_pillar_stairs', + 'ae2:fluix_stairs', + 'ae2:quartz_slab', + 'ae2:cut_quartz_slab', + 'ae2:smooth_quartz_slab', + 'ae2:quartz_brick_slab', + 'ae2:chiseled_quartz_slab', + 'ae2:quartz_pillar_slab', + 'ae2:fluix_slab', + 'ae2:quartz_wall', + 'ae2:cut_quartz_wall', + 'ae2:smooth_quartz_wall', + 'ae2:quartz_brick_wall', + 'ae2:chiseled_quartz_wall', + 'ae2:quartz_pillar_wall', + 'ae2:fluix_wall', 'ae2:sky_stone_block', 'ae2:smooth_sky_stone_block', 'ae2:sky_stone_brick', @@ -53,28 +79,21 @@ global.AE2_DISABLED_ITEMS = [ 'ae2:smooth_sky_stone_wall', 'ae2:sky_stone_brick_wall', 'ae2:sky_stone_small_brick_wall', - //certus quartz crystal - 'ae2:certus_quartz_crystal', - //compass - 'ae2:meteorite_compass', - //blocks - 'ae2:vibration_chamber', - 'ae2:crank', - 'ae2:charger', - 'ae2:spatial_anchor', - 'ae2:inscriber', - 'ae2:growth_accelerator', - //dust - 'ae2:silicon', - 'ae2:certus_quartz_dust', - 'ae2:sky_dust', - 'ae2:ender_dust', - 'ae2:certus_quartz_dust', + 'gtceu:raw_certus_quartz_block', + // Другое + 'ae2:meteorite_compass', + 'ae2:silicon', + 'ae2:sky_dust', + 'ae2:energy_acceptor', + 'ae2:cable_energy_acceptor', + 'ae2:energy_cell', + 'ae2:dense_energy_cell', + 'ae2:creative_energy_cell' ]; // Glass Cable -global.AE2_GLASS_CABLE = [ +global.AE2_GLASS_CABLES = [ 'ae2:white_glass_cable', 'ae2:orange_glass_cable', 'ae2:magenta_glass_cable', @@ -94,7 +113,7 @@ global.AE2_GLASS_CABLE = [ ] // Covered Cable -global.AE2_COVERED_CABLE = [ +global.AE2_COVERED_CABLES = [ 'ae2:white_covered_cable', 'ae2:orange_covered_cable', 'ae2:magenta_covered_cable', @@ -114,7 +133,7 @@ global.AE2_COVERED_CABLE = [ ] // Dense Covered Cable -global.AE2_COVERED_DENSE_CABLE = [ +global.AE2_COVERED_DENSE_CABLES = [ 'ae2:white_covered_dense_cable', 'ae2:orange_covered_dense_cable', 'ae2:magenta_covered_dense_cable', @@ -134,7 +153,7 @@ global.AE2_COVERED_DENSE_CABLE = [ ] // Smart Cable -global.AE2_SMART_CABLE = [ +global.AE2_SMART_CABLES = [ 'ae2:white_smart_cable', 'ae2:orange_smart_cable', 'ae2:magenta_smart_cable', @@ -154,7 +173,7 @@ global.AE2_SMART_CABLE = [ ] // Dense Smart Cable -global.AE2_SMART_DENSE_CABLE = [ +global.AE2_SMART_DENSE_CABLES = [ 'ae2:white_smart_dense_cable', 'ae2:orange_smart_dense_cable', 'ae2:magenta_smart_dense_cable', @@ -174,7 +193,7 @@ global.AE2_SMART_DENSE_CABLE = [ ] // Smart Cable -global.AE2_SMART_CABLE = [ +global.AE2_SMART_CABLES = [ 'ae2:white_smart_cable', 'ae2:orange_smart_cable', 'ae2:magenta_smart_cable', @@ -194,7 +213,7 @@ global.AE2_SMART_CABLE = [ ] // Dense Smart Cable -global.AE2_SMART_DENSE_CABLE = [ +global.AE2_SMART_DENSE_CABLES = [ 'ae2:white_smart_dense_cable', 'ae2:orange_smart_dense_cable', 'ae2:magenta_smart_dense_cable', @@ -215,7 +234,7 @@ global.AE2_SMART_DENSE_CABLE = [ // Paint ball -global.AE2_PAINTBALL = [ +global.AE2_PAINTBALLS = [ 'ae2:white_paint_ball', 'ae2:orange_paint_ball', 'ae2:magenta_paint_ball', @@ -234,7 +253,7 @@ global.AE2_PAINTBALL = [ 'ae2:black_paint_ball', ] // Lumen paint ball -global.AE2_LUMEN_PAINTBALL = [ +global.AE2_LUMEN_PAINTBALLS = [ 'ae2:white_lumen_paint_ball', 'ae2:orange_lumen_paint_ball', 'ae2:magenta_lumen_paint_ball',