illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into feature/space

Browse source
This commit is contained in:
Pyritie 2025-05-05 16:08:00 +01:00
commit 38219fdb98
93 changed files with 3800 additions and 2564 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kubejs/startup_scripts/ae2/constants.js
View file

@ -23,6 +23,7 @@ global.AE2_DISABLED_ITEMS = [
'ae2:entropy_manipulator',
'ae2:charged_staff',
'ae2:name_press',
'ae2:charger',
// Блоки
'ae2:vibration_chamber',

2
kubejs/startup_scripts/ae2/materials.js
View file

@ -11,7 +11,7 @@ const registerAE2Materials = (event) => {
GTMaterialFlags.DISABLE_DECOMPOSITION,
GTMaterialFlags.FORCE_GENERATE_BLOCK
)
.components('1x silicon', '2x oxygen')
.components('1x nether_quartz', '1x certus_quartz', '1x ruby')
.color(0x6D5BB6)
.secondaryColor(0x1E1932)
}

3
kubejs/startup_scripts/gtceu/constants.js
View file

@ -54,6 +54,9 @@ global.GTCEU_DISABLED_ITEMS = [
'gtceu:stone_wrench_tip',
'gtceu:treated_wood_hanging_sign',
'gtceu:treated_wood_boat',
'gtceu:treated_wood_chest_boat',
'gtceu:treated_wood_sign',
'gtceu:rubber_sapling',
'gtceu:rubber_log',

7
kubejs/startup_scripts/gtceu/materials.js
View file

@ -38,6 +38,7 @@ const registerGTCEuMaterialModification = (event) => {
GENERATE_GEAR,
GENERATE_FRAME,
GENERATE_PLATE,
GENERATE_DENSE,
GENERATE_RING
} = $MATERIAL_FLAGS
@ -210,6 +211,8 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.SterlingSilver.addFlags(GENERATE_RING);
GTMaterials.IronMagnetic.addFlags(GENERATE_PLATE)
GTMaterials.Silicon.addFlags(GENERATE_DENSE);
GTMaterials.TreatedWood.addFlags(GENERATE_LONG_ROD);
@ -291,6 +294,10 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.TungstenSteel.setMaterialSecondaryARGB(0x03192f)
GTMaterials.RoseGold.setMaterialARGB(0xFCE4D8)
GTMaterials.RoseGold.setMaterialSecondaryARGB(0xAB675A)
GTMaterials.Platinum.setMaterialARGB(0xccdff5)
GTMaterials.Platinum.setMaterialSecondaryARGB(0x59563a)
GTMaterials.Nickel.setMaterialARGB(0xfff4ba)
GTMaterials.Nickel.setMaterialSecondaryARGB(0x8d8d71)
global.MINECRAFT_DYE_NAMES.forEach(colorName =>

2
kubejs/startup_scripts/gtceu/tag_prefixes.js
View file

@ -95,4 +95,6 @@ const registerGTCEuTagPrefixes = (event) => {
TagPrefix.turbineBlade.defaultTagPath("turbine_blades/%s")
TagPrefix.turbineBlade.unformattedTagPath("turbine_blades")
TagPrefix.rawOreBlock.defaultTagPath("raw_ore_blocks/%s")
TagPrefix.rawOreBlock.unformattedTagPath("raw_ore_blocks")
}

8
kubejs/startup_scripts/tfc/materials.js
View file

@ -85,10 +85,10 @@ const registerTFCMaterials = (event) => {
GTMaterials.Almandine.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_realgar'))
GTMaterials.Beryllium.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_copper'))
GTMaterials.Cobalt.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_sphalerite'))
GTMaterials.Cobaltite.setMaterialIconSet(GTMaterialIconSet.LAPIS)
GTMaterials.Cobaltite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_borax'))
GTMaterials.Lead.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_magnetite'))
GTMaterials.Lazurite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_ruby'))
GTMaterials.Asbestos.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_lapis'))
GTMaterials.Asbestos.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_graphite'))
GTMaterials.Lithium.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_hematite'))
GTMaterials.Galena.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_copper'))
GTMaterials.Grossular.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_sapphire'))
@ -107,8 +107,8 @@ const registerTFCMaterials = (event) => {
GTMaterials.Apatite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_opal'))
GTMaterials.Pyrope.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_opal'))
GTMaterials.Scheelite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_saltpeter'))
GTMaterials.Tantalite.setMaterialIconSet(GTMaterialIconSet.LIGNITE)
GTMaterials.Stibnite.setMaterialIconSet(GTMaterialIconSet.LAPIS)
GTMaterials.Tantalite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_saltpeter'))
GTMaterials.Stibnite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_sulfur'))
GTMaterials.Tungstate.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_borax'))
GTMaterials.Uraninite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_limonite'))
GTMaterials.Pitchblende.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_magnetite'))

2
kubejs/startup_scripts/vintage_improvements/constants.js
View file

@ -1,7 +1,7 @@
// priority: 0
global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER = 1.5;
global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER = 2;
global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [