Merge branch 'main' into mod-ae2-recipes

2023-12-11 20:18:05 +07:00 · 2023-12-11 20:18:05 +07:00 · dc5ff62a26
commit dc5ff62a26
parent 4b3e169452 761e5aba4e
842 changed files with 8892 additions and 19309 deletions
--- a/.gitignore
+++ b/.gitignore
@ -46,3 +46,4 @@ config/smoothboot.json
 .curseclient
 knownkeys.txt
 *.code-workspace
+mods/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,7 +1,64 @@
 # Changelog

+## [0.2.0] - 2023-12-11
+### Изменения
+- Исправлены баги, когда некоторые предметы имеющие металл нельзя было нагреть.
+- Исправлен баг, когда некоторые тфк предметы не могли быть нагреты.
+- Переписаы рецепты WaterFlasks.
+- Переписаны рецепты ToolBelt.
+- Удалена жила Sylvite.
+- Множеству предметов GT добавлены статы удобрений тфк, теперь ими можно удобрять землю вместо Sylvite.
+- Исправлены множественные проблемы с рецептами ковки, сварки, нагрева.
+- Исправлен баг, когда вещи из кованного железа можно было пережарить в кованое железо.
+- Добавлены рецепты раскрафта из тфк рыбы в рыбье масло.
+- Добавлены рецепты раскрафта из тфк семян в семянное масло.
+- Исправлены все рецепты факелов, теперь они не горят вечно.
+- Исправлен баг, когда в рецепты разрезания тыквы пропадал нож.
+- Добавлен мод на просмотр скриншотов из чата прямо в игре.
+- Переписаны рецепты мода Exposure.
+- Переписаны рецепты мода MoreRed.
+- Добавлены рецепты раскрафта соленой воды из тфк.
+- Добавлены рецепты формочек в печи.
+- Добавлены рецепты для ниток из ваниллы.
+- Добавлены рецепты для сварки и ковки слитков в молоте гт.
+- Исправлена выдача энергии при использовании лавы в бойлере.
+- Машины теперь взрываются если подать слишком высокое напряжение.
+- Машины теперь взрываются под дождем (или нет).
+- Машины теперь нужно вскапывать спец. инструментом.
+- Крафты стержней в гт машинах стали сложней.
+- Теперь при переработке руды гт получается обычный камень, а не отдельный по типам.
+- При вскапывании при помощи бура руды, блоки заменяются на риолит.
+- Переписаны основные рецепты FirmaLife связанные с металлом.
+- Спустя тысячу лет, были отключены дублирующие предметы в AdAstra и Create (слитки, пластины).
+- Переписаны рецепты мода SmallShips.
+- Переписаны некоторые рецепты мода TFShips.
+- Удалены все рецепты AdAstra.
+- Удалены все рецепты ComputerCraft.
+- Удалены все рецепты Create.
+- Удалены теги пылей у порошков тфк, чтобы не вызывали непоняток.
+- Обновлен Rich Presence на новогодний.
+- Исправлен баг, когда в квесте требовался не тот слиток для выполнения (не тестировалось, но должно было автоматически починиться после переписи тфк рецептов).
+- Добавлены рецепты бесконечного камня в Rock Breaker.
+- Исправлен рецепт дробления кирпича (исправился сам).
+- Добавлен рецепт ванильного ведра.
+- Исправлен рецепт Blast Furnace.
+- Исправлены рецепты всех инстурментов.
+- Куча скрытых предметов и другой хери.
+- Исправлено куча рецептов связанных с дроблением кусков руды в порошек.
+- Возможно, что-то еще, все не упомнишь.
+### Новые моды
+- FirstPersonView
+- ...
+### Обновленные моды
+- TerraFirmaGreg
+- TFC
+- ...
+### Удаленные моды
+- Macaw AIO
+- ...
+
 ## [0.1.2] - 2023-11-30
-### Fixes
+### Изменения
 - Исправлен баг, когда тфк порошок можно было переплавить как пыль.
 - Улучшено расположение рецептов в скриптах.
 - Исправлен баг, когда кирка шахтера не работала.
@ -10,7 +67,7 @@
 - Повсеместное улучшение читабильности кода.
 - Добавлено несколько рецептов для дробилки тфк, так как некоторые отсутствовали (связано с порошком).
 - Изменен рецепт LV Machine Casing, теперь он использует пластины красной и синей стали.
-### Update mods
+### Обновленные моды
 - TerraFirmaGreg 0.0.12 -> 0.0.13
 - Cucumber 7.0.4 -> 7.0.6
 - ResourcefulLib 2.1.16 -> 2.1.18
@ -22,7 +79,7 @@
 - Curios 5.4.3 -> 5.4.4

 ## [0.1.1] - 2023-11-29
-### Fixes
+### Изменения
 - Исправлен баг, когда выходные слитки могли быть из разных модов (ну или нет, но вроде я тестил и все было хорошо).
 - Скрыты неиспользуемые жидкости, предметы тфк.
 - Скрыто множество ванильных предметов, но еще не всех.
@ -38,9 +95,9 @@
 - Исправлен баг, когда можно было сделать некоторые нежелательные рецепты из AdAstra.
 - Возвращены рецепты MCW AIO, да они кривые, но я не буду за автора делать всю работу, пусть фиксит свой говно-мод.
 - Исправлен рецепт доменной печи тфк.
-### New mods
+### Новые моды
 - exposure
-### Update mods
+### Обновленные моды
 - customSkinLoader -> 14.18.3
 - corpse -> 1.0.9
 - Placebo -> 8.6.0
@ -51,7 +108,7 @@
 - sophisticatedcore -> 0.5.108.504

 ## [0.1.0] - 2023-11-27
-### Fixes
+### Изменения
 - Исправлен баг, когда можно было дублировать металл через броню, пластины, палки и другое.
 - Исправлен баг, когда обычные железные слитки нельзя было расплавить в железо.
 - Исправлен баг, когда нельзя было сделать коксовую печь, из-за использования обычных элементов из железа, теперь используется кованное железо.
@ -118,11 +175,11 @@
 - Исправлена отсутствующая текстура covers.
 - Исправлена ошибка, из-за которой empty/equal бочки нельзя было стакать(требуется разместить и разбить затронутые предметы с первого раза).
 - Всегда включать кэш VBO для мульти-превью + добавить опцию конфигурации, чтобы отключить его.
-### New mods
+### Новые моды
 - smoothboot
 - rubidiumextra
 - TFC AgedAlcohol
-### Update mods
+### Обновленные моды
 - embeddium 0.2.9 -> 0.2.10
 - AmbientSounds_FORGE 5.3.4 -> 5.3.5
 - TFCAstikorCarts 1.1.7.1 -> 1.1.7.2
@ -137,36 +194,36 @@
 - craftPresence 2.2.4 -> 2.2.5
 - ae2wtlib 15.1.3 -> 15.1.4
 - ftb-essentials 2001.2.1 -> 2001.2.2
-### Removed mods
+### Удаленные моды
 - almostunified

 ## [0.0.9] - 2023-11-21
-### Fixes
+### Изменения
 - Исправление и добавление квестов.
 - Снова исправили ошибку с FTB.
-### New mods
+### Новые моды
 - waterflasks
-### Update mods
+### Обновленные моды
 - terrafirmagreg 0.0.8 -> 0.0.9
 - almostunified 0.7.1 -> 0.7.2

 ## [0.0.8] - 2023-11-21
-### Fixes
+### Изменения
 - Исправлено отображение версии сборки.
 - MMC пакет мигрирован на Forge 47.2.6
 - TFCAstikorCarts пока отключен, из-за краша при запуске на сервере, сообщено разработчику, если вы играете в локальных мирах, можете его включить.
 - Небольшая кастомизаци меню паузы.
-### New mods
+### Новые моды
 - FTBQuestsOptimizer
 - TFC ambiental 

 ## [0.0.7] - 2023-11-20
-### Fixes
+### Изменения
 - Исправлено меню паузы.
 - исправлено требование лицензии для создания пати.

 ## [0.0.6] - 2023-11-20
-### Fixes
+### Изменения
 - Теперь используется последний фордж 47.2.6 для запуска сборки.
 - Исправлены рецепты связанные с тфк листами металла, теперь все они используют GT вариант пластин.
 - Исправлен баг, когда каменные инстурменты копали быстрей металлических. Также исправлены некоторые проблемы с прочностью инструментов.
@ -180,7 +237,7 @@
 - Добавлен металл чалкопириту.
 - Удалены бесполезные кнопки в меню паузы.
 - Исправлен mmc пакет.
-### Update mods
+### Обновленные моды
 - AmbientSounds_FORGE 5.3.2 -> 5.3.4
 - Placebo 8.5.6 -> 8.5.8
 - TFCAstikorCarts 1.1.7 -> 1.1.7.1
@ -189,7 +246,7 @@
 - Sophisticatedbackpacks 3.18.66.941 -> 3.18.68.952
 - Sophisticatedcore 0.5.105.485 -> 0.5.107.496
 - terrafirmagreg 0.0.3 -> 0.0.5
-### New mods
+### Новые моды
 - InventorySorter
 - FTBQuests
 - FTBLibrary
@ -204,12 +261,12 @@
 - TerraFirmaShips
 - Small Ships
 - Defaultoptions
-### Removed mods
+### Удаленные моды
 - Heracles
 - Prometheus

 ## [0.0.5] - 2023-11-17
-### Fixes
+### Изменения
 - Исправлен баг, когда руда GT не могла быть вскопана киркой GT.
 - Отключены достижения.
 - TFC:
@ -223,27 +280,27 @@
 - Исправлена ошибка, из-за которой полный блок опавших листьев не сразу превращался в блок листьев.
 - Almost-unified:
 - исправлена совместимость с GregTech Modern для правильной унификации выходных ингредиентов.
-### Update mods
+### Обновленные моды
 - TerraFirmaCraft 3.0.2 -> 3.0.3
 - terrafirmagreg 0.0.2 -> 0.0.3
 - CreativeCore 2.11.9 -> 2.11.10
 - almostunified 0.7.0 -> 0.7.1

 ## [0.0.4] - 2023-11-17
-### Fixes
+### Изменения
 - Исправлен баг в металлургии. Не переплавляются мелкие куски металла.
 - Исправлены не правильные значения уровня у металлов в ковке.
-### New mods
+### Новые моды
 - astikorcarts
 - Dynamic Lights Reforged
-### Removed mods
+### Удаленные моды
 - starlight

 ## [0.0.3] - 2023-11-16
-### Fixes
+### Изменения
 - Исправление спавна в зиме.
 - Отключен багануты скрипт Kubejs.

 ## [0.0.2] - 2023-11-16
-### Fixes
- Мы умерли...
+### Изменения
+- Первая бета!
--- a/config/chatimageconfig.json
+++ b/config/chatimageconfig.json
@ -0,0 +1,13 @@
+{
+  "cachePath": "ChatImageCache",
+  "limitWidth": 125,
+  "limitHeight": 125,
+  "paddingLeft": 1,
+  "paddingRight": 1,
+  "paddingTop": 1,
+  "paddingBottom": 1,
+  "gifSpeed": 3,
+  "nsfw": false,
+  "cqCode": true,
+  "timeout": 5
+}
--- a/config/craftpresence.json
+++ b/config/craftpresence.json
@ -14,7 +14,7 @@
    "detectDimensionData": true,
    "detectWorldData": true,
    "clientId": "1182610212121743470",
-    "defaultIcon": "tfg-icon",
+    "defaultIcon": "logo_new_year",
    "enableJoinRequests": false,
    "partyPrivacyLevel": 1,
    "preferredClientLevel": 3,
@ -22,7 +22,7 @@
    "autoRegister": false
  },
  "biomeSettings": {
-    "fallbackBiomeIcon": "tfg-icon",
+    "fallbackBiomeIcon": "logo_new_year",
    "biomeData": {
      "default": {
        "textOverride": "Playing in {biome.name}"
@ -30,7 +30,7 @@
    }
  },
  "dimensionSettings": {
-    "fallbackDimensionIcon": "tfg-icon",
+    "fallbackDimensionIcon": "logo_new_year",
    "dimensionData": {
      "default": {
        "textOverride": "In the {dimension.name}"
@ -38,7 +38,7 @@
    }
  },
  "serverSettings": {
-    "fallbackServerIcon": "tfg-icon",
+    "fallbackServerIcon": "logo_new_year",
    "fallbackServerName": "Minecraft Server",
    "fallbackServerMotd": "A Minecraft Server",
    "serverData": {
@ -71,7 +71,7 @@
    "refreshRate": 2,
    "allowPlaceholderPreviews": false,
    "guiSettings": {
-      "fallbackGuiIcon": "tfg-icon",
+      "fallbackGuiIcon": "logo_new_year",
      "guiData": {
        "default": {
          "textOverride": "In {screen.name}"
@ -82,7 +82,7 @@
      "default": "Holding {item.message.holding}"
    },
    "entitySettings": {
-      "fallbackEntityIcon": "tfg-icon",
+      "fallbackEntityIcon": "logo_new_year",
      "targetData": {
        "default": {
          "textOverride": "Targeting {entity.target.name}"
@ -150,7 +150,7 @@
    "stripTranslationColors": false,
    "stripExtraGuiElements": false,
    "renderTooltips": true,
-    "configKeyCode": 0
+    "configKeyCode": 333
  },
  "displaySettings": {
    "presenceData": {
@ -172,7 +172,8 @@
      }
    },
    "dynamicIcons": {
-      "default": "https://via.placeholder.com/256.png"
+      "default": "https://via.placeholder.com/256.png",
+      "SpeeeDCraft": "https://mc-heads.net/avatar/9d9c39ad4d3a4e6191c73d327f5dcf51"
    },
    "dynamicVariables": {
      "default": "Example Text",
--- a/config/firstperson.json
+++ b/config/firstperson.json
@ -0,0 +1,16 @@
+{
+  "enabledByDefault": true,
+  "xOffset": 0,
+  "sneakXOffset": 0,
+  "sitXOffset": 0,
+  "renderStuckFeatures": true,
+  "vanillaHands": false,
+  "doubleHands": false,
+  "forceActive": false,
+  "autoVanillaHands": [
+    "twilightforest:filled_ore_map",
+    "twilightforest:filled_magic_map",
+    "twilightforest:filled_maze_map",
+    "antiqueatlas:antique_atlas"
+  ]
+}
--- a/config/fml.toml
+++ b/config/fml.toml
@ -1,5 +1,5 @@
 #Early window height
-earlyWindowHeight = 768
+earlyWindowHeight = 480
 #Early window framebuffer scale
 earlyWindowFBScale = 1
 #Enable forge global version checking
@ -7,7 +7,7 @@ versionCheck = true
 #Early window provider
 earlyWindowProvider = "fmlearlywindow"
 #Early window width
-earlyWindowWidth = 1024
+earlyWindowWidth = 854
 #Early window starts maximized
 earlyWindowMaximized = false
 #Default config path for servers
--- a/config/ftbquests/quests/chapters/first.snbt
+++ b/config/ftbquests/quests/chapters/first.snbt
@ -3549,6 +3549,23 @@
 			x: -3.0d
 			y: -2.0d
 		}
+		{
+			id: "7668BF4D3ED118AB"
+			tasks: [{
+				id: "19A2382177043109"
+				item: {
+					Count: 1b
+					id: "itemfilters:tag"
+					tag: {
+						value: "tfc:foods/raw_meats"
+					}
+				}
+				title: "Any #tfc:foods/raw_meats"
+				type: "item"
+			}]
+			x: 0.0d
+			y: 7.0d
+		}
 	]
 	title: "Rock and Stick Age"
 }
--- a/config/ftbquests/quests/chapters/large_turbines.snbt
+++ b/config/ftbquests/quests/chapters/large_turbines.snbt
@ -146,16 +146,7 @@
 				""
 				"&9-&r A little bit of Math is required to get the expected results."
 			]
-			icon: {
-				Count: 1b
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "minecraft:barrier"
-			}
+			icon: "minecraft:barrier"
 			id: "33F0EA149F3705CF"
 			size: 0.76d
 			tasks: [{
--- a/config/ftbquests/quests/chapters/the_cleanroom.snbt
+++ b/config/ftbquests/quests/chapters/the_cleanroom.snbt
@ -145,16 +145,7 @@
 		{
 			dependencies: ["6177B1FCB7B40394"]
 			description: ["Placing &3Generators&r or &3Mufflers&r inside is &cnot allowed&r. The Cleanroom will unform."]
-			icon: {
-				Count: 1b
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "minecraft:barrier"
-			}
+			icon: "minecraft:barrier"
 			id: "5A3AC1DD5EC6E4C3"
 			shape: "rsquare"
 			size: 0.75d
--- a/config/gtceu.yaml
+++ b/config/gtceu.yaml
@ -10,7 +10,7 @@ recipes:

  # Change the recipe of Rods in the Lathe to 1 Rod and 2 Small Piles of Dust, instead of 2 Rods.
  # Default: false
-  harderRods: false
+  harderRods: true

  # Whether to make crafting recipes for Bricks, Firebricks, and Coke Bricks harder.
  # Default: false
@ -55,7 +55,7 @@ recipes:

  # Whether to make coloring blocks like Concrete or Glass harder.
  # Default: false
-  hardDyeRecipes: false
+  hardDyeRecipes: true

  # Whether to remove charcoal smelting recipes from the vanilla furnace.
  # Default: true
@ -76,7 +76,7 @@ recipes:
 worldgen:
  # Rubber Tree spawn chance (% per chunk)
  # Default: 0.5
-  rubberTreeSpawnChance: 0.5
+  rubberTreeSpawnChance: 0.0

  # Should all Stone Types drop unique Ore Item Blocks?
  # Default: false (meaning only Stone, Netherrack, and Endstone)
@ -132,16 +132,16 @@ machines:

  # Whether to require a Wrench, Wirecutter, or other GregTech tools to break machines, casings, wires, and more.
  # Default: false
-  requireGTToolsForBlocks: false
+  requireGTToolsForBlocks: true

  # Whether machines explode in rainy weather or when placed next to certain terrain, such as fire or lava
  # Default: false
-  doTerrainExplosion: false
+  doTerrainExplosion: true

  # Whether machines or boilers damage the terrain when they explode.
  # Note machines and boilers always explode when overloaded with power or met with special conditions, regardless of this config.
  # Default: true
-  doesExplosionDamagesTerrain: false
+  doesExplosionDamagesTerrain: true

  # Divisor for Recipe Duration per Overclock.
  # Default: 2.0
@ -166,7 +166,7 @@ machines:

  # Block to replace mined ores with in the miner and multiblock miner.
  # Default: minecraft:cobblestone
-  replaceMinedBlocksWith: minecraft:cobblestone
+  replaceMinedBlocksWith: tfc:rock/cobble/rhyolite

  # Whether to enable the Maintenance Hatch, required for Multiblocks.
  # Default: true
--- a/config/kubejs-tfc.toml
+++ b/config/kubejs-tfc.toml
@ -0,0 +1,7 @@
+#KubeJS TFC common configuration
+#If true:
+#   Virtual json files created in the 'TFCEvents.data' and 'TFCEvents.worldgenData' events will be printed to the log
+#   Important (and potentially unstable) events will be printed to the log
+#
+debugMode = false
+
--- a/kubejs/assets/gtceu/lang/en_us.json
+++ b/kubejs/assets/gtceu/lang/en_us.json
@ -0,0 +1,13 @@
+{
+    "material.salt_water": "Concentrated Salt Water",
+    "gtceu.jei.bedrock_fluid.salt_water_deposit": "Concentrated Salt Water Deposit",
+
+    "block.gtceu.lv_saw_mill": "WIP",
+    "block.gtceu.mv_saw_mill": "WIP",
+    "block.gtceu.hv_saw_mill": "WIP",
+    "block.gtceu.ev_saw_mill": "WIP",
+    "block.gtceu.iv_saw_mill": "WIP",
+    "block.gtceu.luv_saw_mill": "WIP",
+    "block.gtceu.zpm_saw_mill": "WIP",
+    "block.gtceu.uv_saw_mill": "WIP"
+}
--- a/kubejs/assets/gtceu/lang/ru_ru.json
+++ b/kubejs/assets/gtceu/lang/ru_ru.json
--- a/kubejs/assets/tfc/lang/en_us.json
+++ b/kubejs/assets/tfc/lang/en_us.json
@ -1,5 +1,4 @@
 {
-  "metal.tfc.cast_iron": "Iron",
  "block.gtceu.tfc_andesite_almandine_ore.prospected": "Almandine",
  "block.gtceu.tfc_andesite_aluminium_ore.prospected": "Aluminium",
  "block.gtceu.tfc_andesite_alunite_ore.prospected": "Alunite",
--- a/kubejs/assets/tfc/lang/ru_ru.json
+++ b/kubejs/assets/tfc/lang/ru_ru.json
@ -1,5 +1,4 @@
 {
-  "metal.tfc.cast_iron": "Железо",
  "block.gtceu.tfc_andesite_almandine_ore.prospected": "Альмандин",
  "block.gtceu.tfc_andesite_aluminium_ore.prospected": "Алюминий",
  "block.gtceu.tfc_andesite_alunite_ore.prospected": "Алюнит",
--- a/kubejs/client_scripts/main_client_script.js
+++ b/kubejs/client_scripts/main_client_script.js
@ -6,7 +6,6 @@ REIEvents.hide('item', event => {
    hideGTCEUStuff(event)
    hideCreateStuff(event)
    hideAE2Stuff(event)
-    hideExtendedCraftingStuff(event)
    hideAdAstraStuff(event)
    hideSophisticatedBackpacksStuff(event)
    hideMoreRedStuff(event)
@ -19,6 +18,7 @@ REIEvents.groupEntries(event => {
 })

 REIEvents.removeCategories(event => {
+    registerMinecraftCategories(event)
    registerGTCEUCategories(event)
    registerMoreRedCategories(event)
 })
--- a/kubejs/client_scripts/mods/extended_crafting.js
+++ b/kubejs/client_scripts/mods/extended_crafting.js
@ -1,7 +0,0 @@
-// priority: 0
-
-const hideExtendedCraftingStuff = (event) => {
-    global.EXTENDED_CRAFTING_DISABLED_ITEMS.forEach(item => {
-        event.hide(item)
-    })
-}
--- a/kubejs/client_scripts/mods/gtceu.js
+++ b/kubejs/client_scripts/mods/gtceu.js
@ -14,11 +14,11 @@ const hideGTCEUStuff = (event) => {
 }

 const groupGTCEUStuff = (event) => {
-    event.groupItemsByTag('tfg:rei_groups/dusts/pure', 'Pure Dusts', 'forge:dusts/pure')
-    event.groupItemsByTag('tfg:rei_groups/dusts/impure', 'Impure Dusts', 'forge:dusts/impure')
+    event.groupItemsByTag('tfg:rei_groups/dusts/pure', 'Pure Dusts', 'forge:pure_dusts')
+    event.groupItemsByTag('tfg:rei_groups/dusts/impure', 'Impure Dusts', 'forge:impure_dusts')
    event.groupItemsByTag('tfg:rei_groups/dusts', 'Dusts', 'forge:dusts')
-    event.groupItemsByTag('tfg:rei_groups/dusts/small', 'Small Dusts', 'forge:dusts/small')
-    event.groupItemsByTag('tfg:rei_groups/dusts/tiny', 'Tiny Dusts', 'forge:dusts/tiny')
+    event.groupItemsByTag('tfg:rei_groups/dusts/small', 'Small Dusts', 'forge:small_dusts')
+    event.groupItemsByTag('tfg:rei_groups/dusts/tiny', 'Tiny Dusts', 'forge:tiny_dusts')
    
    event.groupItemsByTag('tfg:rei_groups/ores', 'Ores', 'forge:ores')
    event.groupItemsByTag('tfg:rei_groups/crushed_ores', 'Crushed Ores', 'forge:crushed_ores')
@ -26,26 +26,26 @@ const groupGTCEUStuff = (event) => {
    event.groupItemsByTag('tfg:rei_groups/refined_ores', 'Refined Ores', 'forge:refined_ores')

    event.groupItemsByTag('tfg:rei_groups/ingots', 'Ingots', 'forge:ingots')
-    event.groupItemsByTag('tfg:rei_groups/ingots/hot', 'Hot Ingots', 'forge:ingots/hot')
+    event.groupItemsByTag('tfg:rei_groups/ingots/hot', 'Hot Ingots', 'forge:hot_ingots')

-    event.groupItemsByTag('tfg:rei_groups/gears/small', 'Small Gears', 'forge:gears/small')
+    event.groupItemsByTag('tfg:rei_groups/gears/small', 'Small Gears', 'forge:small_gears')
    event.groupItemsByTag('tfg:rei_groups/gears', 'Gears', 'forge:gears')

    event.groupItemsByTag('tfg:rei_groups/rods', 'Rods', 'forge:rods')
    event.groupItemsByTag('tfg:rei_groups/rods/long', 'Long Rods', 'forge:rods/long')

    event.groupItemsByTag('tfg:rei_groups/plates', 'Plates', 'forge:plates')
-    event.groupItemsByTag('tfg:rei_groups/plates/double', 'Double Plates', 'forge:plates/double')
-    event.groupItemsByTag('tfg:rei_groups/plates/dense', 'Dense Plates', 'forge:plates/dense')
+    event.groupItemsByTag('tfg:rei_groups/plates/double', 'Double Plates', 'forge:double_plates')
+    event.groupItemsByTag('tfg:rei_groups/plates/dense', 'Dense Plates', 'forge:dense_plates')

    event.groupItemsByTag('tfg:rei_groups/springs', 'Springs', 'forge:springs')
-    event.groupItemsByTag('tfg:rei_groups/springs/small', 'Small Springs', 'forge:springs/small')
+    event.groupItemsByTag('tfg:rei_groups/springs/small', 'Small Springs', 'forge:small_springs')

-    event.groupItemsByTag('tfg:rei_groups/gems/exquisite', 'Exquisite Gems', 'forge:gems/exquisite')
+    event.groupItemsByTag('tfg:rei_groups/gems/exquisite', 'Exquisite Gems', 'forge:exquisite_gems')
    event.groupItemsByTag('tfg:rei_groups/gems', 'Gems', 'forge:gems')
-    event.groupItemsByTag('tfg:rei_groups/gems/flawless', 'Flawless Gems', 'forge:gems/flawless')
-    event.groupItemsByTag('tfg:rei_groups/gems/flawed', 'Flawed Gems', 'forge:gems/flawed')
-    event.groupItemsByTag('tfg:rei_groups/gems/chipped', 'Chipped Gems', 'forge:gems/chipped')
+    event.groupItemsByTag('tfg:rei_groups/gems/flawless', 'Flawless Gems', 'forge:flawless_gems')
+    event.groupItemsByTag('tfg:rei_groups/gems/flawed', 'Flawed Gems', 'forge:flawed_gems')
+    event.groupItemsByTag('tfg:rei_groups/gems/chipped', 'Chipped Gems', 'forge:chipped_gems')
    
    event.groupItemsByTag('tfg:rei_groups/material_blocks/raw', 'Raw Material Blocks', 'forge:material_blocks/raw')
    event.groupItemsByTag('tfg:rei_groups/material_blocks/block', 'Material Blocks', 'forge:material_blocks/block')
@ -84,7 +84,7 @@ const groupGTCEUStuff = (event) => {
    event.groupItemsByTag('tfg:rei_groups/screws', 'Screws', 'forge:screws')
    event.groupItemsByTag('tfg:rei_groups/foils', 'Foils', 'forge:foils')
    event.groupItemsByTag('tfg:rei_groups/rotors', 'Rotors', 'forge:rotors')
-    event.groupItemsByTag('tfg:rei_groups/wires/fine', 'Fine Wires', 'forge:wires/fine')
+    event.groupItemsByTag('tfg:rei_groups/wires/fine', 'Fine Wires', 'forge:fine_wires')

    event.groupItemsByTag('tfg:rei_groups/wires/single', 'Single Wires', 'forge:wires/single')
    event.groupItemsByTag('tfg:rei_groups/wires/double', 'Double Wires','forge:wires/double')
--- a/kubejs/client_scripts/mods/minecraft.js
+++ b/kubejs/client_scripts/mods/minecraft.js
@ -4,4 +4,8 @@ const hideMinecraftStuff = (event) => {
    global.MINECRAFT_DISABLED_ITEMS.forEach(item => {
        event.hide(item)
    })
-}
+}
+
+const registerMinecraftCategories = (event) => {
+    event.remove('minecraft:plugins/campfire')
+}
--- a/kubejs/client_scripts/mods/tfc.js
+++ b/kubejs/client_scripts/mods/tfc.js
@ -38,7 +38,6 @@ const hideTFCFluids = (event) => {
    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')
--- a/kubejs/config/client.properties
+++ b/kubejs/config/client.properties
@ -1,5 +1,5 @@
 #KubeJS Client Properties
-#Tue Nov 28 16:58:18 NOVT 2023
+#Mon Dec 11 07:09:45 NOVT 2023
 backgroundColor=2E3440
 barBorderColor=ECEFF4
 barColor=ECEFF4
--- a/kubejs/config/common.properties
+++ b/kubejs/config/common.properties
@ -1,5 +1,5 @@
 #KubeJS Common Properties
-#Tue Nov 28 16:58:19 NOVT 2023
+#Mon Dec 11 07:09:46 NOVT 2023
 allowAsyncStreams=true
 announceReload=true
 creativeModeTabIcon=minecraft\:purple_dye
--- a/kubejs/data/forge/tags/items/double_sheets.json
+++ b/kubejs/data/forge/tags/items/double_sheets.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/any_bronze.json
+++ b/kubejs/data/forge/tags/items/double_sheets/any_bronze.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/bismuth.json
+++ b/kubejs/data/forge/tags/items/double_sheets/bismuth.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/bismuth_bronze.json
+++ b/kubejs/data/forge/tags/items/double_sheets/bismuth_bronze.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/black_bronze.json
+++ b/kubejs/data/forge/tags/items/double_sheets/black_bronze.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/black_steel.json
+++ b/kubejs/data/forge/tags/items/double_sheets/black_steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/blue_steel.json
+++ b/kubejs/data/forge/tags/items/double_sheets/blue_steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/brass.json
+++ b/kubejs/data/forge/tags/items/double_sheets/brass.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/bronze.json
+++ b/kubejs/data/forge/tags/items/double_sheets/bronze.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/cast_iron.json
+++ b/kubejs/data/forge/tags/items/double_sheets/cast_iron.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/copper.json
+++ b/kubejs/data/forge/tags/items/double_sheets/copper.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/gold.json
+++ b/kubejs/data/forge/tags/items/double_sheets/gold.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/nickel.json
+++ b/kubejs/data/forge/tags/items/double_sheets/nickel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/red_steel.json
+++ b/kubejs/data/forge/tags/items/double_sheets/red_steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/rose_gold.json
+++ b/kubejs/data/forge/tags/items/double_sheets/rose_gold.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/silver.json
+++ b/kubejs/data/forge/tags/items/double_sheets/silver.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/steel.json
+++ b/kubejs/data/forge/tags/items/double_sheets/steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/sterling_silver.json
+++ b/kubejs/data/forge/tags/items/double_sheets/sterling_silver.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/tin.json
+++ b/kubejs/data/forge/tags/items/double_sheets/tin.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/wrought_iron.json
+++ b/kubejs/data/forge/tags/items/double_sheets/wrought_iron.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/double_sheets/zinc.json
+++ b/kubejs/data/forge/tags/items/double_sheets/zinc.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/dusts.json
+++ b/kubejs/data/forge/tags/items/dusts.json
@ -1,5 +1,5 @@
 {
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
+    "__comment__": "This file was automatically created by mcresources",
+    "replace": true,
+    "values": []
 }
--- a/kubejs/data/forge/tags/items/rods.json
+++ b/kubejs/data/forge/tags/items/rods.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/bismuth.json
+++ b/kubejs/data/forge/tags/items/rods/bismuth.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/bismuth_bronze.json
+++ b/kubejs/data/forge/tags/items/rods/bismuth_bronze.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/black_bronze.json
+++ b/kubejs/data/forge/tags/items/rods/black_bronze.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/black_steel.json
+++ b/kubejs/data/forge/tags/items/rods/black_steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/blue_steel.json
+++ b/kubejs/data/forge/tags/items/rods/blue_steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/brass.json
+++ b/kubejs/data/forge/tags/items/rods/brass.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/bronze.json
+++ b/kubejs/data/forge/tags/items/rods/bronze.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/cast_iron.json
+++ b/kubejs/data/forge/tags/items/rods/cast_iron.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/copper.json
+++ b/kubejs/data/forge/tags/items/rods/copper.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/gold.json
+++ b/kubejs/data/forge/tags/items/rods/gold.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/nickel.json
+++ b/kubejs/data/forge/tags/items/rods/nickel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/red_steel.json
+++ b/kubejs/data/forge/tags/items/rods/red_steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/rose_gold.json
+++ b/kubejs/data/forge/tags/items/rods/rose_gold.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/silver.json
+++ b/kubejs/data/forge/tags/items/rods/silver.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/steel.json
+++ b/kubejs/data/forge/tags/items/rods/steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/sterling_silver.json
+++ b/kubejs/data/forge/tags/items/rods/sterling_silver.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/tin.json
+++ b/kubejs/data/forge/tags/items/rods/tin.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/wooden.json
+++ b/kubejs/data/forge/tags/items/rods/wooden.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/wrought_iron.json
+++ b/kubejs/data/forge/tags/items/rods/wrought_iron.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/rods/zinc.json
+++ b/kubejs/data/forge/tags/items/rods/zinc.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets.json
+++ b/kubejs/data/forge/tags/items/sheets.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/bismuth.json
+++ b/kubejs/data/forge/tags/items/sheets/bismuth.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/bismuth_bronze.json
+++ b/kubejs/data/forge/tags/items/sheets/bismuth_bronze.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/black_bronze.json
+++ b/kubejs/data/forge/tags/items/sheets/black_bronze.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/black_steel.json
+++ b/kubejs/data/forge/tags/items/sheets/black_steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/blue_steel.json
+++ b/kubejs/data/forge/tags/items/sheets/blue_steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/brass.json
+++ b/kubejs/data/forge/tags/items/sheets/brass.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/bronze.json
+++ b/kubejs/data/forge/tags/items/sheets/bronze.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/cast_iron.json
+++ b/kubejs/data/forge/tags/items/sheets/cast_iron.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/copper.json
+++ b/kubejs/data/forge/tags/items/sheets/copper.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/gold.json
+++ b/kubejs/data/forge/tags/items/sheets/gold.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/nickel.json
+++ b/kubejs/data/forge/tags/items/sheets/nickel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/red_steel.json
+++ b/kubejs/data/forge/tags/items/sheets/red_steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/rose_gold.json
+++ b/kubejs/data/forge/tags/items/sheets/rose_gold.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/silver.json
+++ b/kubejs/data/forge/tags/items/sheets/silver.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/steel.json
+++ b/kubejs/data/forge/tags/items/sheets/steel.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/sterling_silver.json
+++ b/kubejs/data/forge/tags/items/sheets/sterling_silver.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/tin.json
+++ b/kubejs/data/forge/tags/items/sheets/tin.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/wrought_iron.json
+++ b/kubejs/data/forge/tags/items/sheets/wrought_iron.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/forge/tags/items/sheets/zinc.json
+++ b/kubejs/data/forge/tags/items/sheets/zinc.json
@ -1,5 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "replace": true,
-  "values": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/configured_feature/vein/normal_sylvite.json
+++ b/kubejs/data/terrafirmagreg/worldgen/configured_feature/vein/normal_sylvite.json
@ -1,35 +0,0 @@
-{
-  "type": "tfc:cluster_vein",
-  "config": {
-    "rarity": 190,
-    "density": 0.3,
-    "min_y": 32,
-    "max_y": 100,
-    "size": 26,
-    "random_name": "normal_sylvite",
-    "blocks": [
-      {
-        "replace": [
-          "tfc:rock/raw/shale"
-        ],
-        "with": [
-          {
-            "block": "gtceu:tfc_shale_sylvite_ore",
-            "weight": 100
-          }
-        ]
-      },
-      {
-        "replace": [
-          "tfc:rock/raw/claystone"
-        ],
-        "with": [
-          {
-            "block": "gtceu:tfc_claystone_sylvite_ore",
-            "weight": 100
-          }
-        ]
-      }
-    ]
-  }
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_garnet_amethyst.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_garnet_amethyst.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_garnet_amethyst",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_garnet_opal.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_garnet_opal.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_garnet_opal",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_gold.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_gold.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_gold",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_hematite.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_hematite.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_hematite",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_limonite.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_limonite.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_limonite",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_magnetite.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_magnetite.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_magnetite",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_molybdenum.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_molybdenum.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_molybdenum",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_naquadah.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_naquadah.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_naquadah",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_pitchblende.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_pitchblende.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_pitchblende",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_sapphire.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_sapphire.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_sapphire",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_scheelite.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_scheelite.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_scheelite",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_sheldonite.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_sheldonite.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_sheldonite",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_topaz.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/deep_topaz.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/deep_topaz",
-  "placement": []
-}
--- a/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/normal_apatite_.json
+++ b/kubejs/data/terrafirmagreg/worldgen/placed_feature/vein/normal_apatite_.json
@ -1,4 +0,0 @@
-{
-  "feature": "terrafirmagreg:vein/normal_apatite_",
-  "placement": []
-}
--- a/Show more
+++ b/Show more