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

merge

Browse source
This commit is contained in:
Pyritie 2025-06-09 21:15:19 +01:00
commit 9c41fe262f
56 changed files with 958 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kubejs/assets/emi/category/properties/ae2_attunement.json
View file

@ -1 +1 @@
{"ae2:attunement":{"order":137}}
{"ae2:attunement":{"order":138}}

2
kubejs/assets/emi/category/properties/ae2_entropy.json
View file

@ -1 +1 @@
{"ae2:entropy":{"order":138}}
{"ae2:entropy":{"order":139}}

2
kubejs/assets/emi/category/properties/create_draining.json
View file

@ -1 +1 @@
{"create:draining":{"order":139}}
{"create:draining":{"order":140}}

2
kubejs/assets/emi/category/properties/create_spout_filling.json
View file

@ -1 +1 @@
{"create:spout_filling":{"order":140}}
{"create:spout_filling":{"order":141}}

2
kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json
View file

@ -1 +1 @@
{"domum_ornamentum:architects_cutter":{"order":135}}
{"domum_ornamentum:architects_cutter":{"order":136}}

2
kubejs/assets/emi/category/properties/emi_info.json
View file

@ -1 +1 @@
{"emi:info":{"order":143}}
{"emi:info":{"order":144}}

2
kubejs/assets/emi/category/properties/emi_tag.json
View file

@ -1 +1 @@
{"emi:tag":{"order":144}}
{"emi:tag":{"order":145}}

2
kubejs/assets/emi/category/properties/exposure_photograph_stacking.json
View file

@ -1 +1 @@
{"exposure:photograph_stacking":{"order":141}}
{"exposure:photograph_stacking":{"order":142}}

2
kubejs/assets/emi/category/properties/framedblocks_framing_saw.json
View file

@ -1 +1 @@
{"framedblocks:framing_saw":{"order":134}}
{"framedblocks:framing_saw":{"order":135}}

2
kubejs/assets/emi/category/properties/ftbquests_quest.json
View file

@ -1 +1 @@
{"ftbquests:quest":{"order":142}}
{"ftbquests:quest":{"order":143}}

2
kubejs/assets/emi/category/properties/greate_block_cutting.json
View file

@ -1 +1 @@
{"greate:block_cutting":{"order":133}}
{"greate:block_cutting":{"order":134}}

2
kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json
View file

@ -1 +1 @@
{"gtceu:programmed_circuit":{"order":136}}
{"gtceu:programmed_circuit":{"order":137}}

1
kubejs/assets/emi/category/properties/minecraft_stonecutting.json Normal file
View file

@ -0,0 +1 @@
{"minecraft:stonecutting":{"order":133}}

3
kubejs/assets/emi/recipe/filters/categories.json
View file

@ -6,9 +6,6 @@
{
"category": "minecraft:brewing"
},
{
"category": "minecraft:stonecutting"
},
{
"category": "minecraft:blasting"
},

3
kubejs/assets/gtceu/lang/en_us.json
View file

@ -74,7 +74,8 @@
"material.gtceu.vitrified_asbestos": "Vitrified Asbestos",
"metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust",
"metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore",
"item.gtceu.tool.behavior.silk_ice": "Silk Harvests Packed Ice",
"item.gtceu.tool.behavior.silk_ice": "Silk harvests Packed Ice",
"item.gtceu.tool.butchery_knife.tooltip": "Butchers animals for more meat",
"block.gtceu.overworld_marker": "Earth",
"block.gtceu.the_nether_marker": "The Beneath",
"tagprefix.sword_head": "%s Sword Head",

19
kubejs/assets/railways/lang/en_us.json
View file

@ -3,5 +3,22 @@
"block.railways.track_create_andesite_wide": "Wide Train Track",
"block.railways.track_create_andesite_narrow": "Narrow Train Track",
"item.railways.track_incomplete_create_andesite_wide": "Incomplete Wide Track",
"item.railways.track_incomplete_create_andesite_narrow": "Incomplete Narrow Track"
"item.railways.track_incomplete_create_andesite_narrow": "Incomplete Narrow Track",
"tfc.recipe.barrel.railways.barrel.dyeing.cap_decolor": "Decoloring",
"tfc.recipe.barrel.railways.barrel.dyeing.black_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.gray_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.light_conductor_gray_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.white_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.pink_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.magenta_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.purple_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.blue_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.light_conductor_blue_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.cyan_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.green_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.lime_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.yellow_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.orange_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.red_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.brown_conductor_cap": "Dyeing"
}