stonetypes shit

2023-10-04 07:49:59 +07:00 · 2023-10-04 07:49:59 +07:00 · d6e75ab888
commit d6e75ab888
parent 95484fe67e
19 changed files with 527 additions and 450 deletions
--- a/config/gtceu.yaml
+++ b/config/gtceu.yaml
@ -74,6 +74,10 @@ recipes:
  removeVanillaTNTRecipe: true

 worldgen:
+  # Rubber Tree spawn chance (% per chunk)
+  # Default: 0.5
+  rubberTreeSpawnChance: 0.5
+
  # Should all Stone Types drop unique Ore Item Blocks?
  # Default: false (meaning only Stone, Netherrack, and Endstone)
  allUniqueStoneTypes: false
@ -83,41 +87,36 @@ worldgen:
  # Default: false (no falling ores)
  sandOresFall: false

-  # Radius that ore veins will check for existing ones.
-  # If one is found, the vein will not spawn.
-  # Default: 3
-  oreVeinScanRadius: 3
+  oreVeins:
+    # The grid size (in chunks) for ore vein generation
+    # Default: 3
+    oreVeinGridSize: 3

-  # Multiplier to bedrock ore generation amount
-  # Default: 1.0f
-  bedrockOreMultiplier: 1.0
+    # The maximum random offset (in blocks) from the grid for generating an ore vein.
+    # Default: 12
+    oreVeinRandomOffset: 12

-  # Make bedrock ore/fluid veins infinite?
-  # Default: false
-  infiniteBedrockOresFluids: false
+    # Prevents regular vanilla ores from being generated outside GregTech ore veins
+    # Default: true
+    removeVanillaOreGen: true

-  # Maximum worldgen feature size in chunks
-  # if a vein is larger than this, Minecraft complains in logs.
-  # If that happens, either increase this or make your veins smaller.
-  # NOTE: Larger veins can cause noticeable worldgen lag!
-  # Default: 2
-  maxFeatureChunkSize: 2
+    # Prevents vanilla's large ore veins from being generated
+    # Default: true
+    removeVanillaLargeOreVeins: true

-  # Debug ore vein placement? (will print placed veins to server's debug.log)
-  # Default: false (no placement printout in debug.log)
-  debugWorldgen: false
+    # Multiplier to bedrock ore generation amount
+    # Default: 1.0f
+    bedrockOreMultiplier: 1.0

-  # Rubber Tree spawn chance (% per chunk)
-  # Default: 0.5
-  rubberTreeSpawnChance: 0.5
+    # Make bedrock ore/fluid veins infinite?
+    # Default: false
+    infiniteBedrockOresFluids: false

-  # Prevents regular vanilla ores from being generated outside GregTech ore veins
-  # Default: true
-  removeVanillaOreGen: true
-
-  # Prevents vanilla's large ore veins from being generated
-  # Default: true
-  removeVanillaLargeOreVeins: true
+    # Sets the maximum number of chunks that may be cached for ore vein generation.
+    # Higher values may improve world generation performance, but at the cost of more RAM usage.
+    # If you substantially increase the ore vein grid size, random vein offset, or have very large (custom) veins, you may need to increase this value as well.
+    # Default: 512 (requires restarting the server / re-opening the world)
+    oreGenerationChunkCacheSize: 512

 machines:
  # Whether insufficient energy supply should reset Machine recipe progress to zero.
@ -183,6 +182,10 @@ machines:
  # Default: true
  doProcessingArray: true

+  # Makes nearly every GCYM Multiblock require blocks which set their maximum voltages.
+  # Default: false
+  enableTieredCasings: false
+
 client:
  # Whether or not to enable Emissive Textures for GregTech Machines.
  # Default: true
@ -228,3 +231,12 @@ compat:
  # Default: true
  removeSmeltingForEBFMetals: true

+dev:
+  # Debug ore vein placement? (will print placed veins to server's debug.log)
+  # Default: false (no placement printout in debug.log)
+  debugWorldgen: false
+
+  # Dump all registered GT recipes?
+  # Default: false
+  dumpRecipes: false
+
--- a/config/jade/sort-order.json
+++ b/config/jade/sort-order.json
@ -108,50 +108,6 @@
  "ae2:part_icon": null,
  "ae2:part_tooltip": null,
  "ae2:part_mod_name": null,
-  "gtceu:electric_container_provider": null,
-  "gtceu:workable_provider": null,
-  "gtceu:controllable_provider": null,
-  "gtceu:recipe_logic_provider": null,
-  "tfc:barrel": null,
-  "tfc:bellows": null,
-  "tfc:sapling": null,
-  "tfc:blast_furnace": null,
-  "tfc:bloomery": null,
-  "tfc:bloom": null,
-  "tfc:charcoal_forge": null,
-  "tfc:composter": null,
-  "tfc:crop": null,
-  "tfc:crucible": null,
-  "tfc:firepit": null,
-  "tfc:fruit_tree_sapling": null,
-  "tfc:hoe_overlay": null,
-  "tfc:lamp": null,
-  "tfc:nest_box": null,
-  "tfc:pit_kiln_internal": null,
-  "tfc:pit_kiln_above": null,
-  "tfc:powder_keg": null,
-  "tfc:torch": null,
-  "tfc:wall_torch": null,
-  "tfc:candle": null,
-  "tfc:candle_cake": null,
-  "tfc:jack_o_lantern": null,
-  "tfc:mud_bricks": null,
-  "tfc:decaying": null,
-  "tfc:loom": null,
-  "tfc:sheet_pile": null,
-  "tfc:ingot_pile": null,
-  "tfc:animal": null,
-  "tfc:horse": null,
-  "tfc:chested_horse": null,
-  "tfc:wild_animal": null,
-  "tfc:frog": null,
-  "tfc:squid": null,
-  "tfc:fish": null,
-  "tfc:predator": null,
-  "tfc:pack_predator": null,
-  "tfc:ocelot": null,
-  "tfc:rabbit": null,
-  "tfc:fishing_hook": null,
  "minecraft:brewing_stand": null,
  "minecraft:beehive": null,
  "minecraft:command_block": null,
@ -207,6 +163,10 @@
  "ae2:part_icon": null,
  "ae2:part_tooltip": null,
  "ae2:part_mod_name": null,
+  "gtceu:electric_container_provider": null,
+  "gtceu:workable_provider": null,
+  "gtceu:controllable_provider": null,
+  "gtceu:recipe_logic_provider": null,
  "create:blaze_burner": null,
  "create:copper_backtank": null,
  "create:contraption_inv": null,
@ -216,5 +176,45 @@
  "create:placard": null,
  "create:exact_block": null,
  "create:filter": null,
-  "create:goggles": null
+  "create:goggles": null,
+  "tfc:barrel": null,
+  "tfc:bellows": null,
+  "tfc:sapling": null,
+  "tfc:blast_furnace": null,
+  "tfc:bloomery": null,
+  "tfc:bloom": null,
+  "tfc:charcoal_forge": null,
+  "tfc:composter": null,
+  "tfc:crop": null,
+  "tfc:crucible": null,
+  "tfc:firepit": null,
+  "tfc:fruit_tree_sapling": null,
+  "tfc:hoe_overlay": null,
+  "tfc:lamp": null,
+  "tfc:nest_box": null,
+  "tfc:pit_kiln_internal": null,
+  "tfc:pit_kiln_above": null,
+  "tfc:powder_keg": null,
+  "tfc:torch": null,
+  "tfc:wall_torch": null,
+  "tfc:candle": null,
+  "tfc:candle_cake": null,
+  "tfc:jack_o_lantern": null,
+  "tfc:mud_bricks": null,
+  "tfc:decaying": null,
+  "tfc:loom": null,
+  "tfc:sheet_pile": null,
+  "tfc:ingot_pile": null,
+  "tfc:animal": null,
+  "tfc:horse": null,
+  "tfc:chested_horse": null,
+  "tfc:wild_animal": null,
+  "tfc:frog": null,
+  "tfc:squid": null,
+  "tfc:fish": null,
+  "tfc:predator": null,
+  "tfc:pack_predator": null,
+  "tfc:ocelot": null,
+  "tfc:rabbit": null,
+  "tfc:fishing_hook": null
 }
--- a/config/jei/recipe-category-sort-order.ini
+++ b/config/jei/recipe-category-sort-order.ini
@ -123,3 +123,5 @@ ae2:condenser
 ae2:entropy
 ae2:inscriber
 ae2:item_transformation
+gtceu:alloy_blast_smelter
+tfc:goat_horn_knapping
--- a/config/sound_physics_remastered/occlusion.properties
+++ b/config/sound_physics_remastered/occlusion.properties
@ -9,205 +9,205 @@
 # By block ID:
 # minecraft\:oak_log=1.0

-# Roots (Sound Type)
-ROOTS=0.0
-# Medium Amethyst Bud (Sound Type)
-MEDIUM_AMETHYST_BUD=0.0
-# Cherry Wood (Sound Type)
-CHERRY_WOOD=1.0
-# Lodestone (Sound Type)
-LODESTONE=1.0
-# Scaffolding (Sound Type)
-SCAFFOLDING=0.0
-# Cherry Sapling (Sound Type)
-CHERRY_SAPLING=1.0
-# Pointed Dripstone (Sound Type)
-POINTED_DRIPSTONE=0.0
-# Vine (Sound Type)
-VINE=0.0
-# Sweet Berry Bush (Sound Type)
-SWEET_BERRY_BUSH=0.0
-# Small Amethyst Bud (Sound Type)
-SMALL_AMETHYST_BUD=0.0
-# Hanging Roots (Sound Type)
-HANGING_ROOTS=1.0
-# Decorated Pot Cracked (Sound Type)
-DECORATED_POT_CRACKED=1.0
-# Powder Snow (Sound Type)
-POWDER_SNOW=0.1
-# Sculk Vein (Sound Type)
-SCULK_VEIN=1.0
-# Wart Block (Sound Type)
-WART_BLOCK=1.0
-# Sculk Catalyst (Sound Type)
-SCULK_CATALYST=1.0
-# Sculk (Sound Type)
-SCULK=1.0
-# Sculk Sensor (Sound Type)
-SCULK_SENSOR=1.0
+# Nether Sprouts (Sound Type)
+NETHER_SPROUTS=1.0
+# Nether Ore (Sound Type)
+NETHER_ORE=1.0
+# Froglight (Sound Type)
+FROGLIGHT=1.0
+# Honey Block (Sound Type)
+HONEY_BLOCK=0.5
 # Lily Pad (Sound Type)
 LILY_PAD=0.0
-# Wool (Sound Type)
-WOOL=1.5
-# Cherry Wood Hanging Sign (Sound Type)
-CHERRY_WOOD_HANGING_SIGN=1.0
-# Mud Bricks (Sound Type)
-MUD_BRICKS=1.0
-# Gravel (Sound Type)
-GRAVEL=1.0
-# Small Dripleaf (Sound Type)
-SMALL_DRIPLEAF=0.0
-# Large Amethyst Bud (Sound Type)
-LARGE_AMETHYST_BUD=0.0
-# Chiseled Bookshelf (Sound Type)
-CHISELED_BOOKSHELF=1.0
-# Basalt (Sound Type)
-BASALT=1.0
-# Dripstone Block (Sound Type)
-DRIPSTONE_BLOCK=1.0
-# Copper (Sound Type)
-COPPER=1.0
+# Vine (Sound Type)
+VINE=0.0
+# Medium Amethyst Bud (Sound Type)
+MEDIUM_AMETHYST_BUD=0.0
+# Nether Wood Hanging Sign (Sound Type)
+NETHER_WOOD_HANGING_SIGN=1.0
 # Decorated Pot (Sound Type)
 DECORATED_POT=1.0
