Merge branch 'ae2-crafts' of https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x into ae2-crafts

CHANGELOG.md

@@ -1,4 +1,44 @@
 # Changelog
+
+## [0.1.2] - 2023-11-30
+### Fixes
+- Исправлен баг, когда тфк порошок можно было переплавить как пыль.
+- Улучшено расположение рецептов в скриптах.
+- Исправлен баг, когда кирка шахтера не работала.
+- Исправлен баг, когда из досок можно было без пилы сделать палки, что порождало кривые рецепты палок.
+- Исправлены рецепты у мелких кусков металла, для юзера ничего не поменялось но ген рецептов стал автоматическим.
+- Повсеместное улучшение читабильности кода.
+- Добавлено несколько рецептов для дробилки тфк, так как некоторые отсутствовали (связано с порошком).
+- Изменен рецепт LV Machine Casing, теперь он использует пластины красной и синей стали.
+
+## [0.1.1] - 2023-11-29
+### Fixes
+- Исправлен баг, когда выходные слитки могли быть из разных модов (ну или нет, но вроде я тестил и все было хорошо).
+- Скрыты неиспользуемые жидкости, предметы тфк.
+- Скрыто множество ванильных предметов, но еще не всех.
+- Исправлен декрафт тфк порошка в металл, который имеет кучу единиц металла.
+- Исправлены рецепты песка и стекла.
+- Исправлен баг, когда в мире могла генерироваться тфк жила сапфиров и изумрудов.
+- Добавлены рецепты булыги и сырого камня в RockBreaker.
+- Добавлены новые рецепты SandStone из TFC, ванильные скрыты.
+- Вовзращены ванильные текстуры в пауз меню у кнопок.
+- Исправлен баг, когда из промывки можно было получить тфк гемы.
+- Декрафт всех дервянных предметов тфк в деревянную пыль в гт.
+- Исправление рецепта креозотовых досок.
+- Исправлен баг, когда можно было сделать некоторые нежелательные рецепты из AdAstra.
+- Возвращены рецепты MCW AIO, да они кривые, но я не буду за автора делать всю работу, пусть фиксит свой говно-мод.
+- Исправлен рецепт доменной печи тфк.
+### Update mods
+- TerraFirmaGreg 0.0.12 -> 0.0.13
+- Cucumber 7.0.4 -> 7.0.6
+- ResourcefulLib 2.1.16 -> 2.1.18
+- Blur 3.1.0 -> 3.1.1
+- XaeroMinimap 23.8.4 -> 23.9.0
+- XaeroWorldMap 1.36.0 -> 1.37.0
+- Ae2WT 15.1.4 -> 15.1.5
+- FTBQuestsOptimizer 1.1.3 -> 1.1.4
+- Curios 5.4.3 -> 5.4.4
+
 ## [0.1.0] - 2023-11-27
 ### Fixes
 - Исправлен баг, когда можно было дублировать металл через броню, пластины, палки и другое.

config/exposure-client.toml

@@ -0,0 +1,29 @@
+
+[UI]
+	#'Use while sneaking to open' message will be shown in Camera item tooltip.
+	CameraSneakOpenTooltip = true
+	#Photographer name will be shown in Photograph's tooltip.
+	PhotographPhotographerNameTooltip = false
+	#Crosshair will not get in the way when holding a photograph.
+	PhotographInHandHideCrosshair = true
+
+	[UI.Viewfinder]
+		#Mouse sensitivity modifier per 5 degrees of fov. Set to 0 to disable sensitivity changes.
+		#Range: 0.0 ~ 1.0
+		ZoomSensitivityModifier = 0.048
+		BackgroundColorHex = "FA1F1D1B"
+		FontMainColorHex = "FF2B2622"
+		FontSecondaryColorHex = "FF7A736C"
+
+[Capture]
+	#Delay in ticks before capturing an image when shooting with flash.
+	#If you experience flash synchronization issues (Flash having no effect on the image) - try increasing the value.
+	#Range: 1 ~ 6
+	FlashCaptureDelayTicks = 3
+
+[FileSaving]
+	#When the Photograph is viewed in UI, image will be saved to 'exposures' folder as a png.
+	SavePhotographs = true
+	#When saving, exposures will be organized into a folders corresponding to current world name.
+	WorldNameSubfolder = true
+

config/exposure-common.toml

@@ -0,0 +1,17 @@
+
+[Camera]
+	#Spyglass will function like a superzoom lens instead of a teleconverter, allowing for a full range of focal lengths (18-200).
+	#Using it as a teleconverter allows only 55-200
+	SpyglassSuperzoom = false
+
+[Lightroom]
+	#Time in ticks to print black and white photograph.
+	#Range: > 1
+	BlackAndWhitePrintTime = 80
+	#Time in ticks to print color photograph.
+	#Range: > 1
+	ColorPrintTime = 200
+	#Amount of experience awarded per printed Photograph. Set to 0 to disable.
+	#Range: 0 ~ 32767
+	ExperiencePerPrint = 4
+

kubejs/client_scripts/main_client_script.js

@@ -7,6 +7,7 @@ REIEvents.hide('item', event => {
     hideCreateStuff(event)
     hideAE2Stuff(event)
     hideExtendedCraftingStuff(event)
+    hideAdAstraStuff(event)
     hideSophisticatedBackpacksStuff(event)
     hideMoreRedStuff(event)
     hideSmallShipsStuff(event)
@@ -22,3 +23,7 @@ REIEvents.removeCategories(event => {
     registerMoreRedCategories(event)
 })
 
+REIEvents.hide('fluid', event => {
+    hideTFCFluids(event)
+})
+

kubejs/client_scripts/mods/ad_astra.js

@@ -0,0 +1,7 @@
+// priority: 0
+
+const hideAdAstraStuff = (event) => {
+    global.AD_ASTRA_DISABLED_ITEMS.forEach(item => {
+        event.hide(item)
+    })
+}

kubejs/client_scripts/mods/tfc.js

@@ -21,4 +21,26 @@ const hideTFCStuff = (event) => {
 
 const groupTFCStuff = (event) => {
     event.groupItemsByTag('tfg:rei_groups/ingots/double', 'Double Ingots', 'forge:double_ingots')
+}
+
+const hideTFCFluids = (event) => {
+    event.hide('tfc:metal/bismuth')
+    event.hide('tfc:metal/bismuth_bronze')
+    event.hide('tfc:metal/bronze')
+    event.hide('tfc:metal/black_bronze')
+    event.hide('tfc:metal/brass')
+    event.hide('tfc:metal/copper')
+    event.hide('tfc:metal/gold')
+    event.hide('tfc:metal/nickel')
+    event.hide('tfc:metal/rose_gold')
+    event.hide('tfc:metal/silver')
+    event.hide('tfc:metal/tin')
+    event.hide('tfc:metal/zinc')
+    event.hide('tfc:metal/sterling_silver')
+    event.hide('tfc:metal/wrought_iron')
+    event.hide('tfc:metal/cast_iron')
+    event.hide('tfc:metal/steel')
+    event.hide('tfc:metal/black_steel')
+    event.hide('tfc:metal/red_steel')
+    event.hide('tfc:metal/blue_steel')
 }

kubejs/data/forge/tags/items/dusts.json

@@ -0,0 +1,5 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "replace": true,
+  "values": []
+}

kubejs/data/forge/tags/items/dusts/copper.json

@@ -0,0 +1,5 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "replace": true,
+  "values": []
+}

kubejs/data/forge/tags/items/dusts/iron.json

@@ -0,0 +1,5 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "replace": true,
+  "values": []
+}

kubejs/server_scripts/ad_astra/recipes.js

@@ -4,4 +4,10 @@ const registerAdAstraRecipes = (event) => {
     
     // Удаление рецептов мода
     // event.remove({ mod: 'ad_astra' });
+
+    event.remove({ id: 'ad_astra:recipes/steel_trapdoor' })
+    event.remove({ id: 'ad_astra:recipes/steel_door' })
+    event.remove({ id: 'ad_astra:recipes/hammer' })
+    event.remove({ id: 'ad_astra:recipes/iron_rod' })
+    event.remove({ id: 'ad_astra:hammering/steel_plate' })
 }

kubejs/server_scripts/gregtech/recipes.js

@@ -23,30 +23,10 @@ const registerGTCEURecipes = (event) => {
 
     // Удаление рецептов связанных с BioChaff
     event.remove({id: 'gtceu:macerator/dirt_from_bio_chaff'})
-
-    // Удаление рецептов связанных с Wheat Dust
-    event.remove({id: 'gtceu:packer/package_wheat_tiny_dust'})
-    event.remove({id: 'gtceu:packer/package_wheat_small_dust'})
-    event.remove({id: 'gtceu:packer/unpackage_wheat_tiny_dust'})
-    event.remove({id: 'gtceu:packer/unpackage_wheat_small_dust'})
-    event.remove({id: 'gtceu:shaped/tiny_dust_assembling_wheat'})
-    event.remove({id: 'gtceu:shaped/small_dust_assembling_wheat'})
-    event.remove({id: 'gtceu:shaped/tiny_dust_disassembling_wheat'})
-    event.remove({id: 'gtceu:shaped/small_dust_disassembling_wheat'})
-    event.remove({id: 'gtceu:macerator/macerate_wheat'})
-    event.remove({id: 'gtceu:macerator/macerate_hay_block'})
-    event.remove({id: 'gtceu:shapeless/wheat_to_dust'})
     
     // Удаление других рецептов
     //
     
-    // Декрафт сундуков в пыль
-    event.recipes.gtceu.macerator('macerate_chest')             
-        .itemInputs('#forge:chests/wooden')
-        .itemOutputs('8x gtceu:wood_dust')
-        .duration(100)
-        .EUt(4)
-
     // Treated Wood Planks
     event.shaped('8x gtceu:treated_wood_planks', [
         'AAA', 
@@ -75,51 +55,6 @@ const registerGTCEURecipes = (event) => {
         B: Item.of('tfc:metal/bucket/blue_steel', '{fluid:{Amount:1000,FluidName:"gtceu:creosote"}}').strongNBT()
     }).id('tfg:shaped/treated_wood_planks_blue_steel_bucket')
 
-    // Quartz Sand Dust
-    event.shaped('gtceu:quartz_sand_dust', [
-        'A', 
-        'B'
-    ], {
-        A: '#forge:sand',
-        B: '#forge:tools/mortars'
-    }).id('gtceu:shaped/quartz_sand')
-
-    event.recipes.gtceu.macerator('quartz_sand_from_sand')             
-        .itemInputs('#forge:sand')
-        .itemOutputs('gtceu:quartz_sand_dust')
-        .duration(30)
-        .EUt(2)
-
-    // Silicon Dioxide Dust
-    event.recipes.gtceu.electrolyzer('sand_electrolysis')             
-        .itemInputs('8x #forge:sand')
-        .itemOutputs('gtceu:silicon_dioxide_dust')
-        .duration(500)
-        .EUt(25)
-
-    // Fertilizer
-    event.recipes.gtceu.mixer('fertilizer')             
-        .itemInputs(
-            '#tfc:dirt',
-            '2x #forge:dusts/wood',
-            '4x #forge:sand'
-        )
-        .inputFluids(Fluid.of('minecraft:water', 1000))
-        .itemOutputs('4x gtceu:fertilizer')
-        .duration(300)
-        .EUt(30)
-
-    event.recipes.gtceu.create_mixer('fertilizer')             
-        .itemInputs(
-            '#tfc:dirt',
-            '2x #forge:dusts/wood',
-            '4x #forge:sand'
-        )
-        .inputFluids(Fluid.of('minecraft:water', 1000))
-        .itemOutputs('4x gtceu:fertilizer')
-        .duration(300)
-        .EUt(30)
-        .rpm(96)
 
     // Low Pressure Steam Forge Hammer
     event.shaped('gtceu:lp_steam_forge_hammer', [
@@ -237,129 +172,6 @@ const registerGTCEURecipes = (event) => {
         E: '#tfc:red_or_blue_anvil',
     }).id('gtceu:shaped/uv_forge_hammer')
 
-    // Kapok Log -> Sticky Resin (Centriguge)
-    event.recipes.gtceu.centrifuge('rubber_log_separation')             
-        .itemInputs('#tfc:kapok_logs')
-        .chancedOutput('gtceu:sticky_resin', 5000, 1200)
-        .chancedOutput('gtceu:plant_ball', 3750, 900)
-        .chancedOutput('gtceu:carbon_dust', 2500, 600)
-        .chancedOutput('gtceu:wood_dust', 2500, 700)
-        .outputFluids(Fluid.of('gtceu:methane', 60))
-        .duration(200)
-        .EUt(20)
-
-    // Kapok Log -> Raw Rubber Dust
-    event.recipes.gtceu.extractor('raw_rubber_from_log')             
-        .itemInputs('#tfc:kapok_logs')
-        .itemOutputs('gtceu:raw_rubber_dust')
-        .duration(300)
-        .EUt(2)
-
-    // Kapok Sapling -> Raw Rubber Dust
-    event.recipes.gtceu.extractor('raw_rubber_from_sapling')             
-        .itemInputs('tfc:wood/sapling/kapok')
-        .itemOutputs('gtceu:raw_rubber_dust')
-        .duration(300)
-        .EUt(2)
-
-    // Kapok Leaves -> Raw Rubber Dust
-    event.recipes.gtceu.extractor('raw_rubber_from_leaves')             
-        .itemInputs('16x tfc:wood/leaves/kapok')
-        .itemOutputs('gtceu:raw_rubber_dust')
-        .duration(300)
-        .EUt(2)
-
-    // TFC Plants -> Plant Ball (Centrifuge)
-    event.recipes.gtceu.centrifuge('grass_block_separation')             
-        .itemInputs('#tfc:plants')
-        .chancedOutput('gtceu:plant_ball', 3000, 1200)
-        .chancedOutput('gtceu:clay_tiny_dust', 5000, 900)
-        .duration(250)
-        .EUt(30)
-
-    // TFC Dirt -> Plant Ball (Centrifuge)
-    event.recipes.gtceu.centrifuge('dirt_separation')             
-        .itemInputs('#tfc:dirt')
-        .chancedOutput('gtceu:plant_ball', 1250, 700)
-        .chancedOutput('gtceu:clay_tiny_dust', 4000, 900)
-        .duration(250)
-        .EUt(30)
-
-    // 8x Vanilla Shit -> Plant Ball (Compressor)
-    event.remove({id: 'gtceu:compressor/plant_ball_from_wheat'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_warped_stem'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_crimson_stem'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_tube_coral'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_sugar_cane'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_red_mushroom'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_potato'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_nether_wart'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_horn_coral'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_fire_coral'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_carrot'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_cactus'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_bubble_coral'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_brown_mushroom'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_brain_coral'})
-    event.remove({id: 'gtceu:compressor/plant_ball_from_beetroot'})
-
-    event.recipes.gtceu.compressor('plant_ball_from_tfc_seeds')             
-        .itemInputs('8x #tfc:seeds')
-        .itemOutputs('gtceu:plant_ball')
-        .duration(300)
-        .EUt(2)
-
-    event.recipes.gtceu.compressor('plant_ball_from_tfc_food')             
-        .itemInputs('8x #tfc:foods')
-        .itemOutputs('gtceu:plant_ball')
-        .duration(300)
-        .EUt(2)
-
-    event.recipes.gtceu.compressor('plant_ball_from_tfc_plants')             
-        .itemInputs('8x #tfc:plants')
-        .itemOutputs('gtceu:plant_ball')
-        .duration(300)
-        .EUt(2)
-
-    event.recipes.gtceu.compressor('plant_ball_from_tfc_corals')             
-        .itemInputs('8x #tfc:corals')
-        .itemOutputs('gtceu:plant_ball')
-        .duration(300)
-        .EUt(2)
-
-    // Vanilla Shit -> Biomass (Brewery)
-    event.remove({id: 'gtceu:brewery/biomass_from_sugar_cane'})
-    event.remove({id: 'gtceu:brewery/biomass_from_red_mushroom'})
-    event.remove({id: 'gtceu:brewery/biomass_from_potato'})
-    event.remove({id: 'gtceu:brewery/biomass_from_carrot'})
-    event.remove({id: 'gtceu:brewery/biomass_from_cactus'})
-    event.remove({id: 'gtceu:brewery/biomass_from_brown_mushroom'})
-    event.remove({id: 'gtceu:brewery/biomass_from_beetroot'})
-
-    event.recipes.gtceu.brewery('biomass_from_tfc_seeds')             
-        .itemInputs('#tfc:seeds')
-        .outputFluids(Fluid.of('gtceu:biomass', 20))
-        .duration(128)
-        .EUt(3)
-
-    event.recipes.gtceu.brewery('biomass_from_tfc_food')             
-        .itemInputs('#tfc:foods')
-        .outputFluids(Fluid.of('gtceu:biomass', 20))
-        .duration(128)
-        .EUt(3)
-
-    event.recipes.gtceu.brewery('biomass_from_tfc_plants')             
-        .itemInputs('#tfc:plants')
-        .outputFluids(Fluid.of('gtceu:biomass', 20))
-        .duration(128)
-        .EUt(3)
-
-    event.recipes.gtceu.brewery('biomass_from_tfc_corals')             
-        .itemInputs('#tfc:corals')
-        .outputFluids(Fluid.of('gtceu:biomass', 20))
-        .duration(128)
-        .EUt(3)
-
     // Fire Brick
     event.smelting('tfc:ceramic/fire_brick', 'gtceu:compressed_fireclay').id('tfg:smelting/fireclay_brick')
 
@@ -499,7 +311,7 @@ const registerGTCEURecipes = (event) => {
         D: 'gtceu:copper_single_cable'
     }).id('gtceu:shaped/multi_furnace')
 
-    // Multi-Smelter
+    // Electric Blast Furnace
     event.shaped('gtceu:electric_blast_furnace', [
         'AAA', 
         'BCB',
@@ -510,4 +322,34 @@ const registerGTCEURecipes = (event) => {
         C: 'gtceu:heatproof_machine_casing',
         D: 'gtceu:tin_single_cable'
     }).id('gtceu:shaped/electric_blast_furnace')
+
+    // LV Casing
+    event.shaped('gtceu:lv_machine_casing', [
+        'ABA', 
+        'BCB',
+        'ABA'
+    ], {
+        A: '#forge:plates/red_steel',
+        B: '#forge:plates/blue_steel',
+        C: '#forge:tools/wrenches'
+    }).id('gtceu:shaped/casing_lv')
+
+    event.recipes.gtceu.assembler('casing_lv')             
+        .itemInputs('4x #forge:plates/red_steel', '4x #forge:plates/blue_steel')
+        .circuit(8)
+        .itemOutputs('gtceu:lv_machine_casing')
+        .duration(50)
+        .EUt(16)
+
+    event.recipes.gtceu.macerator('macerate_lv_machine_casing')             
+        .itemInputs('gtceu:lv_machine_casing')
+        .itemOutputs('4x gtceu:red_steel_dust', '4x gtceu:blue_steel_dust')
+        .duration(448)
+        .EUt(8)
+
+    event.recipes.gtceu.arc_furnace('arc_lv_machine_casing')             
+        .itemInputs('gtceu:lv_machine_casing')
+        .itemOutputs('4x gtceu:red_steel_ingot', '4x gtceu:blue_steel_ingot')
+        .duration(448)
+        .EUt(8)
 }

kubejs/server_scripts/minecraft/recipes.js

@@ -1,6 +1,15 @@
 // priority: 0
 
 const registerMinecraftRecipes = (event) => {
+    // Удаление рецептов палок
+    event.remove({id: 'minecraft:stick'})
+
+    // Удаление рецептов камня
+    event.remove({id: 'gtceu:compressor/stone_from_dust'})
+
+    // Удаление рецептов жиги
+    event.remove({id: 'tfc:crafting/vanilla/flint_and_steel'})
+    event.remove({id: 'ad_astra:recipes/flint_and_steel'})
 
     // Удаление рецептов связанных с наковальней
     event.remove({id: 'gtceu:arc_furnace/arc_anvil'})
@@ -178,6 +187,19 @@ const registerMinecraftRecipes = (event) => {
     event.remove({id: 'minecraft:cake'})
     event.remove({id: 'minecraft:bread'})
     event.remove({id: 'gtceu:packer/hay_block'})
+    
+    // Удаление рецептов связанных с Wheat Dust
+    event.remove({id: 'gtceu:packer/package_wheat_tiny_dust'})
+    event.remove({id: 'gtceu:packer/package_wheat_small_dust'})
+    event.remove({id: 'gtceu:packer/unpackage_wheat_tiny_dust'})
+    event.remove({id: 'gtceu:packer/unpackage_wheat_small_dust'})
+    event.remove({id: 'gtceu:shaped/tiny_dust_assembling_wheat'})
+    event.remove({id: 'gtceu:shaped/small_dust_assembling_wheat'})
+    event.remove({id: 'gtceu:shaped/tiny_dust_disassembling_wheat'})
+    event.remove({id: 'gtceu:shaped/small_dust_disassembling_wheat'})
+    event.remove({id: 'gtceu:macerator/macerate_wheat'})
+    event.remove({id: 'gtceu:macerator/macerate_hay_block'})
+    event.remove({id: 'gtceu:shapeless/wheat_to_dust'})
 
     // Удаление рецептов связанных с TripWire Hook
     event.remove({id: 'minecraft:tripwire_hook'})
@@ -233,6 +255,7 @@ const registerMinecraftRecipes = (event) => {
     event.remove({id: 'gtceu:macerator/macerate_trapped_chest'})
 
     // Удаление других рецептов
+    event.remove({ id: 'tfc:crafting/vanilla/lapis_block' })
     event.remove({id: 'minecraft:blast_furnace'})
     event.remove({id: 'minecraft:fire_charge'})
     event.remove({id: 'minecraft:netherite_ingot_from_netherite_block'})
@@ -260,6 +283,23 @@ const registerMinecraftRecipes = (event) => {
     event.smelting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_smelting_raw_gold').xp(0.7)
     event.blasting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_blasting_raw_gold').xp(0.7)
 
+    // Bucket
+    addWeldingRecipe(event, 
+        'tfg:recipes/anvil/vanilla_bucket',
+        { item: 'tfc:metal/bucket/red_steel' },
+        { item: 'tfc:metal/bucket/blue_steel' },
+        { item: 'minecraft:bucket' },
+        6
+    )
+
+    // Fire Charge
+    event.remove({ id: 'tfc:crafting/vanilla/fire_charge' })
+    event.shapeless('3x minecraft:fire_charge', [
+        '#forge:dusts/gunpowder',
+        '#minecraft:coals',
+        'tfc:firestarter'
+    ])
+
     // Стекло
     event.recipes.gtceu.alloy_smelter('glass')             
         .itemInputs('#forge:dusts/glass')

kubejs/server_scripts/tfc/data.js

@@ -3,12 +3,7 @@
 const registerTFCData = (event) => {
     registerAutoTFCItemHeats(event)
 
-    addItemHeat(
-        event, 
-        'compressed_coke_clay',
-        { item: 'gtceu:compressed_coke_clay' }, 
-        0.5
-    )
+    addItemHeat(event,  'compressed_coke_clay', { item: 'gtceu:compressed_coke_clay' }, 0.5)
 }
 
 const registerAutoTFCItemHeats = (event) => {

kubejs/server_scripts/tfc/tags.js

@@ -12,13 +12,6 @@ const registerTFCItemTags = (event) => {
         event.add('tfg:bladed_axles', `tfc:wood/bladed_axle/${woodType}`)
     })
 
-    event.remove('forge:dusts/iron', 'tfc:powder/limonite')
-    event.remove('forge:dusts/iron', 'tfc:powder/magnetite')
-    event.remove('forge:dusts/iron', 'tfc:powder/hematite')
-    event.remove('forge:dusts/copper', 'tfc:powder/malachite')
-    event.remove('forge:dusts/copper', 'tfc:powder/copper')
-    event.remove('forge:dusts/copper', 'tfc:powder/tetrahedrite')
-
     event.add('forge:ingots/double/bismuth', 'tfc:metal/double_ingot/bismuth')
     event.add('forge:ingots/double/bismuth_bronze', 'tfc:metal/double_ingot/bismuth_bronze')
     event.add('forge:ingots/double/black_bronze', 'tfc:metal/double_ingot/black_bronze')
@@ -63,12 +56,6 @@ const registerTFCItemTags = (event) => {
     event.add('tfc:corals', 'tfc:coral/fire_dead_coral')
     event.add('tfc:corals', 'tfc:coral/horn_dead_coral')
 
-    event.add('tfc:can_collapse', '#forge:tfc_stonetype_ore')
-    event.add('tfc:can_start_collapse', '#forge:tfc_stonetype_ore')
-    event.add('tfc:can_trigger_collapse', '#forge:tfc_stonetype_ore')
-    event.add('tfc:monster_spawns_on', '#forge:tfc_stonetype_ore')
-    event.add('tfc:prospectable', '#forge:tfc_stonetype_ore')
-
     global.TFC_STONE_TYPES.forEach(stoneTypeName => {
         global.TFC_ROCK_SLAB_BLOCK_TYPES.forEach(slabType => {
             event.add(`tfc:rock_slabs`, `tfc:rock/${slabType}/${stoneTypeName}_slab`)
@@ -77,6 +64,12 @@ const registerTFCItemTags = (event) => {
 }
 
 const registerTFCBlockTags = (event) => {
+    event.add('tfc:can_collapse', '#forge:tfc_stonetype_ore')
+    event.add('tfc:can_start_collapse', '#forge:tfc_stonetype_ore')
+    event.add('tfc:can_trigger_collapse', '#forge:tfc_stonetype_ore')
+    event.add('tfc:monster_spawns_on', '#forge:tfc_stonetype_ore')
+    event.add('tfc:prospectable', '#forge:tfc_stonetype_ore')
+
     event.add('tfc:glass_basin_blocks', 'gtceu:brass_block')
     event.add('tfc:glass_pouring_table', 'gtceu:brass_block')
 }

kubejs/startup_scripts/ad_astra/constants.js

@@ -0,0 +1,15 @@
+// priority: 0
+
+/**
+ * Список хранит предметы, 
+ * у которых должны быть удалены тэги и они должны быть скрыты в REI.
+ */
+global.AD_ASTRA_DISABLED_ITEMS = [
+    'ad_astra:steel_ingot', 
+    'ad_astra:steel_plate', 
+    'ad_astra:steel_nugget', 
+    'ad_astra:steel_door', 
+    'ad_astra:steel_trapdoor', 
+    'ad_astra:iron_plate',
+    'ad_astra:iron_rod'
+];

kubejs/startup_scripts/minecraft/constants.js

@@ -5,13 +5,19 @@
  * у которых должны быть удалены тэги и они должны быть скрыты в REI.
  */
 global.MINECRAFT_DISABLED_ITEMS = [
-    'minecraft:oak_wood', 
+
+    // Дерево
+    // Дуб
+    'minecraft:oak_wood',
+    'minecraft:oak_leaves',
+    'minecraft:oak_sapling',
     'minecraft:stripped_oak_wood', 
     'minecraft:oak_log', 
     'minecraft:stripped_oak_log', 
     'minecraft:oak_planks', 
     'minecraft:oak_stairs', 
     'minecraft:oak_slab', 
+    'minecraft:petrified_oak_slab',
     'minecraft:oak_pressure_plate', 
     'minecraft:oak_fence', 
     'minecraft:oak_fence_gate', 
@@ -23,12 +29,163 @@ global.MINECRAFT_DISABLED_ITEMS = [
     'minecraft:oak_hanging_sign', 
     'minecraft:oak_button',
 
+    // Темный дуб
+    'minecraft:dark_oak_planks',
+    'minecraft:dark_oak_sapling', 
+    'minecraft:dark_oak_log', 
+    'minecraft:stripped_dark_oak_log', 
+    'minecraft:stripped_dark_oak_wood', 
+    'minecraft:dark_oak_wood', 
+    'minecraft:dark_oak_leaves', 
+    'minecraft:dark_oak_slab', 
+    'minecraft:dark_oak_fence', 
+    'minecraft:dark_oak_stairs', 
+    'minecraft:dark_oak_button', 
+    'minecraft:dark_oak_pressure_plate', 
+    'minecraft:dark_oak_door', 
+    'minecraft:dark_oak_trapdoor',
+    'minecraft:dark_oak_fence_gate', 
+    'minecraft:dark_oak_boat', 
+    'minecraft:dark_oak_chest_boat', 
+    'minecraft:dark_oak_sign', 
+    'minecraft:dark_oak_hanging_sign',
+
+    // Acacia
+    'minecraft:acacia_planks', 
+    'minecraft:acacia_sapling', 
+    'minecraft:acacia_log', 
+    'minecraft:stripped_acacia_log', 
+    'minecraft:stripped_acacia_wood', 
+    'minecraft:acacia_wood', 
+    'minecraft:acacia_leaves', 
+    'minecraft:acacia_slab', 
+    'minecraft:acacia_fence', 
+    'minecraft:acacia_stairs', 
+    'minecraft:acacia_button', 
+    'minecraft:acacia_pressure_plate', 
+    'minecraft:acacia_door', 
+    'minecraft:acacia_trapdoor', 
+    'minecraft:acacia_fence_gate', 
+    'minecraft:acacia_boat', 
+    'minecraft:acacia_chest_boat', 
+    'minecraft:acacia_sign', 
+    'minecraft:acacia_hanging_sign',
+
+    // Birch
+    'minecraft:birch_planks', 
+    'minecraft:birch_sapling', 
+    'minecraft:birch_log', 
+    'minecraft:stripped_birch_log', 
+    'minecraft:stripped_birch_wood', 
+    'minecraft:birch_wood', 
+    'minecraft:birch_leaves', 
+    'minecraft:birch_slab', 
+    'minecraft:birch_fence', 
+    'minecraft:birch_stairs', 
+    'minecraft:birch_button', 
+    'minecraft:birch_pressure_plate', 
+    'minecraft:birch_door', 
+    'minecraft:birch_trapdoor', 
+    'minecraft:birch_fence_gate', 
+    'minecraft:birch_boat', 
+    'minecraft:birch_chest_boat', 
+    'minecraft:birch_sign', 
+    'minecraft:birch_hanging_sign',
+
+    // Jungle
+    'minecraft:jungle_planks', 
+    'minecraft:jungle_sapling', 
+    'minecraft:jungle_log', 
+    'minecraft:stripped_jungle_log', 
+    'minecraft:stripped_jungle_wood', 
+    'minecraft:jungle_wood', 
+    'minecraft:jungle_leaves', 
+    'minecraft:jungle_slab',
+    'minecraft:jungle_fence', 
+    'minecraft:jungle_stairs', 
+    'minecraft:jungle_button', 
+    'minecraft:jungle_pressure_plate', 
+    'minecraft:jungle_door', 
+    'minecraft:jungle_trapdoor', 
+    'minecraft:jungle_fence_gate', 
+    'minecraft:jungle_boat', 
+    'minecraft:jungle_chest_boat', 
+    'minecraft:jungle_sign', 
+    'minecraft:jungle_hanging_sign',
+
+    // Spruce
+    'minecraft:spruce_planks', 
+    'minecraft:spruce_sapling', 
+    'minecraft:spruce_log', 
+    'minecraft:stripped_spruce_log', 
+    'minecraft:stripped_spruce_wood', 
+    'minecraft:spruce_wood', 
+    'minecraft:spruce_leaves', 
+    'minecraft:spruce_slab', 
+    'minecraft:spruce_fence', 
+    'minecraft:spruce_stairs', 
+    'minecraft:spruce_button', 
+    'minecraft:spruce_pressure_plate', 
+    'minecraft:spruce_door', 
+    'minecraft:spruce_trapdoor', 
+    'minecraft:spruce_fence_gate', 
+    'minecraft:spruce_boat', 
+    'minecraft:spruce_chest_boat', 
+    'minecraft:spruce_sign', 
+    'minecraft:spruce_hanging_sign',
+
+    // Cherry
+    'minecraft:cherry_planks', 
+    'minecraft:cherry_sapling', 
+    'minecraft:cherry_log', 
+    'minecraft:stripped_cherry_log', 
+    'minecraft:stripped_cherry_wood', 
+    'minecraft:cherry_wood', 
+    'minecraft:cherry_leaves', 
+    'minecraft:cherry_slab', 
+    'minecraft:cherry_fence', 
+    'minecraft:cherry_stairs', 
+    'minecraft:cherry_button', 
+    'minecraft:cherry_pressure_plate', 
+    'minecraft:cherry_door', 
+    'minecraft:cherry_trapdoor', 
+    'minecraft:cherry_fence_gate', 
+    'minecraft:cherry_boat', 
+    'minecraft:cherry_chest_boat', 
+    'minecraft:cherry_sign', 
+    'minecraft:cherry_hanging_sign',
+
+    // Mangrove
+    'minecraft:mangrove_planks', 
+    'minecraft:mangrove_propagule', 
+    'minecraft:mangrove_log', 
+    'minecraft:mangrove_roots', 
+    'minecraft:muddy_mangrove_roots', 
+    'minecraft:stripped_mangrove_log', 
+    'minecraft:stripped_mangrove_wood', 
+    'minecraft:mangrove_wood', 
+    'minecraft:mangrove_leaves', 
+    'minecraft:mangrove_slab', 
+    'minecraft:mangrove_fence', 
+    'minecraft:mangrove_stairs',
+    'minecraft:mangrove_button', 
+    'minecraft:mangrove_pressure_plate', 
+    'minecraft:mangrove_door', 
+    'minecraft:mangrove_trapdoor', 
+    'minecraft:mangrove_fence_gate', 
+    'minecraft:mangrove_boat', 
+    'minecraft:mangrove_chest_boat', 
+    'minecraft:mangrove_sign', 
+    'minecraft:mangrove_hanging_sign',
+
     // Other
     'minecraft:bookshelf',
     'minecraft:chiseled_bookshelf',
     'minecraft:sand',
     'minecraft:suspicious_sand',
     'minecraft:red_sand',
+    'minecraft:chest',
+    'minecraft:trapped_chest',
     
     'minecraft:wheat',
     'minecraft:composter',
@@ -183,4 +340,4 @@ global.MINECRAFT_FORGE_DYE = [
     'minecraft:sand',
     'minecraft:chest',
     'minecraft:trapped_chest',
-];*/
+];*/

kubejs/startup_scripts/tfc/constants.js

@@ -229,9 +229,17 @@ global.TFC_TOOL_GEN = [
 /**
  * Указывает, что у этого металла есть ведро.
  */
-global.TFC_BUCKET_GEN = [
-    "bucket",
-];
+global.TFC_BUCKET_GEN = ["bucket"];
+
+/**
+ * Указывает, что у этого металла есть чистый кусок (тфк штука).
+ */
+global.TFC_SMALL_NATIVE_ORE_GEN = ["small_native_ore"];
+
+/**
+ * Указывает, что у этого металла есть кусок (тфк штука).
+ */
+global.TFC_SMALL_ORE_GEN = ["small_ore"];
 
 global.ITEM_TAG_TO_HEAT = {
     nugget: {
@@ -457,6 +465,32 @@ global.ITEM_TAG_TO_HEAT = {
         },
     },
 
+    small_native_ore: {
+        heat_capacity: 0.869,
+        metal_amount: {
+            default: 12
+        },
+        input: (name) => {
+            return { item: `tfc:ore/small_native_${name}` };
+        },
+        output: (name) => {
+            return { item: `tfc:ore/small_native_${name}` };
+        },
+    },
+
+    small_ore: {
+        heat_capacity: 0.869,
+        metal_amount: {
+            default: 12
+        },
+        input: (name) => {
+            return { item: `tfc:ore/small_${name}` };
+        },
+        output: (name) => {
+            return { item: `tfc:ore/small_${name}` };
+        },
+    },
+
     block_slab: { heat_capacity: null }, // can't melt
     block_stairs: { heat_capacity: null }, // can't melt
 
@@ -1138,6 +1172,14 @@ global.ITEM_TAG_TO_HEAT = {
 };
 
 global.METAL_TO_SPECS = {
+    bismuthinite: {
+        forging_temp: 162,
+        welding_temp: 216,
+        melt_temp: 270,
+        fluidName: "gtceu:bismuth",
+        tier: 1,
+        props: global.TFC_SMALL_ORE_GEN,
+    },
     bismuth: {
         forging_temp: 162,
         welding_temp: 216,
@@ -1173,7 +1215,8 @@ global.METAL_TO_SPECS = {
             global.NUGGET_GEN,
             global.DUST_GEN,
             global.ORE_GEN,
-            global.PART_GEN
+            global.PART_GEN,
+            global.TFC_SMALL_NATIVE_ORE_GEN
         ),
     },
     nickel: {
@@ -1211,7 +1254,8 @@ global.METAL_TO_SPECS = {
             global.NUGGET_GEN,
             global.DUST_GEN,
             global.ORE_GEN,
-            global.PART_GEN
+            global.PART_GEN,
+            global.TFC_SMALL_NATIVE_ORE_GEN
         ),
     },
     tin: {
@@ -1262,7 +1306,8 @@ global.METAL_TO_SPECS = {
             global.ARMOR_GEN,
             global.GT_TOOL_GEN,
             global.TFC_TOOL_GEN,
-            global.UTILITY_GEN
+            global.UTILITY_GEN,
+            global.TFC_SMALL_NATIVE_ORE_GEN
         ),
     },
     bismuth_bronze: {
@@ -1506,7 +1551,7 @@ global.METAL_TO_SPECS = {
         melt_temp: 230,
         fluidName: "gtceu:tin",
         tier: 1,
-        props: [].concat(global.DUST_GEN, global.ORE_GEN),
+        props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN),
     },
     garnierite: {
         forging_temp: 138,
@@ -1514,7 +1559,7 @@ global.METAL_TO_SPECS = {
         melt_temp: 1453,
         fluidName: "gtceu:nickel",
         tier: 1,
-        props: [].concat(global.DUST_GEN, global.ORE_GEN),
+        props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN),
     },
     hematite: {
         forging_temp: 921,
@@ -1522,7 +1567,7 @@ global.METAL_TO_SPECS = {
         melt_temp: 1535,
         fluidName: "gtceu:iron",
         tier: 3,
-        props: [].concat(global.DUST_GEN, global.ORE_GEN),
+        props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN),
     },
     yellow_limonite: {
         forging_temp: 921,
@@ -1532,13 +1577,21 @@ global.METAL_TO_SPECS = {
         tier: 3,
         props: [].concat(global.DUST_GEN, global.ORE_GEN),
     },
+    limonite: {
+        forging_temp: 921,
+        welding_temp: 1228,
+        melt_temp: 1535,
+        fluidName: "gtceu:iron",
+        tier: 3,
+        props: [].concat(global.TFC_SMALL_ORE_GEN),
+    },
     magnetite: {
         forging_temp: 138,
         welding_temp: 184,
         melt_temp: 1535,
         fluidName: "gtceu:iron",
         tier: 3,
-        props: [].concat(global.DUST_GEN, global.ORE_GEN),
+        props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN),
     },
     malachite: {
         forging_temp: 138,
@@ -1546,7 +1599,7 @@ global.METAL_TO_SPECS = {
         melt_temp: 1080,
         fluidName: "gtceu:copper",
         tier: 1,
-        props: [].concat(global.DUST_GEN, global.ORE_GEN),
+        props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN),
     },
     pyrite: {
         forging_temp: 921,
@@ -1562,7 +1615,7 @@ global.METAL_TO_SPECS = {
         melt_temp: 420,
         fluidName: "gtceu:zinc",
         tier: 1,
-        props: [].concat(global.DUST_GEN, global.ORE_GEN),
+        props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN),
     },
     tetrahedrite: {
         forging_temp: 138,
@@ -1570,7 +1623,7 @@ global.METAL_TO_SPECS = {
         melt_temp: 1080,
         fluidName: "gtceu:copper",
         tier: 1,
-        props: [].concat(global.DUST_GEN, global.ORE_GEN),
+        props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN),
     },
     chalcopyrite: {
         forging_temp: 648,

manifest.json

@@ -15,8 +15,243 @@
   "author": "Exception, Xikaro",
   "files": [
     {
-      "projectID": 302973,
-      "fileID": 4895012,
+      "projectID": 912469,
+      "fileID": 4910372,
+      "required": true
+    },
+    {
+      "projectID": 475117,
+      "fileID": 4711435,
+      "required": true
+    },
+    {
+      "projectID": 283644,
+      "fileID": 4879089,
+      "required": true
+    },
+    {
+      "projectID": 551736,
+      "fileID": 4731947,
+      "required": true
+    },
+    {
+      "projectID": 908983,
+      "fileID": 4865171,
+      "required": true
+    },
+    {
+      "projectID": 270441,
+      "fileID": 4578892,
+      "required": true
+    },
+    {
+      "projectID": 326652,
+      "fileID": 4795348,
+      "required": true
+    },
+    {
+      "projectID": 704113,
+      "fileID": 4831434,
+      "required": true
+    },
+    {
+      "projectID": 581495,
+      "fileID": 4767500,
+      "required": true
+    },
+    {
+      "projectID": 351441,
+      "fileID": 4613538,
+      "required": true
+    },
+    {
+      "projectID": 282001,
+      "fileID": 4870180,
+      "required": true
+    },
+    {
+      "projectID": 312664,
+      "fileID": 4745380,
+      "required": true
+    },
+    {
+      "projectID": 365281,
+      "fileID": 4612683,
+      "required": true
+    },
+    {
+      "projectID": 511770,
+      "fileID": 4606615,
+      "required": true
+    },
+    {
+      "projectID": 618298,
+      "fileID": 4882572,
+      "required": true
+    },
+    {
+      "projectID": 348521,
+      "fileID": 4633444,
+      "required": true
+    },
+    {
+      "projectID": 309927,
+      "fileID": 4910911,
+      "required": true
+    },
+    {
+      "projectID": 387638,
+      "fileID": 4691333,
+      "required": true
+    },
+    {
+      "projectID": 636608,
+      "fileID": 4784626,
+      "required": true
+    },
+    {
+      "projectID": 790626,
+      "fileID": 4862982,
+      "required": true
+    },
+    {
+      "projectID": 635042,
+      "fileID": 4894852,
+      "required": true
+    },
+    {
+      "projectID": 844019,
+      "fileID": 4893142,
+      "required": true
+    },
+    {
+      "projectID": 314905,
+      "fileID": 4596742,
+      "required": true
+    },
+    {
+      "projectID": 448233,
+      "fileID": 4763645,
+      "required": true
+    },
+    {
+      "projectID": 433760,
+      "fileID": 4573913,
+      "required": true
+    },
+    {
+      "projectID": 459929,
+      "fileID": 4907335,
+      "required": true
+    },
+    {
+      "projectID": 927874,
+      "fileID": 4900788,
+      "required": true
+    },
+    {
+      "projectID": 513402,
+      "fileID": 4911974,
+      "required": true
+    },
+    {
+      "projectID": 317780,
+      "fileID": 4905653,
+      "required": true
+    },
+    {
+      "projectID": 916493,
+      "fileID": 4797195,
+      "required": true
+    },
+    {
+      "projectID": 257814,
+      "fileID": 4874915,
+      "required": true
+    },
+    {
+      "projectID": 286924,
+      "fileID": 4801419,
+      "required": true
+    },
+    {
+      "projectID": 634062,
+      "fileID": 4610474,
+      "required": true
+    },
+    {
+      "projectID": 416294,
+      "fileID": 4847655,
+      "required": true
+    },
+    {
+      "projectID": 308240,
+      "fileID": 4820041,
+      "required": true
+    },
+    {
+      "projectID": 422301,
+      "fileID": 4882589,
+      "required": true
+    },
+    {
+      "projectID": 823106,
+      "fileID": 4906217,
+      "required": true
+    },
+    {
+      "projectID": 263420,
+      "fileID": 4905607,
+      "required": true
+    },
+    {
+      "projectID": 324717,
+      "fileID": 4801177,
+      "required": true
+    },
+    {
+      "projectID": 570073,
+      "fileID": 4903912,
+      "required": true
+    },
+    {
+      "projectID": 272335,
+      "fileID": 4906607,
+      "required": true
+    },
+    {
+      "projectID": 908741,
+      "fileID": 4894282,
+      "required": true
+    },
+    {
+      "projectID": 551894,
+      "fileID": 4688940,
+      "required": true
+    },
+    {
+      "projectID": 583345,
+      "fileID": 4848425,
+      "required": true
+    },
+    {
+      "projectID": 60089,
+      "fileID": 4581240,
+      "required": true
+    },
+    {
+      "projectID": 232131,
+      "fileID": 4635878,
+      "required": true
+    },
+    {
+      "projectID": 404468,
+      "fileID": 4623116,
+      "required": true
+    },
+    {
+      "projectID": 401648,
+      "fileID": 4863626,
       "required": true
     },
     {
@@ -30,8 +265,8 @@
       "required": true
     },
     {
-      "projectID": 270441,
-      "fileID": 4578892,
+      "projectID": 714059,
+      "fileID": 4683092,
       "required": true
     },
     {
@@ -40,143 +275,8 @@
       "required": true
     },
     {
-      "projectID": 583345,
-      "fileID": 4848425,
-      "required": true
-    },
-    {
-      "projectID": 257814,
-      "fileID": 4874915,
-      "required": true
-    },
-    {
-      "projectID": 365281,
-      "fileID": 4612683,
-      "required": true
-    },
-    {
-      "projectID": 237307,
-      "fileID": 4600191,
-      "required": true
-    },
-    {
-      "projectID": 326652,
-      "fileID": 4795348,
-      "required": true
-    },
-    {
-      "projectID": 688231,
-      "fileID": 4836196,
-      "required": true
-    },
-    {
-      "projectID": 908741,
-      "fileID": 4894282,
-      "required": true
-    },
-    {
-      "projectID": 513402,
-      "fileID": 4903341,
-      "required": true
-    },
-    {
-      "projectID": 823106,
-      "fileID": 4631831,
-      "required": true
-    },
-    {
-      "projectID": 475117,
-      "fileID": 4711435,
-      "required": true
-    },
-    {
-      "projectID": 416294,
-      "fileID": 4847655,
-      "required": true
-    },
-    {
-      "projectID": 317780,
-      "fileID": 4812594,
-      "required": true
-    },
-    {
-      "projectID": 419699,
-      "fileID": 4663010,
-      "required": true
-    },
-    {
-      "projectID": 387638,
-      "fileID": 4691333,
-      "required": true
-    },
-    {
-      "projectID": 268387,
-      "fileID": 4825810,
-      "required": true
-    },
-    {
-      "projectID": 422301,
-      "fileID": 4882589,
-      "required": true
-    },
-    {
-      "projectID": 448233,
-      "fileID": 4763645,
-      "required": true
-    },
-    {
-      "projectID": 410811,
-      "fileID": 4896152,
-      "required": true
-    },
-    {
-      "projectID": 401648,
-      "fileID": 4863626,
-      "required": true
-    },
-    {
-      "projectID": 328085,
-      "fileID": 4835191,
-      "required": true
-    },
-    {
-      "projectID": 790626,
-      "fileID": 4862982,
-      "required": true
-    },
-    {
-      "projectID": 286924,
-      "fileID": 4801419,
-      "required": true
-    },
-    {
-      "projectID": 880532,
-      "fileID": 4895948,
-      "required": true
-    },
-    {
-      "projectID": 260262,
-      "fileID": 4581167,
-      "required": true
-    },
-    {
-      "projectID": 654373,
-      "fileID": 4873766,
-      "required": true
-    },
-    {
-      "projectID": 912469,
-      "fileID": 4825750,
-      "required": true
-    },
-    {
-      "projectID": 223794,
-      "fileID": 4857895,
-      "required": true
-    },
-    {
-      "projectID": 354353,
-      "fileID": 4891706,
+      "projectID": 881248,
+      "fileID": 4874233,
       "required": true
     },
     {
@@ -185,203 +285,13 @@
       "required": true
     },
     {
-      "projectID": 940350,
-      "fileID": 4903135,
+      "projectID": 410811,
+      "fileID": 4896152,
       "required": true
     },
     {
-      "projectID": 714059,
-      "fileID": 4683092,
-      "required": true
-    },
-    {
-      "projectID": 551736,
-      "fileID": 4731947,
-      "required": true
-    },
-    {
-      "projectID": 570630,
-      "fileID": 4771655,
-      "required": true
-    },
-    {
-      "projectID": 306770,
-      "fileID": 4892162,
-      "required": true
-    },
-    {
-      "projectID": 635042,
-      "fileID": 4894852,
-      "required": true
-    },
-    {
-      "projectID": 429235,
-      "fileID": 4810975,
-      "required": true
-    },
-    {
-      "projectID": 238086,
-      "fileID": 4878381,
-      "required": true
-    },
-    {
-      "projectID": 450659,
-      "fileID": 4645815,
-      "required": true
-    },
-    {
-      "projectID": 844019,
-      "fileID": 4893142,
-      "required": true
-    },
-    {
-      "projectID": 927874,
-      "fileID": 4900788,
-      "required": true
-    },
-    {
-      "projectID": 908983,
-      "fileID": 4865171,
-      "required": true
-    },
-    {
-      "projectID": 511770,
-      "fileID": 4606615,
-      "required": true
-    },
-    {
-      "projectID": 495476,
-      "fileID": 4882383,
-      "required": true
-    },
-    {
-      "projectID": 292038,
-      "fileID": 4594106,
-      "required": true
-    },
-    {
-      "projectID": 704113,
-      "fileID": 4831434,
-      "required": true
-    },
-    {
-      "projectID": 357540,
-      "fileID": 4699629,
-      "required": true
-    },
-    {
-      "projectID": 916493,
-      "fileID": 4797195,
-      "required": true
-    },
-    {
-      "projectID": 459929,
-      "fileID": 4896301,
-      "required": true
-    },
-    {
-      "projectID": 60089,
-      "fileID": 4581240,
-      "required": true
-    },
-    {
-      "projectID": 570073,
-      "fileID": 4851864,
-      "required": true
-    },
-    {
-      "projectID": 404468,
-      "fileID": 4623116,
-      "required": true
-    },
-    {
-      "projectID": 521393,
-      "fileID": 4837449,
-      "required": true
-    },
-    {
-      "projectID": 312664,
-      "fileID": 4745380,
-      "required": true
-    },
-    {
-      "projectID": 309674,
-      "fileID": 4838266,
-      "required": true
-    },
-    {
-      "projectID": 348521,
-      "fileID": 4633444,
-      "required": true
-    },
-    {
-      "projectID": 433760,
-      "fileID": 4573913,
-      "required": true
-    },
-    {
-      "projectID": 531761,
-      "fileID": 4757228,
-      "required": true
-    },
-    {
-      "projectID": 299540,
-      "fileID": 4711441,
-      "required": true
-    },
-    {
-      "projectID": 272335,
-      "fileID": 4825638,
-      "required": true
-    },
-    {
-      "projectID": 297038,
-      "fileID": 4894705,
-      "required": true
-    },
-    {
-      "projectID": 618298,
-      "fileID": 4882572,
-      "required": true
-    },
-    {
-      "projectID": 263420,
-      "fileID": 4812568,
-      "required": true
-    },
-    {
-      "projectID": 324717,
-      "fileID": 4801177,
-      "required": true
-    },
-    {
-      "projectID": 251407,
-      "fileID": 4751740,
-      "required": true
-    },
-    {
-      "projectID": 254284,
-      "fileID": 4887789,
-      "required": true
-    },
-    {
-      "projectID": 551894,
-      "fileID": 4688940,
-      "required": true
-    },
-    {
-      "projectID": 881248,
-      "fileID": 4874233,
-      "required": true
-    },
-    {
-      "projectID": 581495,
-      "fileID": 4767500,
-      "required": true
-    },
-    {
-      "projectID": 283644,
-      "fileID": 4879089,
+      "projectID": 260262,
+      "fileID": 4581167,
       "required": true
     },
     {
@@ -389,29 +299,104 @@
       "fileID": 4776833,
       "required": true
     },
+    {
+      "projectID": 880532,
+      "fileID": 4895948,
+      "required": true
+    },
     {
       "projectID": 288885,
       "fileID": 4711423,
       "required": true
     },
     {
-      "projectID": 634062,
-      "fileID": 4610474,
+      "projectID": 237307,
+      "fileID": 4600191,
       "required": true
     },
     {
-      "projectID": 308240,
-      "fileID": 4820041,
+      "projectID": 570630,
+      "fileID": 4771655,
       "required": true
     },
     {
-      "projectID": 435044,
-      "fileID": 4596768,
+      "projectID": 419699,
+      "fileID": 4663010,
       "required": true
     },
     {
-      "projectID": 310111,
-      "fileID": 4834408,
+      "projectID": 299540,
+      "fileID": 4711441,
+      "required": true
+    },
+    {
+      "projectID": 495476,
+      "fileID": 4882383,
+      "required": true
+    },
+    {
+      "projectID": 223794,
+      "fileID": 4857895,
+      "required": true
+    },
+    {
+      "projectID": 429235,
+      "fileID": 4810975,
+      "required": true
+    },
+    {
+      "projectID": 688231,
+      "fileID": 4836196,
+      "required": true
+    },
+    {
+      "projectID": 297038,
+      "fileID": 4894705,
+      "required": true
+    },
+    {
+      "projectID": 309674,
+      "fileID": 4838266,
+      "required": true
+    },
+    {
+      "projectID": 238086,
+      "fileID": 4878381,
+      "required": true
+    },
+    {
+      "projectID": 328085,
+      "fileID": 4835191,
+      "required": true
+    },
+    {
+      "projectID": 306770,
+      "fileID": 4892162,
+      "required": true
+    },
+    {
+      "projectID": 292038,
+      "fileID": 4594106,
+      "required": true
+    },
+    {
+      "projectID": 521393,
+      "fileID": 4837449,
+      "required": true
+    },
+    {
+      "projectID": 357540,
+      "fileID": 4699629,
+      "required": true
+    },
+    {
+      "projectID": 940350,
+      "fileID": 4903135,
+      "required": true
+    },
+    {
+      "projectID": 268387,
+      "fileID": 4825810,
       "required": true
     },
     {
@@ -420,28 +405,8 @@
       "required": true
     },
     {
-      "projectID": 282001,
-      "fileID": 4870180,
-      "required": true
-    },
-    {
-      "projectID": 351441,
-      "fileID": 4613538,
-      "required": true
-    },
-    {
-      "projectID": 309927,
-      "fileID": 4902130,
-      "required": true
-    },
-    {
-      "projectID": 636608,
-      "fileID": 4784626,
-      "required": true
-    },
-    {
-      "projectID": 232131,
-      "fileID": 4635878,
+      "projectID": 310111,
+      "fileID": 4834408,
       "required": true
     },
     {
@@ -450,19 +415,54 @@
       "required": true
     },
     {
-      "projectID": 289412,
-      "fileID": 4872462,
+      "projectID": 254284,
+      "fileID": 4887789,
       "required": true
     },
     {
-      "projectID": 314905,
-      "fileID": 4596742,
+      "projectID": 450659,
+      "fileID": 4645815,
+      "required": true
+    },
+    {
+      "projectID": 354353,
+      "fileID": 4891706,
+      "required": true
+    },
+    {
+      "projectID": 654373,
+      "fileID": 4873766,
+      "required": true
+    },
+    {
+      "projectID": 251407,
+      "fileID": 4751740,
+      "required": true
+    },
+    {
+      "projectID": 302973,
+      "fileID": 4895012,
+      "required": true
+    },
+    {
+      "projectID": 531761,
+      "fileID": 4757228,
+      "required": true
+    },
+    {
+      "projectID": 435044,
+      "fileID": 4596768,
       "required": true
     },
     {
       "projectID": 633412,
       "fileID": 4685319,
       "required": true
+    },
+    {
+      "projectID": 289412,
+      "fileID": 4872462,
+      "required": true
     }
   ],
   "overrides": "overrides"

modlist.html

@@ -1,92 +1,92 @@
 <ul>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft">TerraFirmaCraft (by Dries007)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/konkrete">Konkrete [Forge] (by Keksuccino)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern">GregTechCEu Modern (by KilaBash)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/itemphysic-lite">ItemPhysic Lite (by CreativeMD)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/inventory-sorter">Inventory Sorter (by cpw)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/jade-addons">Jade Addons (Forge) (by Snownee)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/creativecore">CreativeCore (by CreativeMD)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/serverconfig-updater">ServerConfig Updater (by Darkere)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/cosmetic-armor-reworked">Cosmetic Armor Reworked (by LainMI)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/cupboard">Cupboard (by someaddon)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/create-steam-n-rails">Create: Steam 'n' Rails (by mattentosh)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/embeddium">Embeddium (by embeddedt)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmagreg-mod">TerraFirmaGreg (by Exception)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/blur-forge">Blur (Forge) (by dimadencep)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastsuite">FastSuite (by Shadows_of_Fire)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/rhino">Rhino (by LatvianModder)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/xaeros-world-map">Xaero's World Map (by xaero96)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/architectury-api">Architectury API (Fabric/Forge) (by shedaniel)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/more-red">More Red (by Commoble)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/extended-crafting">Extended Crafting (by BlakeBr0)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/sophisticated-backpacks">Sophisticated Backpacks (by P3pp3rF1y)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/entityculling">Entity Culling Fabric/Forge (by tr7zw)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-essentials-forge">FTB Essentials (Forge & Fabric) (by FTB)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/betterf3">BetterF3 (by cominixo)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/create">Create (by simibubi)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/modernfix">ModernFix (by embeddedt)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/customskinloader">CustomSkinLoader (by xfl03)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/tfc-aged-alcohol">TFC Aged Alcohol (by HermitOwO)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/tool-belt">Tool Belt (by gigaherz)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/rubidium-extra">Rubidium Extra (by dimadencep)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-quests-optimizer">FTB Quests Optimizer (by big_energy)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2">Applied Energistics 2 (by thetechnici4n)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/water-flasks">TFC Water Flasks (by gaelmare)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-library-forge">FTB Library (Forge) (by FTB)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/tfc-ambiental-second-edition">TFC Ambiental: Second edition (by LobsterJonn)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/resourceful-config">Resourceful Config (by ThatGravyBoat)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastsuite">FastSuite (by Shadows_of_Fire)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/placebo">Placebo (by Shadows_of_Fire)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/dynamiclights-reforged">Magnesium/Rubidium Dynamic Lights (by Anthxny)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/lootjs">LootJS: KubeJS Addon (by Lytho)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/patchouli">Patchouli (by Vazkii)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ad-astra">Ad Astra (by AlexNijjar)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ferritecore">FerriteCore (Forge) (by malte0811)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/kubejs">KubeJS (by LatvianModder)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/small-ships">Small Ships [Fabric & Forge] (by talhanation)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/astikor-carts-tfc">Astikor Carts TFC (by Verph)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/treetap">Tree Tap (by LobsterJonn)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/macaws-for-terrafirmacraft">All-In-One, Macaw's Mods for TerraFirmaCraft (by ArcWolfGaming)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/drippy-loading-screen">Drippy Loading Screen [Forge] (by Keksuccino)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/puzzles-lib">Puzzles Lib [Forge & Fabric] (by Fuzs)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/better-ping-display">Better Ping Display (by Quintinity)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/itemphysic-lite">ItemPhysic Lite (by CreativeMD)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cupboard">Cupboard (by someaddon)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/botarium">Botarium (by CodexAdrian)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/inventory-hud-forge">Inventory HUD+ (by dmitrylovin)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/astikor-carts-redux">AstikorCarts Redux (by jusipat)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2-wireless-terminals">Applied Energistics 2 Wireless Terminals (by Mari_023)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/mouse-tweaks">Mouse Tweaks (by YaLTeR)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/resourceful-lib">Resourceful Lib (by ThatGravyBoat)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-teams-forge">FTB Teams (Forge) (by FTB)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items-hacks">REI Plugin Compatibilities (REIPC) (by shedaniel)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/oculus">Oculus (by Asek3)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/pick-up-notifier">Pick Up Notifier [Forge & Fabric] (by Fuzs)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cc-tweaked">CC: Tweaked (by SquidDev)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/simple-login">Simple Login (by seraph_jack)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/item-filters">Item Filters (by LatvianModder)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/cloth-config">Cloth Config API (Fabric/Forge) (by shedaniel)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/not-enough-animations">Not Enough Animations (by tr7zw)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/balm">Balm (Forge Edition) (by BlayTheNinth)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastfurnace">FastFurnace (by Shadows_of_Fire)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/cucumber">Cucumber Library (by BlakeBr0)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/craftpresence">CraftPresence (by CDAGaming_)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/serverconfig-updater">ServerConfig Updater (by Darkere)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/drippy-loading-screen">Drippy Loading Screen [Forge] (by Keksuccino)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/sophisticated-core">Sophisticated Core (by P3pp3rF1y)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cloth-config">Cloth Config API (Fabric/Forge) (by shedaniel)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/curios">Curios API (Forge) (by TheIllusiveC4)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/more-red">More Red (by Commoble)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/open-parties-and-claims">Open Parties and Claims (by xaero96)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/modernfix">ModernFix (by embeddedt)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ad-astra">Ad Astra (by AlexNijjar)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/astikor-carts-tfc">Astikor Carts TFC (by Verph)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-ranks-forge">FTB Ranks (Forge) (by FTB)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/entityculling">Entity Culling Fabric/Forge (by tr7zw)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/not-enough-animations">Not Enough Animations (by tr7zw)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2-wireless-terminals">Applied Energistics 2 Wireless Terminals (by Mari_023)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/treetap">Tree Tap (by LobsterJonn)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmagreg-mod">TerraFirmaGreg (by Exception)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/xaeros-world-map">Xaero's World Map (by xaero96)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/astikor-carts-redux">AstikorCarts Redux (by jusipat)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/creativecore">CreativeCore (by CreativeMD)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/customskinloader">CustomSkinLoader (by xfl03)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/no-chat-reports">No Chat Reports (by Aizistral)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/rhino">Rhino (by LatvianModder)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cherished-worlds">Cherished Worlds (Fabric/Forge/Quilt) (by TheIllusiveC4)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/sophisticated-backpacks">Sophisticated Backpacks (by P3pp3rF1y)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/blur-forge">Blur (Forge) (by dimadencep)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/xaeros-minimap">Xaero's Minimap (by xaero96)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/jade">Jade 🔍 (by Snownee)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/client-tweaks">Client Tweaks (by BlayTheNinth)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ambientsounds">AmbientSounds 5 (by CreativeMD)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/resourceful-lib">Resourceful Lib (by ThatGravyBoat)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cucumber">Cucumber Library (by BlakeBr0)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/embeddium">Embeddium (by embeddedt)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/better-compatibility-checker">Better Compatibility Checker (by Gaz_)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmaships">TerraFirmaShips (by w8b40t)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/oculus">Oculus (by Asek3)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/placebo">Placebo (by Shadows_of_Fire)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/fancymenu-forge">FancyMenu [Forge] (by Keksuccino)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastworkbench">FastWorkbench (by Shadows_of_Fire)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/no-chat-reports">No Chat Reports (by Aizistral)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/cherished-worlds">Cherished Worlds (Fabric/Forge/Quilt) (by TheIllusiveC4)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/better-third-person">Better Third Person (by Socolio)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items">Roughly Enough Items Fabric/Forge (REI) (by shedaniel)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/farsight">Farsight [Forge] (by someaddon)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/cc-tweaked">CC: Tweaked (by SquidDev)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/pick-up-notifier">Pick Up Notifier [Forge & Fabric] (by Fuzs)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/curios">Curios API (Forge) (by TheIllusiveC4)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/open-parties-and-claims">Open Parties and Claims (by xaero96)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/jade-addons">Jade Addons (Forge) (by Snownee)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/mouse-tweaks">Mouse Tweaks (by YaLTeR)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/default-options">Default Options (by BlayTheNinth)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-teams-forge">FTB Teams (Forge) (by FTB)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/betterf3">BetterF3 (by cominixo)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/konkrete">Konkrete [Forge] (by Keksuccino)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern">GregTechCEu Modern (by KilaBash)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/resourceful-config">Resourceful Config (by ThatGravyBoat)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/inventory-sorter">Inventory Sorter (by cpw)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmaships">TerraFirmaShips (by w8b40t)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-library-forge">FTB Library (Forge) (by FTB)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-essentials-forge">FTB Essentials (Forge & Fabric) (by FTB)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/tool-belt">Tool Belt (by gigaherz)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/fancymenu-forge">FancyMenu [Forge] (by Keksuccino)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/tfc-aged-alcohol">TFC Aged Alcohol (by HermitOwO)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastworkbench">FastWorkbench (by Shadows_of_Fire)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cosmetic-armor-reworked">Cosmetic Armor Reworked (by LainMI)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/lootjs">LootJS: KubeJS Addon (by Lytho)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/architectury-api">Architectury API (Fabric/Forge) (by shedaniel)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastfurnace">FastFurnace (by Shadows_of_Fire)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/puzzles-lib">Puzzles Lib [Forge & Fabric] (by Fuzs)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2">Applied Energistics 2 (by thetechnici4n)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ferritecore">FerriteCore (Forge) (by malte0811)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/create-steam-n-rails">Create: Steam 'n' Rails (by mattentosh)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/craftpresence">CraftPresence (by CDAGaming_)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/item-filters">Item Filters (by LatvianModder)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/kubejs">KubeJS (by LatvianModder)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/create">Create (by simibubi)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/patchouli">Patchouli (by Vazkii)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/better-ping-display">Better Ping Display (by Quintinity)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items-hacks">REI Plugin Compatibilities (REIPC) (by shedaniel)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/inventory-hud-forge">Inventory HUD+ (by dmitrylovin)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/tfc-ambiental-second-edition">TFC Ambiental: Second edition (by LobsterJonn)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/extended-crafting">Extended Crafting (by BlakeBr0)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/farsight">Farsight [Forge] (by someaddon)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items">Roughly Enough Items Fabric/Forge (REI) (by shedaniel)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/corpse">Corpse (by henkelmax)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-quests-forge">FTB Quests (Forge) (by FTB)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-ranks-forge">FTB Ranks (Forge) (by FTB)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ambientsounds">AmbientSounds 5 (by CreativeMD)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/small-ships">Small Ships [Fabric & Forge] (by talhanation)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/water-flasks">TFC Water Flasks (by gaelmare)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/rubidium-extra">Rubidium Extra (by dimadencep)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/client-tweaks">Client Tweaks (by BlayTheNinth)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft">TerraFirmaCraft (by Dries007)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/balm">Balm (Forge Edition) (by BlayTheNinth)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/better-third-person">Better Third Person (by Socolio)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/smooth-boot-reloaded">Smooth Boot (Reloaded) (by AbdElAziz333)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-quests-forge">FTB Quests (Forge) (by FTB)</a></li>
 </ul>