Skip to content

Commit 0d2685f

Browse files
Peap1antPeap1ant
authored
Merge branch 'main' into Theta-1-Testing
2 parents 7c2e5bb + bd3e2f7 commit 0d2685f

8 files changed

Lines changed: 116 additions & 112 deletions

File tree

‎.github/ISSUE_TEMPLATE/development-task.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Development Task
3+
about: Creating a task
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
### Description
11+
12+
13+
14+
### Tasks
15+
16+
17+
18+
### Acceptance criteria
19+
20+
21+
22+
### Notes

‎config/ftbquests/quests/chapters/preparing_for_dimensional_travel.snbt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,14 @@
209209
dependencies: ["2EDE996312B1C69E"]
210210
description: ["{ftbquests.csg.classic_stargate_display.description}"]
211211
hide_dependency_lines: true
212+
icon: "effortlessbuilding:building_techniques_book"
212213
id: "653AD979AE4D0581"
213214
optional: true
214215
size: 1.0d
215216
tasks: [{
216-
id: "080109B2F5298E4A"
217-
item: "gtceu:classic_stargate_display"
218-
optional_task: true
219-
type: "item"
217+
id: "226CB0D7781A07F3"
218+
title: "{ftbquests.csg.classic_stargate_display.checkmark}"
219+
type: "checkmark"
220220
}]
221221
title: "{ftbquests.csg.classic_stargate_display.title}"
222222
x: -13.5d

