Skip to content

Commit 768b805

Browse files
committed
Merge branch 'Theta-1-Hotfix-1' of https://github.com/StarT-Dev-Team/Star-Technology into Theta-1-Hotfix-1
2 parents 4fb2703 + 26703d1 commit 768b805

5 files changed

Lines changed: 8 additions & 7 deletions

File tree

kubejs/assets/ftbquestlocalizer/lang/en_us.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
"ftbquests.automation_age.ev_energy_input_hatch_4a.description": "This hatch can do something called Speed Overclocking.\n\nA Speed Overclock is a special kind of Overclocking, that makes your machine run recipes at the next tier of voltage.\n\nHowever, unlike normal Overclock, it will not make the machine be able to do recipes at that higher tier.\n\nAs an example, a 4A §5EV§r Hatch will let a machine run at §9IV§r speed, but only do §5EV§r or lower recipes.",
251251
"ftbquests.automation_age.ev_machine_hull.description": "The heart of every §5EV§r machine.",
252252
"ftbquests.automation_age.ev_upgrade_kit.description": "Will increase the power of anything thermal by 48x. This is the final Upgrade Kit you can make for them.",
253-
"ftbquests.automation_age.graphene_dust.description": "Carbon Nanotubes",
253+
"ftbquests.automation_age.graphene_dust.description": "Super strong sheets of carbon",
254254
"ftbquests.automation_age.hpic_chip.description": "This Chip is used in both §9IV§r and §dLuV§r Energy Hatches and Transformers as well as Assembly Line Casings.",
255255
"ftbquests.automation_age.hpic_chip.title": "HPIC Chips",
256256
"ftbquests.automation_age.hsse_ingot.description": "A more malleable HSS.",

kubejs/assets/kubejs/lang/en_us.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,11 @@
344344
"item.kubejs.dpu.tooltip": "§7Dimensional Processing Unit",
345345
"item.kubejs.computational_matrix.tooltip": "§7MORE COMPUTATION!!",
346346
"item.kubejs.stellar_access_point.tooltip": "§7Peering into the unknown...",
347-
"item.kubejs.chevron.tooltip": "§7Stellar Address Writters.",
347+
"item.kubejs.chevron.tooltip": "§7Stellar Address Writers.",
348348
"item.kubejs.dimensional_supercomputer.tooltip": "§7Strong Enough to Compute Interdimensional Travel.",
349349
"item.kubejs.reinforced_plating.tooltip": "§7Watch out if it flies off.",
350350
"item.kubejs.stargate_rod_base.tooltip": "§7The core fiber of a stargate.",
351-
"item.kubejs.enscription_plate.tooltip": "§7I can't to enscribe these...",
351+
"item.kubejs.enscription_plate.tooltip": "§7I can't enscribe these...",
352352
"item.kubejs.enscription_chip.tooltip": "§7A smaller enscription plate?",
353353

354354
"item.kubejs.csg_field_stabiliser": "§bCSG§r Field Stabiliser",
@@ -664,7 +664,7 @@
664664

665665
"block.kubejs.austenitic_stainless_steel_304_casing": "Austenitic Stainless Steel 304 Nuclear Casing",
666666
"block.kubejs.inconel_625_casing": "Inconel 625 Thermal Fluctuation Resistant Casing",
667-
"block.kubejs.treatedwood_casing": "Treatedwood Reinforced Casing",
667+
"block.kubejs.treatedwood_casing": "Treated Wood Reinforced Casing",
668668
"block.kubejs.peek_casing": "PEEK Casing",
669669
"block.kubejs.fluix_steel_casing": "Fluix Steel Casing",
670670
"block.kubejs.superalloy_casing": "Superalloy Casing",

kubejs/server_scripts/common/additions/multiblock_recipes/multiblock_barrels.js

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

8181
event.recipes.gtceu.large_stone_barrel(id('obsidian'))
8282
.notConsumableFluid('minecraft:water 1000')
83+
.notConsumable('minecraft:obsidian')
8384
.inputFluids('minecraft:lava 1000')
8485
.itemOutputs('minecraft:obsidian')
85-
.circuit(10)
8686
.duration(5);
8787

8888

kubejs/server_scripts/common/additions/recipe_changes.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,13 @@ ServerEvents.recipes(event => {
155155
.EUt(8);
156156

157157
//Treated Wood Fixes/Additions
158-
event.remove({id: 'gtceu:macerator/macerate_treated_wood_chest_boat'})
158+
event.remove({id: 'gtceu:macerator/macerate_treated_wood_chest_boat'});
159159
event.recipes.gtceu.macerator(id('treated_wood_chest_boat'))
160160
.itemInputs('gtceu:treated_wood_chest_boat')
161161
.itemOutputs('5x gtceu:treated_wood_dust', '8x gtceu:wood_dust')
162162
.duration(1274)
163163
.EUt(2);
164+
event.remove({id: 'gtceu:macerator/macerate_treated_wood_planks'});
164165
event.recipes.gtceu.macerator(id('treated_wood_planks'))
165166
.itemInputs('gtceu:treated_wood_planks')
166167
.itemOutputs('gtceu:treated_wood_dust')

kubejs/startup_scripts/common/machines/multiblocks/very_late_game_multis/abydos_multis/titan_forge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
33
event.create('titan_forge', 'multiblock')
44
.rotationState(RotationState.NON_Y_AXIS)
55
.recipeType('titan_forge')
6-
.recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_NON_PERFECT])
6+
.recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_NON_PERFECT, GTRecipeModifiers.BATCH_MODE])
77
.appearanceBlock(() => Block.getBlock('kubejs:enriched_naquadah_machine_casing'))
88
.pattern(definition => FactoryBlockPattern.start()
99
.aisle(' BCCCB ', ' BBBBB ', ' ', ' ', ' ', ' ', ' BBBBB ', ' BBB ')

0 commit comments

Comments
 (0)