Skip to content

Commit d4e63d1

Browse files
authored
Merge branch 'Theta-1-Main' into updating-gtm
2 parents 062a804 + da019cd commit d4e63d1

5 files changed

Lines changed: 15 additions & 2 deletions

File tree

255 Bytes
Loading

kubejs/server_scripts/common/mass_removals.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ ServerEvents.recipes(event => {
3939
'gtceu:shaped/resistor_wire_charcoal', 'create:crushing/diorite_recycling', 'create:milling/charcoal', 'gtceu:macerator/macerate_sculk', 'thermal:gunpowder_4',
4040
'gtceu:shaped/block_compress_marble', 'gtceu:shapeless/block_decompress_marble', 'createdieselgenerators:basin_fermenting/golden_apple', 'gtceu:arc_furnace/arc_mega_vacuum_freezer',
4141
'gtceu:macerator/macerate_mega_vacuum_freezer', 'gtceu:arc_furnace/arc_mega_blast_furnace', 'gtceu:macerator/macerate_mega_blast_furnace', 'gtceu:coke_oven/coal_to_coke',
42-
'gtceu:coke_oven/coal_to_coke_block', 'gtceu:large_chemical_reactor/iodine', 'gtceu:chemical_reactor/iodine'
42+
'gtceu:coke_oven/coal_to_coke_block', 'gtceu:large_chemical_reactor/iodine', 'gtceu:chemical_reactor/iodine', 'gtceu:autoclave/raw_crystal_chip_from_part_bacterial_sludge',
43+
'gtceu:autoclave/raw_crystal_chip_from_part_mutagen', 'gtceu:autoclave/raw_crystal_chip_olivine'
4344
];
4445

4546
const toRemoveType = ['thermal:sawmill', 'thermal:pulverizer', 'thermal:insolator', 'thermal:centrifuge', 'thermal:crucible', 'thermal:chiller', 'thermal:refinery',

kubejs/server_scripts/default/additions/progression/early_game/misc_and_qol.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,14 @@ global.not_hardmode(() => {
117117
G: 'minecraft:glass',
118118
C: 'gtceu:bronze_machine_casing',
119119
B: 'minecraft:bucket'
120-
});
120+
});
121+
122+
event.shaped(Item.of(`minecraft:moss_block`), [
123+
`BB`,
124+
`BB`,
125+
], {
126+
B: `kubejs:moss_ball`
127+
}).id(`minecraft:moss_block`);
121128

122129
});
123130
});

kubejs/server_scripts/default/additions/progression/early_game/sieving.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ global.not_hardmode(() => {
189189
.add('farmersdelight:rice_panicle', 0.05)
190190
.add('minecraft:pumpkin_seeds', 0.10)
191191
.add('minecraft:melon_seeds', 0.10)
192+
.add(`kubejs:moss_ball`, .05)
192193
// Waterlogged Sand Sieving
193194
.input(csi.sand)
194195
.waterlogged(true)

kubejs/startup_scripts/common/objects/items/misc/extras.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ StartupEvents.registry('item', event => {
2222
.texture(`kubejs:item/misc/extra/compass_of_the_flame`)
2323
.maxStackSize(1);
2424

25+
event.create(`moss_ball`)
26+
.texture(`kubejs:item/misc/extra/moss_ball`)
27+
.maxStackSize(16);
28+
2529
//Tier Multiblocks
2630
event.create('multiblock_upgrade_kit')
2731
.tooltip(Text.translate('item.kubejs.multiblock_upgrade_kit.tooltip'))

0 commit comments

Comments
 (0)