‎config/ftbquests/quests/chapters/the_stars_await_greatness.snbt‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -317,18 +317,11 @@
317317
id: "475330A24EC07BBD"
318318
shape: "gear"
319319
size: 1.125d
320-
tasks: [
321-
{
322-
id: "165BE80839990A5A"
323-
item: "gtceu:riftion_injector"
324-
type: "item"
325-
}
326-
{
327-
id: "6103F412A745371B"
328-
item: "kubejs:riftion_injection_core"
329-
type: "item"
330-
}
331-
]
320+
tasks: [{
321+
id: "165BE80839990A5A"
322+
item: "gtceu:riftion_injector"
323+
type: "item"
324+
}]
332325
x: -2.0d
333326
y: 5.5d
334327
}
@@ -388,11 +381,6 @@
388381
item: "gtceu:riftion_accelerator"
389382
type: "item"
390383
}
391-
{
392-
id: "5CE38771873AB467"
393-
item: "kubejs:particle_rod_holder"
394-
type: "item"
395-
}
396384
{
397385
id: "083418C92391E0F9"
398386
item: "gtceu:riftion_slammer"

‎kubejs/assets/ftbquestlocalizer/lang/en_us.json‎

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.

‎kubejs/server_scripts/common/additions/progression/casings.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ ServerEvents.recipes(event => {
226226

227227
};
228228

229-
engine_intake('pallaridium','iridium','iridium','kubejs','gtceu:palladium_substation');
229+
engine_intake('pallaridium','palladium','iridium','kubejs','gtceu:palladium_substation');
230230
engine_intake('enriched_naquadah','enriched_naquadah','enriched_naquadah','kubejs','kubejs:enriched_naquadah_machine_casing');
231231
engine_intake('nyanium','nyanium','nyanium','kubejs','kubejs:nyanium_machine_casing');
232232

‎kubejs/server_scripts/common/additions/progression/power/solar.js‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ ServerEvents.recipes(event => {
3636
solder,
3737
lubricant,
3838
cable,
39-
superconductor,
4039
battery
4140
},
4241
scaling: {
@@ -50,24 +49,21 @@ ServerEvents.recipes(event => {
5049
polarizer(id(`${tier}_energy_core`))
5150
.itemInputs(`kubejs:${tier1}_energy_core`)
5251
.itemOutputs(`kubejs:${tier}_energy_core`)
53-
.duration(1200)
54-
.EUt(EU * 2);
52+
.duration(300)
53+
.EUt(EU);
5554
}
5655

5756
//Solar Cells
5857
assembler(id(`${tier}_solar_cell`))
59-
.itemInputs(
60-
`2x kubejs:${tier}_photovoltaic_cell`, `gtceu:${tierMaterial}_frame`, `2x gtceu:${cable}_double_cable`,
61-
`#gtceu:circuits/${tier}`
62-
)
63-
.inputFluids(`gtceu:epoxy ${scaler * 288}`)
58+
.itemInputs(`2x kubejs:${tier}_photovoltaic_cell`, `gtceu:${tierMaterial}_frame`, `2x gtceu:${cable}_double_cable`)
59+
.inputFluids(`gtceu:epoxy ${scaler * 144}`)
6460
.itemOutputs(`2x start_core:${tier}_solar_cell`)
6561
.duration(600)
6662
.EUt(EU * 2);
6763

6864
//Photovoltaic Cells
6965
assembler(id(`${tier}_photovoltaic_cell`))
70-
.itemInputs(`gtceu:double_${tierMaterial}_plate`,`kubejs:${tier}_energy_core`,`4x gtceu:fine_${superconductor}_wire`,`#gtceu:circuits/${tier}`)
66+
.itemInputs(`gtceu:double_${tierMaterial}_plate`,`kubejs:${tier}_energy_core`,`#gtceu:circuits/${tier}`)
7167
.inputFluids(`gtceu:${solder} 576`)
7268
.itemOutputs(`kubejs:${tier}_photovoltaic_cell`)
7369
.duration(400)

‎kubejs/startup_scripts/common/elements_materials/material/materials.js‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
320320
matmod('vanadium_gallium', fine_wire);
321321
matmod('titanium', foil);
322322
matmod('rhodium_plated_palladium', [frame, foil]);
323+
matmod('palladium', [rotor]);
323324
matmod('darmstadtium', [frame, foil]);
324325
matmod('ruthenium_trinium_americium_neutronate', fine_wire);
325326
matmod('gold', gear);
@@ -581,17 +582,17 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
581582
if (global.packmode !== 'hard'){(() => {
582583

583584
//Non HM Superconductors
584-
conductorSuper('soul_infused', ['1x invar', '2x soul'], 0xcc9966, [], [V('lv'), 4, 0, true], [150, 130, 2, 3000]);
585-
conductorSuper('signalum', ['1x silver', '3x copper', '4x redstone'], 0xff3300, [1700, 'low', VA('mv'), 800], [V('mv'), 16, 0, true], [190, 120, 3, 4000]);
586-
conductorSuper('lumium', ['1x silver', '3x tin', '2x glowstone'], 0xffffb3, [1700, 'low', VA('hv'), 1000], [V('hv'), 16, 0, true], [220, 130, 4, 5500]);
587-
conductorSuper('enderium', ['3x lead', '1x diamond', '2x ender_pearl'], 0x006666, [3500, 'low', VA('ev'), 1200], [V('ev'), 32, 0, true], [300, 140, 5, 7500]);
588-
conductorSuper('shellite', ['1x black_bronze', '3x signalum'], 0x9933ff, [4400, 'mid', VA('iv'), 1400], [V('iv'), 64, 0, true], [450, 150, 6, 10000]);
589-
conductorSuper('twinite', ['3x manganese_phosphide', '2x amethyst', '1x lumium'], 0xf66999, [5300, 'mid', VA('luv'), 1600], [V('luv'), 64, 0, true], [700, 160, 7, 13000]);
590-
conductorSuper('dragonsteel', ['4x tungsten', '8x magnesium_diboride', '2x cadmium'], 0x3333cc, [7100, 'high', VA('zpm'), 1800], [V('zpm'), 96, 0, true], [1100, 170, 8, 16500]);
591-
conductorSuper('prismalium', ['8x naquadah', '4x mercury_barium_calcium_cuprate', '7x tungsten_carbide'], 0x66ffff, [9000, 'high', VA('zpm'), 2000], [V('uv'), 48, 0, true], [1600, 180, 9, 20500]);
592-
conductorSuper('melodium', ['2x uranium_triplatinum', '14x electrum', '3x amethyst', '4x darmstadtium', '7x europium'], 0xd9b3ff, [10000, 'higher', VA('uv'), 2200], [V('uv'), 128, 0, true], [2000, 200, 10, 26000]);
593-
conductorSuper('stellarium', ['12x neutronium', '4x melodium', '1x samarium_iron_arsenic_oxide'], 0xccffff, [10799, 'highest', VA('uhv'), 2400], [V('uhv'), 192, 0, true], [3200, 215, 12, 32000]);
594-
conductorSuper('ancient_runicalium', ['5x zapolgium', '18x stellarium', '8x zirconium'], 0xFAB922, [11749, 'highest', V('uhv') + 1, 3000], [V('uev'), 256, 0, true], [6400, 240, 15, 38500]);
585+
conductorSuper('soul_infused', ['1x invar', '2x soul'], 0xcc9966, [], [V('lv'), 4, 0, true], [150, 120, 2, 3000]);
586+
conductorSuper('signalum', ['1x silver', '3x copper', '4x redstone'], 0xff3300, [1700, 'low', VA('mv'), 800], [V('mv'), 16, 0, true], [190, 140, 3, 4000]);
587+
conductorSuper('lumium', ['1x silver', '3x tin', '2x glowstone'], 0xffffb3, [1700, 'low', VA('hv'), 1000], [V('hv'), 16, 0, true], [220, 160, 4, 5500]);
588+
conductorSuper('enderium', ['3x lead', '1x diamond', '2x ender_pearl'], 0x006666, [3500, 'low', VA('ev'), 1200], [V('ev'), 32, 0, true], [300, 180, 5, 7500]);
589+
conductorSuper('shellite', ['1x black_bronze', '3x signalum'], 0x9933ff, [4400, 'mid', VA('iv'), 1400], [V('iv'), 64, 0, true], [450, 200, 6, 10000]);
590+
conductorSuper('twinite', ['3x manganese_phosphide', '2x amethyst', '1x lumium'], 0xf66999, [5300, 'mid', VA('luv'), 1600], [V('luv'), 64, 0, true], [700, 220, 7, 13000]);
591+
conductorSuper('dragonsteel', ['4x tungsten', '8x magnesium_diboride', '2x cadmium'], 0x3333cc, [7100, 'high', VA('zpm'), 1800], [V('zpm'), 96, 0, true], [1100, 240, 8, 16500]);
592+
conductorSuper('prismalium', ['8x naquadah', '4x mercury_barium_calcium_cuprate', '7x tungsten_carbide'], 0x66ffff, [9000, 'high', VA('zpm'), 2000], [V('uv'), 48, 0, true], [1600, 260, 9, 20500]);
593+
conductorSuper('melodium', ['2x uranium_triplatinum', '14x electrum', '3x amethyst', '4x darmstadtium', '7x europium'], 0xd9b3ff, [10000, 'higher', VA('uv'), 2200], [V('uv'), 128, 0, true], [2000, 280, 10, 26000]);
594+
conductorSuper('stellarium', ['12x neutronium', '4x melodium', '1x samarium_iron_arsenic_oxide'], 0xccffff, [10799, 'highest', VA('uhv'), 2400], [V('uhv'), 192, 0, true], [3200, 300, 12, 32000]);
595+
conductorSuper('ancient_runicalium', ['5x zapolgium', '18x stellarium', '8x zirconium'], 0xFAB922, [11749, 'highest', V('uhv') + 1, 3000], [V('uev'), 256, 0, true], [6400, 320, 15, 38500]);
595596

596597
})()} else if (global.packmode == 'hard'){(() => {
597598

@@ -954,9 +955,9 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
954955
// Alloys and other compounds
955956
conductor('zalloy', ['3x zapolgium', '4x duranium', '2x europium'], 0xff66ff, METALLIC, [10799, 'highest', VHA('zpm'), 3000], [V('uv'), 2, 4, false], [plates, frame, rod, bolt_and_screw, round, long_rod, gear, small_gear, ring, dense_plate]);
956957

957-
conductor('zirconium_selenide_diiodide', ['1x zirconium', '1x selenium', '2x iodine'], 0x6600cc, DULL, [8900, 'higher', VA('luv'), 4000], [V('uhv'), 8, 16, false], [spring]);
958+
conductor('zirconium_selenide_diiodide', ['1x zirconium', '1x selenium', '2x iodine'], 0x6600cc, DULL, [9600, 'higher', VA('luv'), 3600], [V('uhv'), 8, 16, false], [spring]);
958959

959-
compIngotLiquid('zircalloy_4', ['251x zirconium', '3x tin', '2x chromium', '1x iron'], 0xff9999, DULL, [8900, 'higher', VA('luv'), 2000], [gear, small_gear, rotor, round, frame]);
960+
compIngotLiquid('zircalloy_4', ['251x zirconium', '3x tin', '2x chromium', '1x iron'], 0xff9999, DULL, [9100, 'higher', VA('luv'), 1800], [gear, small_gear, rotor, round, frame]);
960961

961962
// Misc
962963
compIngotLiquid('indium_tin_lead_cadmium_soldering_alloy', ['14x indium', '3x tin', '2x lead', '1x cadmium'], 0xa6a6a6, [], [], []);
@@ -1649,7 +1650,7 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
16491650
.blastTemp(18880, 'highest', VA('uxv'), 600)
16501651
.iconSet(SHINY)
16511652
.flags(plates, frame, rod, dense_plate, long_rod, gear, foil, small_gear, rotor, fine_wire, no_decomp, no_abs_recipe)
1652-
.rotorStats(12800, 250, 50, 45000);
1653+
.rotorStats(12800, 400, 50, 45000);
16531654

16541655
//Threaded
16551656
compIngotPlasmaSecColor('expetidalloy_d_17',['2x hafnide_ceramic_base', '11x hastelloy_c_276', '3x dragonsteel', '1x rhodium_plated_palladium'],0xa78e99,0x948da6,SHINY,[18880, 'highest', VA('uxv'), 600],[plates, frame, rod, bolt_and_screw, dense_plate, long_rod, gear, small_gear, no_decomp, no_abs_recipe]);
@@ -1854,9 +1855,7 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
18541855
compLiquid('faetic_extract', ['1x riftic','1x faetic','1x mystery'], 0x7da7b0, [no_decomp]);
18551856
compLiquid('prismatic_hypergurmalium', ['1x riftic','1x faetic'], 0x4fdfff, [no_decomp]);
18561857

1857-
//DSG
1858-
// compIngotLiquidSecColor('raging_rimulatia',['1x rifitc','1x draco_abyssal','1x riftic'],0xe357f2,0x163f5e,SHINY,'',[plates, frame, rod, bolt_and_screw, dense_plate, long_rod, gear, small_gear, no_decomp, fine_wire])
1859-
1858+
//DSG
18601859
event.create('raging_rimulatia') //Shadowyrm
18611860
.components('1x rifitc','1x draco_abyssal','1x riftic')
18621861
.ingot()
@@ -1865,7 +1864,7 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
18651864
.secondaryColor(0x163f5e)
18661865
.iconSet(SHINY)
18671866
.flags(plates, frame, rod, bolt_and_screw, dense_plate, long_rod, gear, small_gear, no_decomp, fine_wire)
1868-
.rotorStats(14400, 500, 100, 96000);
1867+
.rotorStats(14400, 560, 100, 96000);
18691868

18701869
event.create('primordially_stellarized_weapon_grade_naquadah')
18711870
.components('1x voidic','157x stellarized_weapon_grade_naquadah','1x voidic')

kubejs/startup_scripts/common/machines/multiblocks/nuclear reactor/nuclear_reactor.js renamed to kubejs/startup_scripts/common/machines/multiblocks/power/nuclear_reactor.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
2020
.appearanceBlock(GCYMBlocks.CASING_HIGH_TEMPERATURE_SMELTING)
2121
.pattern(definition => FactoryBlockPattern.start()
2222
.aisle('HHHXHHH',' VHGHV ',' VHGHV ',' VHGHV ','HHHHHHH')
23-
.aisle(' FHHHF ',' E E ',' H H ',' E E ',' FHHHF ')
24-
.aisle(' FHHHF ',' HPH ',' G G ',' HPH ',' FHHHF ')
25-
.aisle(' FHHHF ',' EPE ',' HPH ',' EPE ',' FHHHF ')
23+
.aisle(' VHHHV ',' E E ',' H H ',' E E ',' VHHHV ')
24+
.aisle(' VHHHV ',' HPH ',' G G ',' HPH ',' VHHHV ')
25+
.aisle(' VHHHV ',' EPE ',' HPH ',' EPE ',' VHHHV ')
2626
.aisle('HHHHHHH',' VHPHV ',' VHPHV ',' VHPHV ','HHHHHHH')
27-
.aisle(' FHHHF ',' EPE ',' HPH ',' EPE ',' FHHHF ')
28-
.aisle(' FHHHF ',' HPH ',' G G ',' HPH ',' FHHHF ')
29-
.aisle(' FHHHF ',' E E ',' H H ',' E E ',' FHHHF ')
27+
.aisle(' VHHHV ',' EPE ',' HPH ',' EPE ',' VHHHV ')
28+
.aisle(' VHHHV ',' HPH ',' G G ',' HPH ',' VHHHV ')
29+
.aisle(' VHHHV ',' E E ',' H H ',' E E ',' VHHHV ')
3030
.aisle('HHH@HHH',' VHGHV ',' VHGHV ',' VHGHV ','HHHHHHH')
3131
.where('@', Predicates.controller(Predicates.blocks(definition.get())))
3232
.where('H', Predicates.blocks('gtceu:high_temperature_smelting_casing')
@@ -38,9 +38,8 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
3838
.or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1)))
3939
.where('V', Predicates.blocks('gtceu:heat_vent'))
4040
.where('G', Predicates.blocks('gtceu:laminated_glass'))
41-
.where('P', Predicates.blocks('kubejs:pallaridium_pipe_casing'))
41+
.where('P', Predicates.blocks('gtceu:tungstensteel_pipe_casing'))
4242
.where('E', Predicates.blocks('kubejs:pallaridium_engine_intake_casing'))
43-
.where('F', Predicates.blocks('kubejs:pallaridium_firebox_casing'))
4443
.where('X', Predicates.abilities(PartAbility.OUTPUT_ENERGY)
4544
.or(Predicates.abilities(PartAbility.OUTPUT_LASER)))
4645
.where(' ', Predicates.air())

0 commit comments

Comments
 (0)