-# Bone Block (Sound Type)
-BONE_BLOCK=1.0
+# Deepslate Bricks (Sound Type)
+DEEPSLATE_BRICKS=1.0
+# Snow (Sound Type)
+SNOW=0.1
+# Pointed Dripstone (Sound Type)
+POINTED_DRIPSTONE=0.0
+# Ladder (Sound Type)
+LADDER=0.0
+# Soul Soil (Sound Type)
+SOUL_SOIL=1.0
+# Big Dripleaf (Sound Type)
+BIG_DRIPLEAF=1.0
+# Rooted Dirt (Sound Type)
+ROOTED_DIRT=1.0
+# Wood (Sound Type)
+WOOD=1.0
+# Sculk Catalyst (Sound Type)
+SCULK_CATALYST=1.0
+# Anvil (Sound Type)
+ANVIL=1.0
+# Azalea Leaves (Sound Type)
+AZALEA_LEAVES=1.0
+# Deepslate (Sound Type)
+DEEPSLATE=1.0
+# Stone (Sound Type)
+STONE=1.0
+# Cherry Leaves (Sound Type)
+CHERRY_LEAVES=1.0
+# Basalt (Sound Type)
+BASALT=1.0
+# Lodestone (Sound Type)
+LODESTONE=1.0
+# Cave Vines (Sound Type)
+CAVE_VINES=1.0
+# Hanging Roots (Sound Type)
+HANGING_ROOTS=1.0
 # Bamboo Wood Hanging Sign (Sound Type)
 BAMBOO_WOOD_HANGING_SIGN=1.0
 # Glass (Sound Type)
 GLASS=0.1
-# Azalea Leaves (Sound Type)
-AZALEA_LEAVES=1.0
-# Wood (Sound Type)
-WOOD=1.0
-# Twisting Vines (Sound Type)
-TWISTING_VINES=0.0
-# Hanging Sign (Sound Type)
-HANGING_SIGN=1.0
-# Nylium (Sound Type)
-NYLIUM=1.0
-# Soul Soil (Sound Type)
-SOUL_SOIL=1.0
-# Amethyst Cluster (Sound Type)
-AMETHYST_CLUSTER=1.0
-# Rooted Dirt (Sound Type)
-ROOTED_DIRT=1.0
-# Cave Vines (Sound Type)
-CAVE_VINES=1.0
-# Cherry Leaves (Sound Type)
-CHERRY_LEAVES=1.0
-# Coral Block (Sound Type)
-CORAL_BLOCK=1.0
-# Soul Sand (Sound Type)
-SOUL_SAND=1.0
-# Netherrack (Sound Type)
-NETHERRACK=1.0
-# Grass (Sound Type)
-GRASS=1.0
-# Azalea (Sound Type)
-AZALEA=1.0
-# Mangrove Roots (Sound Type)
-MANGROVE_ROOTS=1.0
 # Netherite Block (Sound Type)
 NETHERITE_BLOCK=1.0
+# Grass (Sound Type)
+GRASS=1.0
+# Sculk (Sound Type)
+SCULK=1.0
 # Mud (Sound Type)
 MUD=1.0
-# Calcite (Sound Type)
-CALCITE=1.0
+# Cherry Wood Hanging Sign (Sound Type)
+CHERRY_WOOD_HANGING_SIGN=1.0
+# Scaffolding (Sound Type)
+SCAFFOLDING=0.0
 # Candle (Sound Type)
 CANDLE=1.0
-# Packed Mud (Sound Type)
-PACKED_MUD=1.0
-# Stone (Sound Type)
-STONE=1.0
-# Muddy Mangrove Roots (Sound Type)
-MUDDY_MANGROVE_ROOTS=1.0
-# Fungus (Sound Type)
-FUNGUS=0.0
-# Deepslate (Sound Type)
-DEEPSLATE=1.0
-# Bamboo Wood (Sound Type)
-BAMBOO_WOOD=1.0
-# Crop (Sound Type)
-CROP=0.0
-# Glow Lichen (Sound Type)
-GLOW_LICHEN=0.0
-# Frogspawn (Sound Type)
-FROGSPAWN=1.0
-# Deepslate Tiles (Sound Type)
-DEEPSLATE_TILES=1.0
-# Nether Bricks (Sound Type)
-NETHER_BRICKS=1.0
-# Polished Deepslate (Sound Type)
-POLISHED_DEEPSLATE=1.0
-# Ladder (Sound Type)
-LADDER=0.0
-# Ancient Debris (Sound Type)
-ANCIENT_DEBRIS=1.0
-# Nether Ore (Sound Type)
-NETHER_ORE=1.0
-# Moss (Sound Type)
-MOSS=0.75
-# Nether Wood Hanging Sign (Sound Type)
-NETHER_WOOD_HANGING_SIGN=1.0
-# Snow (Sound Type)
-SNOW=0.1
-# Nether Wart (Sound Type)
-NETHER_WART=1.0
-# Weeping Vines (Sound Type)
-WEEPING_VINES=0.0
-# Amethyst (Sound Type)
-AMETHYST=1.0
-# Anvil (Sound Type)
-ANVIL=1.0
-# Gilded Blackstone (Sound Type)
-GILDED_BLACKSTONE=1.0
-# Sculk Shrieker (Sound Type)
-SCULK_SHRIEKER=1.0
-# Wet Grass (Sound Type)
-WET_GRASS=0.1
-# Stem (Sound Type)
-STEM=1.0
-# Hard Crop (Sound Type)
-HARD_CROP=1.0
-# Metal (Sound Type)
-METAL=1.0
-# Bamboo Sapling (Sound Type)
-BAMBOO_SAPLING=0.1
-# Nether Wood (Sound Type)
-NETHER_WOOD=1.0
-# Spore Blossom (Sound Type)
-SPORE_BLOSSOM=0.0
-# Slime Block (Sound Type)
-SLIME_BLOCK=1.0
-# Big Dripleaf (Sound Type)
-BIG_DRIPLEAF=1.0
-# Froglight (Sound Type)
-FROGLIGHT=1.0
-# Chain (Sound Type)
-CHAIN=0.0
-# Bamboo (Sound Type)
-BAMBOO=0.1
-# Shroomlight (Sound Type)
-SHROOMLIGHT=1.0
-# Moss Carpet (Sound Type)
-MOSS_CARPET=0.1
-# Deepslate Bricks (Sound Type)
-DEEPSLATE_BRICKS=1.0
-# Honey Block (Sound Type)
-HONEY_BLOCK=0.5
-# Nether Gold Ore (Sound Type)
-NETHER_GOLD_ORE=1.0
 # Sand (Sound Type)
 SAND=1.0
-# Lantern (Sound Type)
-LANTERN=1.0
-# Tuff (Sound Type)
-TUFF=1.0
-# Flowering Azalea (Sound Type)
-FLOWERING_AZALEA=1.0
-# Nether Sprouts (Sound Type)
-NETHER_SPROUTS=1.0
+# Nether Gold Ore (Sound Type)
+NETHER_GOLD_ORE=1.0
+# Hanging Sign (Sound Type)
+HANGING_SIGN=1.0
+# Azalea (Sound Type)
+AZALEA=1.0
+# Hard Crop (Sound Type)
+HARD_CROP=1.0
+# Bamboo Sapling (Sound Type)
+BAMBOO_SAPLING=0.1
+# Large Amethyst Bud (Sound Type)
+LARGE_AMETHYST_BUD=0.0
+# Sculk Shrieker (Sound Type)
+SCULK_SHRIEKER=1.0
+# Packed Mud (Sound Type)
+PACKED_MUD=1.0
+# Crop (Sound Type)
+CROP=0.0
+# Mud Bricks (Sound Type)
+MUD_BRICKS=1.0
+# Ancient Debris (Sound Type)
+ANCIENT_DEBRIS=1.0
+# Deepslate Tiles (Sound Type)
+DEEPSLATE_TILES=1.0
 # Suspicious Sand (Sound Type)
 SUSPICIOUS_SAND=1.0
+# Slime Block (Sound Type)
+SLIME_BLOCK=1.0
+# Frogspawn (Sound Type)
+FROGSPAWN=1.0
+# Lantern (Sound Type)
+LANTERN=1.0
+# Cherry Sapling (Sound Type)
+CHERRY_SAPLING=1.0
+# Nether Wood (Sound Type)
+NETHER_WOOD=1.0
+# Mangrove Roots (Sound Type)
+MANGROVE_ROOTS=1.0
+# Stem (Sound Type)
+STEM=1.0
+# Decorated Pot Cracked (Sound Type)
+DECORATED_POT_CRACKED=1.0
+# Sweet Berry Bush (Sound Type)
+SWEET_BERRY_BUSH=0.0
+# Coral Block (Sound Type)
+CORAL_BLOCK=1.0
+# Cherry Wood (Sound Type)
+CHERRY_WOOD=1.0
+# Bamboo (Sound Type)
+BAMBOO=0.1
+# Bone Block (Sound Type)
+BONE_BLOCK=1.0
+# Sculk Vein (Sound Type)
+SCULK_VEIN=1.0
+# Soul Sand (Sound Type)
+SOUL_SAND=1.0
+# Nylium (Sound Type)
+NYLIUM=1.0
+# Bamboo Wood (Sound Type)
+BAMBOO_WOOD=1.0
+# Twisting Vines (Sound Type)
+TWISTING_VINES=0.0
+# Chain (Sound Type)
+CHAIN=0.0
+# Roots (Sound Type)
+ROOTS=0.0
+# Moss (Sound Type)
+MOSS=0.75
+# Gilded Blackstone (Sound Type)
+GILDED_BLACKSTONE=1.0
+# Tuff (Sound Type)
+TUFF=1.0
+# Chiseled Bookshelf (Sound Type)
+CHISELED_BOOKSHELF=1.0
+# Wool (Sound Type)
+WOOL=1.5
 # Suspicious Gravel (Sound Type)
 SUSPICIOUS_GRAVEL=1.0
+# Wart Block (Sound Type)
+WART_BLOCK=1.0
+# Dripstone Block (Sound Type)
+DRIPSTONE_BLOCK=1.0
+# Amethyst (Sound Type)
+AMETHYST=1.0
+# Gravel (Sound Type)
+GRAVEL=1.0
+# Copper (Sound Type)
+COPPER=1.0
+# Spore Blossom (Sound Type)
+SPORE_BLOSSOM=0.0
+# Muddy Mangrove Roots (Sound Type)
+MUDDY_MANGROVE_ROOTS=1.0
+# Weeping Vines (Sound Type)
+WEEPING_VINES=0.0
+# Amethyst Cluster (Sound Type)
+AMETHYST_CLUSTER=1.0
+# Moss Carpet (Sound Type)
+MOSS_CARPET=0.1
+# Powder Snow (Sound Type)
+POWDER_SNOW=0.1
+# Shroomlight (Sound Type)
+SHROOMLIGHT=1.0
+# Fungus (Sound Type)
+FUNGUS=0.0
+# Nether Bricks (Sound Type)
+NETHER_BRICKS=1.0
+# Small Dripleaf (Sound Type)
+SMALL_DRIPLEAF=0.0
+# Small Amethyst Bud (Sound Type)
+SMALL_AMETHYST_BUD=0.0
+# Polished Deepslate (Sound Type)
+POLISHED_DEEPSLATE=1.0
+# Glow Lichen (Sound Type)
+GLOW_LICHEN=0.0
+# Calcite (Sound Type)
+CALCITE=1.0
+# Flowering Azalea (Sound Type)
+FLOWERING_AZALEA=1.0
+# Sculk Sensor (Sound Type)
+SCULK_SENSOR=1.0
+# Metal (Sound Type)
+METAL=1.0
+# Netherrack (Sound Type)
+NETHERRACK=1.0
+# Wet Grass (Sound Type)
+WET_GRASS=0.1
+# Nether Wart (Sound Type)
+NETHER_WART=1.0
--- a/config/sound_physics_remastered/reflectivity.properties
+++ b/config/sound_physics_remastered/reflectivity.properties
@ -9,205 +9,205 @@
 # By block ID:
 # minecraft\:oak_log=1.0

-# Roots (Sound Type)
-ROOTS=0.5
-# Medium Amethyst Bud (Sound Type)
-MEDIUM_AMETHYST_BUD=0.5
-# Cherry Wood (Sound Type)
-CHERRY_WOOD=0.5
-# Lodestone (Sound Type)
-LODESTONE=0.5
-# Scaffolding (Sound Type)
-SCAFFOLDING=0.5
-# Cherry Sapling (Sound Type)
-CHERRY_SAPLING=0.5
-# Pointed Dripstone (Sound Type)
-POINTED_DRIPSTONE=0.5
-# Vine (Sound Type)
-VINE=0.5
-# Sweet Berry Bush (Sound Type)
-SWEET_BERRY_BUSH=0.5
-# Small Amethyst Bud (Sound Type)
-SMALL_AMETHYST_BUD=0.5
-# Hanging Roots (Sound Type)
-HANGING_ROOTS=0.5
-# Decorated Pot Cracked (Sound Type)
-DECORATED_POT_CRACKED=0.5
-# Powder Snow (Sound Type)
-POWDER_SNOW=0.5
-# Sculk Vein (Sound Type)
-SCULK_VEIN=0.5
-# Wart Block (Sound Type)
-WART_BLOCK=0.5
-# Sculk Catalyst (Sound Type)
-SCULK_CATALYST=0.5
-# Sculk (Sound Type)
-SCULK=0.5
-# Sculk Sensor (Sound Type)
-SCULK_SENSOR=0.5
+# Nether Sprouts (Sound Type)
+NETHER_SPROUTS=0.5
+# Nether Ore (Sound Type)
+NETHER_ORE=1.1
+# Froglight (Sound Type)
+FROGLIGHT=0.5
+# Honey Block (Sound Type)
+HONEY_BLOCK=0.1
 # Lily Pad (Sound Type)
 LILY_PAD=0.5
-# Wool (Sound Type)
-WOOL=0.1
-# Cherry Wood Hanging Sign (Sound Type)
-CHERRY_WOOD_HANGING_SIGN=0.5
-# Mud Bricks (Sound Type)
-MUD_BRICKS=0.5
-# Gravel (Sound Type)
-GRAVEL=0.3
-# Small Dripleaf (Sound Type)
-SMALL_DRIPLEAF=0.5
-# Large Amethyst Bud (Sound Type)
-LARGE_AMETHYST_BUD=0.5
-# Chiseled Bookshelf (Sound Type)
-CHISELED_BOOKSHELF=0.5
-# Basalt (Sound Type)
-BASALT=1.5
-# Dripstone Block (Sound Type)
-DRIPSTONE_BLOCK=0.5
-# Copper (Sound Type)
-COPPER=1.25
+# Vine (Sound Type)
+VINE=0.5
+# Medium Amethyst Bud (Sound Type)
+MEDIUM_AMETHYST_BUD=0.5
+# Nether Wood Hanging Sign (Sound Type)
+NETHER_WOOD_HANGING_SIGN=0.5
 # Decorated Pot (Sound Type)
 DECORATED_POT=0.5
-# Bone Block (Sound Type)
-BONE_BLOCK=1.5
+# Deepslate Bricks (Sound Type)
+DEEPSLATE_BRICKS=1.5
+# Snow (Sound Type)
+SNOW=0.15
+# Pointed Dripstone (Sound Type)
+POINTED_DRIPSTONE=0.5
+# Ladder (Sound Type)
+LADDER=0.5
+# Soul Soil (Sound Type)
+SOUL_SOIL=0.2
+# Big Dripleaf (Sound Type)
+BIG_DRIPLEAF=0.5
+# Rooted Dirt (Sound Type)
+ROOTED_DIRT=0.5
+# Wood (Sound Type)
+WOOD=0.4
+# Sculk Catalyst (Sound Type)
+SCULK_CATALYST=0.5
+# Anvil (Sound Type)
+ANVIL=0.5
+# Azalea Leaves (Sound Type)
+AZALEA_LEAVES=0.5
+# Deepslate (Sound Type)
+DEEPSLATE=1.5
+# Stone (Sound Type)
+STONE=1.5
+# Cherry Leaves (Sound Type)
+CHERRY_LEAVES=0.5
+# Basalt (Sound Type)
+BASALT=1.5
+# Lodestone (Sound Type)
+LODESTONE=0.5
+# Cave Vines (Sound Type)
+CAVE_VINES=0.5
+# Hanging Roots (Sound Type)
+HANGING_ROOTS=0.5
 # Bamboo Wood Hanging Sign (Sound Type)
 BAMBOO_WOOD_HANGING_SIGN=0.5
 # Glass (Sound Type)
 GLASS=0.75
-# Azalea Leaves (Sound Type)
-AZALEA_LEAVES=0.5
-# Wood (Sound Type)
-WOOD=0.4
-# Twisting Vines (Sound Type)
-TWISTING_VINES=0.5
-# Hanging Sign (Sound Type)
-HANGING_SIGN=0.5
-# Nylium (Sound Type)
-NYLIUM=0.5
-# Soul Soil (Sound Type)
-SOUL_SOIL=0.2
-# Amethyst Cluster (Sound Type)
-AMETHYST_CLUSTER=0.5
-# Rooted Dirt (Sound Type)
-ROOTED_DIRT=0.5
-# Cave Vines (Sound Type)
-CAVE_VINES=0.5
-# Cherry Leaves (Sound Type)
-CHERRY_LEAVES=0.5
-# Coral Block (Sound Type)
-CORAL_BLOCK=0.2
-# Soul Sand (Sound Type)
-SOUL_SAND=0.2
-# Netherrack (Sound Type)
-NETHERRACK=1.1
-# Grass (Sound Type)
-GRASS=0.3
-# Azalea (Sound Type)
-AZALEA=0.5
-# Mangrove Roots (Sound Type)
-MANGROVE_ROOTS=0.5
 # Netherite Block (Sound Type)
 NETHERITE_BLOCK=1.5
+# Grass (Sound Type)
+GRASS=0.3
+# Sculk (Sound Type)
+SCULK=0.5
 # Mud (Sound Type)
 MUD=0.5
-# Calcite (Sound Type)
-CALCITE=1.5
+# Cherry Wood Hanging Sign (Sound Type)
+CHERRY_WOOD_HANGING_SIGN=0.5
+# Scaffolding (Sound Type)
+SCAFFOLDING=0.5
 # Candle (Sound Type)
 CANDLE=0.5
-# Packed Mud (Sound Type)
-PACKED_MUD=0.5
-# Stone (Sound Type)
-STONE=1.5
-# Muddy Mangrove Roots (Sound Type)
-MUDDY_MANGROVE_ROOTS=0.5
-# Fungus (Sound Type)
-FUNGUS=0.5
-# Deepslate (Sound Type)
-DEEPSLATE=1.5
-# Bamboo Wood (Sound Type)
-BAMBOO_WOOD=0.5
-# Crop (Sound Type)
-CROP=0.5
-# Glow Lichen (Sound Type)
-GLOW_LICHEN=0.5
-# Frogspawn (Sound Type)
-FROGSPAWN=0.5
-# Deepslate Tiles (Sound Type)
-DEEPSLATE_TILES=1.5
-# Nether Bricks (Sound Type)
-NETHER_BRICKS=1.5
-# Polished Deepslate (Sound Type)
-POLISHED_DEEPSLATE=1.5
-# Ladder (Sound Type)
-LADDER=0.5
-# Ancient Debris (Sound Type)
-ANCIENT_DEBRIS=0.5
-# Nether Ore (Sound Type)
-NETHER_ORE=1.1
-# Moss (Sound Type)
-MOSS=0.1
-# Nether Wood Hanging Sign (Sound Type)
-NETHER_WOOD_HANGING_SIGN=0.5
-# Snow (Sound Type)
-SNOW=0.15
-# Nether Wart (Sound Type)
-NETHER_WART=0.5
-# Weeping Vines (Sound Type)
-WEEPING_VINES=0.5
-# Amethyst (Sound Type)
-AMETHYST=1.5
-# Anvil (Sound Type)
-ANVIL=0.5
-# Gilded Blackstone (Sound Type)
-GILDED_BLACKSTONE=0.5
-# Sculk Shrieker (Sound Type)
-SCULK_SHRIEKER=0.5
-# Wet Grass (Sound Type)
-WET_GRASS=0.5
-# Stem (Sound Type)
-STEM=0.4
-# Hard Crop (Sound Type)
-HARD_CROP=0.5
-# Metal (Sound Type)
-METAL=1.25
-# Bamboo Sapling (Sound Type)
-BAMBOO_SAPLING=0.5
-# Nether Wood (Sound Type)
-NETHER_WOOD=0.5
-# Spore Blossom (Sound Type)
-SPORE_BLOSSOM=0.5
-# Slime Block (Sound Type)
-SLIME_BLOCK=0.5
-# Big Dripleaf (Sound Type)
-BIG_DRIPLEAF=0.5
-# Froglight (Sound Type)
-FROGLIGHT=0.5
-# Chain (Sound Type)
-CHAIN=0.5
-# Bamboo (Sound Type)
-BAMBOO=0.5
-# Shroomlight (Sound Type)
-SHROOMLIGHT=0.5
-# Moss Carpet (Sound Type)
-MOSS_CARPET=0.5
-# Deepslate Bricks (Sound Type)
-DEEPSLATE_BRICKS=1.5
-# Honey Block (Sound Type)
-HONEY_BLOCK=0.1
-# Nether Gold Ore (Sound Type)
-NETHER_GOLD_ORE=1.1
 # Sand (Sound Type)
 SAND=0.2
-# Lantern (Sound Type)
-LANTERN=0.5
-# Tuff (Sound Type)
-TUFF=1.5
-# Flowering Azalea (Sound Type)
-FLOWERING_AZALEA=0.5
-# Nether Sprouts (Sound Type)
-NETHER_SPROUTS=0.5
+# Nether Gold Ore (Sound Type)
+NETHER_GOLD_ORE=1.1
+# Hanging Sign (Sound Type)
+HANGING_SIGN=0.5
+# Azalea (Sound Type)
+AZALEA=0.5
+# Hard Crop (Sound Type)
+HARD_CROP=0.5
+# Bamboo Sapling (Sound Type)
+BAMBOO_SAPLING=0.5
+# Large Amethyst Bud (Sound Type)
+LARGE_AMETHYST_BUD=0.5
+# Sculk Shrieker (Sound Type)
+SCULK_SHRIEKER=0.5
+# Packed Mud (Sound Type)
+PACKED_MUD=0.5
+# Crop (Sound Type)
+CROP=0.5
+# Mud Bricks (Sound Type)
+MUD_BRICKS=0.5
+# Ancient Debris (Sound Type)
+ANCIENT_DEBRIS=0.5
+# Deepslate Tiles (Sound Type)
+DEEPSLATE_TILES=1.5
 # Suspicious Sand (Sound Type)
 SUSPICIOUS_SAND=0.5
+# Slime Block (Sound Type)
+SLIME_BLOCK=0.5
+# Frogspawn (Sound Type)
+FROGSPAWN=0.5
+# Lantern (Sound Type)
+LANTERN=0.5
+# Cherry Sapling (Sound Type)
+CHERRY_SAPLING=0.5
+# Nether Wood (Sound Type)
+NETHER_WOOD=0.5
+# Mangrove Roots (Sound Type)
+MANGROVE_ROOTS=0.5
+# Stem (Sound Type)
+STEM=0.4
+# Decorated Pot Cracked (Sound Type)
+DECORATED_POT_CRACKED=0.5
+# Sweet Berry Bush (Sound Type)
+SWEET_BERRY_BUSH=0.5
+# Coral Block (Sound Type)
+CORAL_BLOCK=0.2
+# Cherry Wood (Sound Type)
+CHERRY_WOOD=0.5
+# Bamboo (Sound Type)
+BAMBOO=0.5
+# Bone Block (Sound Type)
+BONE_BLOCK=1.5
+# Sculk Vein (Sound Type)
+SCULK_VEIN=0.5
+# Soul Sand (Sound Type)
+SOUL_SAND=0.2
+# Nylium (Sound Type)
+NYLIUM=0.5
+# Bamboo Wood (Sound Type)
+BAMBOO_WOOD=0.5
+# Twisting Vines (Sound Type)
+TWISTING_VINES=0.5
+# Chain (Sound Type)
+CHAIN=0.5
+# Roots (Sound Type)
+ROOTS=0.5
+# Moss (Sound Type)
+MOSS=0.1
+# Gilded Blackstone (Sound Type)
+GILDED_BLACKSTONE=0.5
+# Tuff (Sound Type)
+TUFF=1.5
+# Chiseled Bookshelf (Sound Type)
+CHISELED_BOOKSHELF=0.5
+# Wool (Sound Type)
+WOOL=0.1
 # Suspicious Gravel (Sound Type)
 SUSPICIOUS_GRAVEL=0.5
+# Wart Block (Sound Type)
+WART_BLOCK=0.5
+# Dripstone Block (Sound Type)
+DRIPSTONE_BLOCK=0.5
+# Amethyst (Sound Type)
+AMETHYST=1.5
+# Gravel (Sound Type)
+GRAVEL=0.3
+# Copper (Sound Type)
+COPPER=1.25
+# Spore Blossom (Sound Type)
+SPORE_BLOSSOM=0.5
+# Muddy Mangrove Roots (Sound Type)
+MUDDY_MANGROVE_ROOTS=0.5
+# Weeping Vines (Sound Type)
+WEEPING_VINES=0.5
+# Amethyst Cluster (Sound Type)
+AMETHYST_CLUSTER=0.5
+# Moss Carpet (Sound Type)
+MOSS_CARPET=0.5
+# Powder Snow (Sound Type)
+POWDER_SNOW=0.5
+# Shroomlight (Sound Type)
+SHROOMLIGHT=0.5
+# Fungus (Sound Type)
+FUNGUS=0.5
+# Nether Bricks (Sound Type)
+NETHER_BRICKS=1.5
+# Small Dripleaf (Sound Type)
+SMALL_DRIPLEAF=0.5
+# Small Amethyst Bud (Sound Type)
+SMALL_AMETHYST_BUD=0.5
+# Polished Deepslate (Sound Type)
+POLISHED_DEEPSLATE=1.5
+# Glow Lichen (Sound Type)
+GLOW_LICHEN=0.5
+# Calcite (Sound Type)
+CALCITE=1.5
+# Flowering Azalea (Sound Type)
+FLOWERING_AZALEA=0.5
+# Sculk Sensor (Sound Type)
+SCULK_SENSOR=0.5
+# Metal (Sound Type)
+METAL=1.25
+# Netherrack (Sound Type)
+NETHERRACK=1.1
+# Wet Grass (Sound Type)
+WET_GRASS=0.5
+# Nether Wart (Sound Type)
+NETHER_WART=0.5
--- a/config/xaerominimap.txt
+++ b/config/xaerominimap.txt
@ -1,5 +1,5 @@
 #CONFIG ONLY OPTIONS
-ignoreUpdate:0
+ignoreUpdate:364
 settingsButton:false
 allowWrongWorldTeleportation:false
 differentiateByServerAddress:true
--- a/config/xaerominimap_entities.json
+++ b/config/xaerominimap_entities.json
@ -10,8 +10,8 @@
  "name": "gui.xaero_entity_category_root",
  "protection": true,
  "settingOverrides": {
-    "displayed": true,
    "displayHeight": 0.0,
+    "displayed": true,
    "heightBasedFade": true,
    "renderOrder": 0.0,
    "color": 13.0,
@ -22,8 +22,8 @@
    "dotSize": 2.0,
    "renderOverMinimapFrame": 1.0,
    "icons": 1.0,
-    "names": 0.0,
    "heightLimit": 20.0,
+    "names": 0.0,
    "iconScale": 1.0
  },
  "subCategories": [
--- a/kubejs/assets/kubejs/lang/en_us.json
+++ b/kubejs/assets/kubejs/lang/en_us.json
@ -0,0 +1,18 @@
+{
+    "tagprefix.gabbro": "Gabbro %s Ore",
+    "tagprefix.shale": "Shale %s Ore",
+    "tagprefix.claystone": "Claystone %s Ore",
+    "tagprefix.limestone": "Limestone %s Ore",
+    "tagprefix.conglomerate": "Conglomerate %s Ore",
+    "tagprefix.dolomite": "Dolomite %s Ore",
+    "tagprefix.chert": "Chert %s Ore",
+    "tagprefix.chalk": "Chalk %s Ore",
+    "tagprefix.rhyolite": "Rhyolite %s Ore",
+    "tagprefix.dacite": "Dacite %s Ore",
+    "tagprefix.quartzite": "Quartzite %s Ore",
+    "tagprefix.slate": "Slate %s Ore",
+    "tagprefix.phyllite": "Phyllite %s Ore",
+    "tagprefix.schist": "Schist %s Ore",
+    "tagprefix.gneiss": "Gneiss %s Ore",
+    "tagprefix.marble": "Marble %s Ore"
+}
--- a/kubejs/startup_scripts/gregtech/stonetypes.js
+++ b/kubejs/startup_scripts/gregtech/stonetypes.js
@ -1,11 +1,56 @@
 // priority: 0

-GTCEuStartupEvents.registry('gtceu:tag_prefix', event => {
-    event.create('tfc_claystone', 'ore')
-        .stateSupplier(() => Block.getBlock('tfc:rock/raw/claystone').defaultBlockState())
-        .sound(SoundType.STONE)
-        .unificationEnabled(true)
-        .materialIconType(GTMaterialIconType.ore)
-        .generationCondition(ItemGenerationCondition.hasOreProperty)
-})
+const MapColor = Java.loadClass('net.minecraft.world.level.material.MapColor')
+const ChemicalHelper = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper")

+const StoneTypeNames = [
+    'gabbro', 
+    'shale', 
+    'claystone', 
+    'limestone', 
+    'conglomerate', 
+    'dolomite', 
+    'chert', 
+    'chalk', 
+    'rhyolite', 
+    'dacite', 
+    'quartzite', 
+    'slate', 
+    'phyllite', 
+    'schist', 
+    'gneiss', 
+    'marble'
+]
+
+// Replace + Remove Stonetypes
+GTCEuStartupEvents.registry('gtceu:tag_prefix', event => {
+    // TagPrefix.ORES.remove(TagPrefix.ore)
+    // TagPrefix.ORES.remove(TagPrefix.oreTuff)
+    // TagPrefix.ORES.remove(TagPrefix.oreDeepslate)
+    // TagPrefix.ORES.remove(TagPrefix.oreSand)
+    // TagPrefix.ORES.remove(TagPrefix.oreRedSand)
+    // TagPrefix.ORES.remove(TagPrefix.oreGravel)
+    // TagPrefix.ORES.remove(TagPrefix.oreNetherrack)
+    // TagPrefix.ORES.remove(TagPrefix.oreEndstone)
+
+    StoneTypeNames.forEach(stoneTypeName => {
+        event.create(stoneTypeName, 'ore')
+            .stateSupplier(() => Block.getBlock('tfc:rock/raw/' + stoneTypeName).defaultBlockState())
+            .sound(SoundType.STONE)
+            .unificationEnabled(true)
+            .materialIconType(GTMaterialIconType.ore)
+            .generationCondition(ItemGenerationCondition.hasOreProperty)
+    });
+
+    TagPrefix.ORES.put(TagPrefix.oreGranite, new TagPrefix.OreType(() => Block.getBlock('tfc:rock/raw/granite').defaultBlockState(), false, false, MapColor.STONE, SoundType.STONE))
+    ChemicalHelper.ORES_INVERSE.put(() => Block.getBlock('tfc:rock/raw/granite').defaultBlockState(), TagPrefix.oreGranite)
+
+    TagPrefix.ORES.put(TagPrefix.oreDiorite, new TagPrefix.OreType(() => Block.getBlock('tfc:rock/raw/diorite').defaultBlockState(), false, false, MapColor.STONE, SoundType.STONE))
+    ChemicalHelper.ORES_INVERSE.put(() => Block.getBlock('tfc:rock/raw/diorite').defaultBlockState(), TagPrefix.oreDiorite)
+
+    TagPrefix.ORES.put(TagPrefix.oreBasalt, new TagPrefix.OreType(() => Block.getBlock('tfc:rock/raw/basalt').defaultBlockState(), false, false, MapColor.STONE, SoundType.STONE))
+    ChemicalHelper.ORES_INVERSE.put(() => Block.getBlock('tfc:rock/raw/basalt').defaultBlockState(), TagPrefix.oreBasalt)
+
+    TagPrefix.ORES.put(TagPrefix.oreAndesite, new TagPrefix.OreType(() => Block.getBlock('tfc:rock/raw/andesite').defaultBlockState(), false, false, MapColor.STONE, SoundType.STONE))
+    ChemicalHelper.ORES_INVERSE.put(() => Block.getBlock('tfc:rock/raw/andesite').defaultBlockState(), TagPrefix.oreAndesite)
+})
--- a/mods/Fastload-Reforged-mc1.20.1-3.4.0.jard
+++ b/mods/Fastload-Reforged-mc1.20.1-3.4.0.jard
--- a/mods/ImmediatelyFast-1.2.3+1.20.1.jard
+++ b/mods/ImmediatelyFast-1.2.3+1.20.1.jard
--- a/mods/Ksyxis-Forge1.17-1.1.jard
+++ b/mods/Ksyxis-Forge1.17-1.1.jard
--- a/mods/TerraFirmaCraft-Forge-1.20.1-3921-indev.jar
+++ b/mods/TerraFirmaCraft-Forge-1.20.1-3921-indev.jar
--- a/mods/gtceu-forge-1.20.1-1.0.12.f-build_212.jar
+++ b/mods/gtceu-forge-1.20.1-1.0.12.f-build_212.jar
--- a/mods/memoryleakfix-forge-1.17+-1.1.2.jard
+++ b/mods/memoryleakfix-forge-1.17+-1.1.2.jard
--- a/mods/modelfix-1.14.jard
+++ b/mods/modelfix-1.14.jard
--- a/mods/modernfix-forge-5.7.2+mc1.20.1.jard
+++ b/mods/modernfix-forge-5.7.2+mc1.20.1.jard
--- a/mods/starlight-1.1.2+forge.1cda73c.jard
+++ b/mods/starlight-1.1.2+forge.1cda73c.jard
--- a/profile.json
+++ b/profile.json