From a037a7f0311774f5a186ba536ab44bec5fdbe8c3 Mon Sep 17 00:00:00 2001
From: Unknown <lemadec.fr@gmail.com>
Date: Tue, 18 Dec 2018 23:02:50 +0100
Subject: [PATCH] Updated default configuration files for 1.12.2 (wip)

- fixed extra stone/cobblestone in nether/end/non-UBC asteroids & moons
- use new blockState format in ship structures
- explicit mod filtering in loot tables to detect registry changes
- support new UBC registry names
- added more ores by default
- shifted default dimension ids to avoid conflict with AdvancedRocketry
---
 .../config/celestialObjects-default.xml       |   4 +-
 .../resources/config/fillerSets-default.xml   | 239 +++++++++++---
 .../config/fillerSets-undergroundbiomes.xml   |  92 ++++--
 .../resources/config/lootSets-default.xml     | 176 +++++-----
 .../resources/config/structures-default.xml   | 300 +++++++++---------
 src/main/resources/config/structures-ship.xml |  46 +--
 6 files changed, 532 insertions(+), 325 deletions(-)

diff --git a/src/main/resources/config/celestialObjects-default.xml b/src/main/resources/config/celestialObjects-default.xml
index fad80374..fc17625c 100644
--- a/src/main/resources/config/celestialObjects-default.xml
+++ b/src/main/resources/config/celestialObjects-default.xml
@@ -42,7 +42,7 @@
 		  dimension.gravity: this is the gravity simulation type. Valid keywords are 'none' (0.0), 'legacySpace', 'legacyHyperspace', 'normal' (1.0) or any value between 0 and 1.
 		  dimension.center.x, dimension.center.z: those are the center coordinate of that dimension world border, measured in blocks. For convenience, it's usually 0, 0.
 		  -->
-		<dimension id="-3" isBreathable="false" isHyperspace="true" gravity="legacyHyperspace">
+		<dimension id="-100" isBreathable="false" isHyperspace="true" gravity="legacyHyperspace">
 			<center x="0" z="0" />
 			<!--
 			  provider defines how the world biomes are generated. If it's missing, the mod tries to self-assign space and hyperspace dimensions.
@@ -84,7 +84,7 @@
 			<size x="200000" z="200000" />
 			<name>Space</name>
 			<description>The void, filled with §6resources§r.</description>
-			<dimension id="-2" isBreathable="false" gravity="legacySpace">
+			<dimension id="-101" isBreathable="false" gravity="legacySpace">
 				<center x="0" z="0" />
 				<provider type="WarpDriveSpace" />
 				<!--
diff --git a/src/main/resources/config/fillerSets-default.xml b/src/main/resources/config/fillerSets-default.xml
index 2006d14f..b02ee1f7 100644
--- a/src/main/resources/config/fillerSets-default.xml
+++ b/src/main/resources/config/fillerSets-default.xml
@@ -33,19 +33,43 @@
 	
 	<fillerSet group="overworld_commonOres" name="stone">
 		<import group="overworld_commonOres" name="allButVanilla" />
-		<filler block="minecraft:coal_ore" ratio=".08" />
-		<filler block="minecraft:iron_ore" ratio=".05" />
-		<filler block="minecraft:redstone_ore" ratio=".02" />
+		<filler block="minecraft:coal_ore" ratio=".06" />
+		<filler block="minecraft:iron_ore" ratio=".04" />
+		<filler block="minecraft:redstone_ore" ratio=".008" mods="!thermalfoundation" />
+		<filler block="minecraft:redstone_ore" ratio=".002" mods="thermalfoundation" />
+		<filler block="thermalfoundation:ore_fluid" metadata="2" ratio=".006" />
 	</fillerSet>
 	<fillerSet group="overworld_commonOres" name="allButVanilla">
-		<filler block="ic2:resource" metadata="3" ratio=".05" mods="ic2,!immersiveengineering" /><!-- Tin -->
-		<filler block="ic2:resource" metadata="1" ratio=".06" mods="ic2,!immersiveengineering" /><!-- Copper -->
-		<filler block="ic2:resource" metadata="2" ratio=".06" mods="ic2,!immersiveengineering" /><!-- Lead -->
-		<filler block="immersiveengineering:ore" metadata="0" ratio=".05" mods="immersiveengineering" /><!-- Copper -->
-		<filler block="immersiveengineering:ore" metadata="1" ratio=".06" mods="immersiveengineering" /><!-- Bauxite -->
-		<filler block="immersiveengineering:ore" metadata="2" ratio=".06" mods="immersiveengineering" /><!-- Lead -->
-		<filler block="arsmagica2:vinteumOre" metadata="0" ratio=".001" mods="arsmagica2" /><!-- Vinteum -->
-		<filler block="icbm:sulfur_ore" ratio=".001" /><!-- to be confirmed -->
+		<filler block="arsmagica2:vinteumOre" metadata="0" ratio=".024" mods="arsmagica2,!undergroundbiomes" /><!-- Vinteum -->
+		<filler block="ebwizardry:crystal_ore" metadata="0" ratio=".024" mods="arsmagica2,!undergroundbiomes" /><!-- Magic Crystal -->
+		<filler block="appliedenergistics2:quartz_ore" ratio=".008" mods="appliedenergistics2,!undergroundbiomes" /><!-- Certus quartz -->
+		<filler block="evilcraft:dark_ore" ratio=".016" mods="evilcraft,!undergroundbiomes" /><!-- Dark gem -->
+		<filler block="ic2:resource" metadata="1" ratio=".048" mods="ic2,!immersiveengineering,!Metallurgy" /><!-- Copper -->
+		<filler block="ic2:resource" metadata="3" ratio=".032" mods="ic2,!Metallurgy" /><!-- Tin -->
+		<filler block="ic2:resource" metadata="2" ratio=".024" mods="ic2,!immersiveengineering" /><!-- Lead -->
+		<filler block="immersiveengineering:ore" metadata="0" ratio=".048" mods="immersiveengineering,!Metallurgy,!undergroundbiomes" /><!-- Copper -->
+		<filler block="immersiveengineering:ore" metadata="1" ratio=".032" mods="immersiveengineering,!undergroundbiomes" /><!-- Bauxite/Aluminum -->
+		<filler block="immersiveengineering:ore" metadata="2" ratio=".024" mods="immersiveengineering,!undergroundbiomes" /><!-- Lead -->
+		<filler block="LanteaCraft:blockLanteaOre" metadata="2" ratio=".008" mods="LanteaCraft" /><!-- Trinium -->
+		<filler block="mekanism:oreblock" metadata="0" ratio=".004" mods="mekanism,!undergroundbiomes" /><!-- Osmium -->
+		<filler block="mekanism:oreblock" metadata="0" ratio=".048" mods="mekanism,!Metallurgy,!undergroundbiomes" /><!-- Copper -->
+		<filler block="mekanism:oreblock" metadata="0" ratio=".032" mods="mekanism,!Metallurgy,!undergroundbiomes" /><!-- Tin -->
+		<filler block="Metallurgy:base.ore" metadata="0" ratio=".048" mods="Metallurgy,!undergroundbiomes" /><!-- Copper -->
+		<filler block="Metallurgy:base.ore" metadata="1" ratio=".032" mods="Metallurgy,!undergroundbiomes" /><!-- Tin -->
+		<filler block="Metallurgy:base.ore" metadata="2" ratio=".008" mods="Metallurgy,!undergroundbiomes" /><!-- Manganese -->
+		<filler block="Metallurgy:fantasy.ore" metadata="0" ratio=".020" mods="Metallurgy,!undergroundbiomes" /><!-- Prometheum -->
+		<filler block="Metallurgy:fantasy.ore" metadata="1" ratio=".012" mods="Metallurgy,!undergroundbiomes" /><!-- Deep Iron -->
+		<filler block="Metallurgy:fantasy.ore" metadata="2" ratio=".012" mods="Metallurgy,!undergroundbiomes" /><!-- Infuscolium -->
+		<filler block="Metallurgy:fantasy.ore" metadata="4" ratio=".008" mods="Metallurgy,!undergroundbiomes" /><!-- Oureclase -->
+		<filler block="Metallurgy:utility.ore" metadata="0" ratio=".006" mods="Metallurgy,!undergroundbiomes" /><!-- Sulfur -->
+		<filler block="Metallurgy:utility.ore" metadata="1" ratio=".006" mods="Metallurgy,!undergroundbiomes" /><!-- Phosphorite -->
+		<filler block="Metallurgy:utility.ore" metadata="2" ratio=".007" mods="Metallurgy,!undergroundbiomes" /><!-- Saltpeter -->
+		<filler block="Metallurgy:utility.ore" metadata="3" ratio=".006" mods="Metallurgy,!undergroundbiomes" /><!-- Magnesium -->
+		<filler block="Metallurgy:utility.ore" metadata="4" ratio=".006" mods="offMetallurgy,!undergroundbiomes" /><!-- Bitumen -->
+		<filler block="Metallurgy:utility.ore" metadata="5" ratio=".006" mods="Metallurgy,!undergroundbiomes" /><!-- Potash -->
+		<filler block="thermalfoundation:ore" metadata="0" ratio=".048" mods="thermalfoundation,!immersiveengineering,!Metallurgy" /><!-- Copper -->
+		<filler block="thermalfoundation:ore" metadata="1" ratio=".032" mods="thermalfoundation,!immersiveengineering,!Metallurgy" /><!-- Tin -->
+		<filler block="thermalfoundation:ore" metadata="3" ratio=".024" mods="thermalfoundation,!immersiveengineering" /><!-- Lead -->
 	</fillerSet>
 	
 	
@@ -71,15 +95,36 @@
 	
 	<fillerSet group="overworld_uncommonOres" name="stone">
 		<import group="overworld_uncommonOres" name="allButVanilla" />
-		<filler block="minecraft:redstone_ore" ratio=".01" />
-		<filler block="minecraft:gold_ore" ratio=".008" />
-		<filler block="minecraft:lapis_ore" ratio=".005" />
+		<filler block="minecraft:redstone_ore" ratio=".008" mods="!thermalfoundation" />
+		<filler block="thermalfoundation:ore_fluid" metadata="2" ratio=".008" />
+		<filler block="minecraft:gold_ore" ratio=".010" />
+		<filler block="minecraft:lapis_ore" ratio=".008" />
 	</fillerSet>
 	<fillerSet group="overworld_uncommonOres" name="allButVanilla">
-		<filler block="ic2:resource" metadata="4" ratio=".005" mods="ic2,!netherores" /><!-- Uranium -->
-		<filler block="immersiveengineering:ore" metadata="3" ratio=".03" mods="immersiveengineering" /><!-- Silver -->
-		<filler block="immersiveengineering:ore" metadata="4" ratio=".02" mods="immersiveengineering" /><!-- Nickel -->
-		<filler block="arsmagica2:vinteumOre" metadata="1" ratio=".01" mods="arsmagica2" /><!-- Chimerite -->
+		<filler block="biomesoplenty:gem_ore" metadata="6" ratio="tbd" mods="biomesoplenty,!undergroundbiomes" /><!-- Sapphire -->
+		<filler block="appliedenergistics2:quartz_ore" ratio=".010" mods="appliedenergistics2,!undergroundbiomes" /><!-- Certus quartz -->
+		<filler block="appliedenergistics2:charged_quartz_ore" ratio=".004" mods="appliedenergistics2,!undergroundbiomes" /><!-- Charged Certus quartz -->
+		<filler block="arsmagica2:vinteumOre" metadata="1" ratio=".006" mods="arsmagica2,!undergroundbiomes" /><!-- Chimerite -->
+		<filler block="deepresonance:resonating_ore" metadata="0" ratio=".001" mods="ic2,!undergroundbiomes" /><!-- Resonating -->
+		<filler block="ic2:resource" metadata="4" ratio=".001" mods="ic2,!netherores,!undergroundbiomes" /><!-- Uranium -->
+		<filler block="nuclearcraft:ore" metadata="3" ratio=".002" mods="nuclearcraft,!undergroundbiomes" /><!-- Thorium -->
+		<filler block="nuclearcraft:ore" metadata="4" ratio=".002" mods="nuclearcraft,!ic2,!undergroundbiomes" /><!-- Uranium -->
+		<filler block="nuclearcraft:ore" metadata="5" ratio=".004" mods="nuclearcraft,!undergroundbiomes" /><!-- Boron -->
+		<filler block="nuclearcraft:ore" metadata="6" ratio=".003" mods="nuclearcraft,!undergroundbiomes" /><!-- Lithium -->
+		<filler block="nuclearcraft:ore" metadata="7" ratio=".006" mods="nuclearcraft,!undergroundbiomes" /><!-- Magnesium -->
+		<filler block="immersiveengineering:ore" metadata="3" ratio=".015" mods="immersiveengineering,!Metallurgy" /><!-- Silver -->
+		<filler block="immersiveengineering:ore" metadata="4" ratio=".015" mods="immersiveengineering,!undergroundbiomes" /><!-- Nickel -->
+		<filler block="LanteaCraft:blockLanteaOre" metadata="0" ratio=".005" mods="LanteaCraft" /><!-- Naquadah -->
+		<filler block="Metallurgy:fantasy.ore" metadata="5" ratio=".008" mods="Metallurgy,!undergroundbiomes" /><!-- Astral Silver -->
+		<filler block="Metallurgy:fantasy.ore" metadata="6" ratio=".0064" mods="Metallurgy,!undergroundbiomes" /><!-- Carmot -->
+		<filler block="Metallurgy:fantasy.ore" metadata="7" ratio=".0064" mods="Metallurgy,!undergroundbiomes" /><!-- Mithril -->
+		<filler block="Metallurgy:fantasy.ore" metadata="8" ratio=".004" mods="Metallurgy,!undergroundbiomes" /><!-- Rubracium -->
+		<filler block="Metallurgy:precious.ore" metadata="0" ratio=".015" mods="Metallurgy,!undergroundbiomes" /><!-- Zinc -->
+		<filler block="Metallurgy:precious.ore" metadata="1" ratio=".015" mods="Metallurgy,!undergroundbiomes" /><!-- Silver -->
+		<filler block="mekanism:oreblock" metadata="0" ratio=".010" mods="mekanism,!undergroundbiomes" /><!-- Osmium -->
+		<filler block="thermalfoundation:ore" metadata="2" ratio=".015" mods="thermalfoundation,!Metallurgy" /><!-- Silver -->
+		<filler block="thermalfoundation:ore" metadata="4" ratio=".015" mods="thermalfoundation,!immersiveengineering" /><!-- Ferrous/Nickel -->
+		<filler block="thermalfoundation:ore" metadata="6" ratio=".0064" mods="thermalfoundation,!Metallurgy" /><!-- Mana infused/Mithril -->
 	</fillerSet>
 	
 	
@@ -93,7 +138,7 @@
 	<fillerSet group="overworld_rare" name="obsidian" weight="2">
 		<import group="overworld_rareOres" name="stone" />
 		<filler block="minecraft:obsidian" weight="100" />
-		<filler block="minecraft:diamond_ore" weight="10" />
+		<filler block="minecraft:diamond_ore" weight="5" />
 		<filler block="minecraft:bedrock" weight="1" />
 	</fillerSet>
 	
@@ -104,8 +149,21 @@
 		<filler block="minecraft:emerald_ore" ratio=".001" />
 	</fillerSet>
 	<fillerSet group="overworld_rareOres" name="allButVanilla">
-		<filler block="ic2:resource" metadata="4" ratio=".03" mods="ic2,!netherores" />
-		<filler block="arsmagica2:vinteumOre" metadata="2" ratio=".01" mods="arsmagica2" /><!-- Blue topaz -->
+		<filler block="ic2:resource" metadata="4" ratio=".030" mods="off,ic2,!netherores,!undergroundbiomes" /><!-- Uranium -->
+		<filler block="nuclearcraft:ore" metadata="3" ratio=".015" mods="nuclearcraft,!undergroundbiomes" /><!-- Thorium -->
+		<filler block="nuclearcraft:ore" metadata="4" ratio=".015" mods="nuclearcraft,!ic2,!undergroundbiomes" /><!-- Uranium -->
+		<filler block="nuclearcraft:ore" metadata="5" ratio=".030" mods="nuclearcraft,!undergroundbiomes" /><!-- Boron -->
+		<filler block="nuclearcraft:ore" metadata="6" ratio=".020" mods="nuclearcraft,!undergroundbiomes" /><!-- Lithium -->
+		<filler block="nuclearcraft:ore" metadata="7" ratio=".030" mods="nuclearcraft,!undergroundbiomes" /><!-- Magnesium -->
+		<filler block="appliedenergistics2:charged_quartz_ore" ratio=".005" mods="appliedenergistics2,!undergroundbiomes" /><!-- Charged certus quartz -->
+		<filler block="arsmagica2:vinteumOre" metadata="2" ratio=".008" mods="arsmagica2,!undergroundbiomes" /><!-- Blue topaz -->
+		<filler block="LanteaCraft:blockLanteaOre" metadata="1" ratio=".006" mods="LanteaCraft" /><!-- Naquadriah -->
+		<filler block="Metallurgy:fantasy.ore" metadata="11" ratio=".006" mods="Metallurgy,!undergroundbiomes" /><!-- Orichalcum -->
+		<filler block="Metallurgy:fantasy.ore" metadata="13" ratio=".004" mods="Metallurgy,!undergroundbiomes" /><!-- Adamantine -->
+		<filler block="Metallurgy:fantasy.ore" metadata="14" ratio=".004" mods="Metallurgy,!undergroundbiomes" /><!-- Atlarus -->
+		<filler block="Metallurgy:precious.ore" metadata="2" ratio=".006" mods="Metallurgy,!undergroundbiomes" /><!-- Platinum -->
+		<filler block="StargateTech2:block.naquadah" ratio=".002" mods="StargateTech2,!undergroundbiomes" /><!-- Naquadah -->
+		<filler block="thermalfoundation:ore" metadata="5" ratio=".006" mods="thermalfoundation,!Metallurgy" /><!-- Shiny/Platinum -->
 	</fillerSet>
 	
 	
@@ -117,10 +175,28 @@
 	</fillerSet>
 	
 	<fillerSet group="nether_ores" name="netherrack">
-		<filler block="minecraft:quartz_ore" ratio="0.1" />
-		<filler block="minecraft:glowstone" ratio="0.01" />
-		<filler block="minecraft:lava" ratio="0.02" />
-		<filler block="arsmagica2:vinteumOre" metadata="4" ratio=".001" mods="arsmagica2" /><!-- Sunstone -->
+		<filler block="minecraft:quartz_ore" ratio="0.07" />
+		<filler block="minecraft:glowstone" ratio="0.0075" />
+		<filler block="minecraft:lava" ratio="0.01" />
+		<filler block="nex:amethyst_ore" ratio="0.009" mods="nex" />
+		<filler block="nex:rime_ore" ratio="0.007" mods="nex" />
+		<filler block="draconicevolution:draconium_ore" metadata="1" ratio="0.002" mods="draconicevolution" />
+		<filler block="deepresonance:resonating_ore" metadata="1" ratio="0.0028" mods="deepresonance" />
+		<filler block="deepresonance:resonating_crystal" ratio="0.0005" mods="deepresonance" />
+		<filler block="arsmagica2:vinteumOre" metadata="4" ratio=".0005" mods="arsmagica2" /><!-- Sunstone -->
+		<filler block="Metallurgy:nether.ore" metadata="0" ratio=".036" mods="Metallurgy" /><!-- Ignatius -->
+		<filler block="Metallurgy:nether.ore" metadata="1" ratio=".028" mods="Metallurgy" /><!-- Shadow Iron -->
+		<filler block="Metallurgy:nether.ore" metadata="2" ratio=".024" mods="Metallurgy" /><!-- Lemurite -->
+		<filler block="Metallurgy:nether.ore" metadata="3" ratio=".020" mods="Metallurgy" /><!-- Midasium -->
+		<filler block="Metallurgy:nether.ore" metadata="4" ratio=".018" mods="Metallurgy" /><!-- Vyroxeres -->
+		<filler block="Metallurgy:nether.ore" metadata="5" ratio=".010" mods="Metallurgy" /><!-- Ceruclase -->
+		<filler block="Metallurgy:nether.ore" metadata="6" ratio=".008" mods="Metallurgy" /><!-- Alduorite -->
+		<filler block="Metallurgy:nether.ore" metadata="7" ratio=".008" mods="Metallurgy" /><!-- Kalendrite -->
+		<filler block="Metallurgy:nether.ore" metadata="8" ratio=".012" mods="Metallurgy" /><!-- Vulcanite -->
+		<filler block="Metallurgy:nether.ore" metadata="9" ratio=".005" mods="Metallurgy" /><!-- Sanguinite -->
+		<filler block="tconstruct:ore" metadata="0" ratio=".004" mods="tconstruct" /><!-- Cobalt -->
+		<filler block="tconstruct:ore" metadata="1" ratio=".004" mods="tconstruct" /><!-- Ardite -->
+		<filler block="undergroundbiomes:igneous_stone_thaumcraft_ore_cinnabar" metadata="0" ratio=".004" mods="thaumcraft,undergroundbiomes" /><!-- Red granite Cinnabar -->
 		<filler block="minecraft:bedrock" ratio=".001" />
 	</fillerSet>
 	
@@ -128,14 +204,18 @@
 	<!-- end ores with simple base block -->
 	<fillerSet group="end" name="end" weight="10">
 		<import group="end_ores" name="endstone" />
-		<filler block="minecraft:netherrack" weight="100" />
-		<filler block="minecraft:lava" weight="5" />
+		<filler block="minecraft:end_stone" weight="100" />
 	</fillerSet>
 	
 	<fillerSet group="end_ores" name="endstone">
-		<filler block="arsmagica2:vinteumOre" metadata="3" ratio=".001" mods="arsmagica2" /><!-- Moonstone -->
-		<filler block="ae2:quartz" ratio=".0013" mods="appliedenergistics2" />
-		<filler block="warpdrive:iridium_block" ratio=".0001" mods="!netherores" />
+		<filler block="appliedenergistics2:quartz" ratio=".005" mods="appliedenergistics2" /><!-- Certus quartz -->
+		<filler block="arsmagica2:vinteumOre" metadata="3" ratio=".005" mods="arsmagica2,!undergroundbiomes" /><!-- Moonstone -->
+		<filler block="undergroundbiomes:metamorphic_arsmagica2:ores.3" metadata="2" ratio=".005" mods="arsmagica2,undergroundbiomes" /><!-- Marble Moonstone -->
+		<filler block="thaumcraft:ore_cinnabar" metadata="0" ratio=".005" mods="thaumcraft,!undergroundbiomes" /><!-- Cinnabar -->
+		<filler block="undergroundbiomes:metamorphic_stone_thaumcraft_ore_cinnabar" metadata="2" ratio=".005" mods="thaumcraft,undergroundbiomes" /><!-- Marble Cinnabar -->
+		<filler block="Metallurgy:ender.ore" metadata="0" ratio=".020" mods="Metallurgy" /><!-- Eximite -->
+		<filler block="Metallurgy:ender.ore" metadata="1" ratio=".010" mods="Metallurgy" /><!-- Meutoite -->
+		<filler block="warpdrive:iridium_block" ratio=".001" mods="!netherores" />
 	</fillerSet>
 	
 	
@@ -158,6 +238,9 @@
 		<fillerSet group="overworld_surface" name="stainedClay_%metadata%" weight="5">
 			<filler block="minecraft:stained_hardened_clay" metadata="%metadata%" weight="100" />
 		</fillerSet>
+		<fillerSet group="overworld_surface" name="concrete_%metadata%" weight="5">
+			<filler block="minecraft:concrete" metadata="%metadata%" weight="100" />
+		</fillerSet>
 	</for>
 	<fillerSet group="overworld_surface" name="hardenedClay" weight="5">
 		<filler block="minecraft:hardened_clay" weight="100" />
@@ -176,8 +259,11 @@
 		<filler block="minecraft:quartz_ore" weight="2" />
 	</fillerSet>
 	<for variable="metadata" in="1,6,14">
-		<fillerSet group="nether_surface" name="stainedClay_%metadata%" weight="15">
-			<filler block="minecraft:stained_hardened_clay" metadata="%metadata%" weight="5" />
+		<fillerSet group="nether_surface" name="stainedClay_%metadata%" weight="10">
+			<filler block="minecraft:stained_hardened_clay" metadata="%metadata%" weight="100" />
+		</fillerSet>
+		<fillerSet group="nether_surface" name="concrete_%metadata%" weight="10">
+			<filler block="minecraft:concrete" metadata="%metadata%" weight="100" />
 		</fillerSet>
 	</for>
 	<fillerSet group="nether_surface" name="soulsand" weight="20">
@@ -194,9 +280,12 @@
 		<filler block="minecraft:obsidian" weight="15" />
 	</fillerSet>
 	<for variable="metadata" in="0,4">
-		<fillerSet group="end_surface" name="stainedClay_%metadata%" weight="15">
+		<fillerSet group="end_surface" name="stainedClay_%metadata%" weight="10">
 			<filler block="minecraft:stained_hardened_clay" metadata="%metadata%" weight="100" />
 		</fillerSet>
+		<fillerSet group="end_surface" name="concrete_%metadata%" weight="10">
+			<filler block="minecraft:concrete" metadata="%metadata%" weight="100" />
+		</fillerSet>
 	</for>
 	<fillerSet group="end_surface" name="clay" weight="15">
 		<filler block="minecraft:clay" weight="100" />
@@ -216,10 +305,16 @@
 	
 	<!-- ship hull -->
 	<for variable="colorMetadata" in="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15">
-		<fillerSet group="hull_plain" name="clay_%colorMetadata%" weight="20">
+		<fillerSet group="hull_plain" name="clay_%colorMetadata%" weight="10">
 			<filler block="minecraft:stained_hardened_clay" metadata="%colorMetadata%" weight="100" />
 		</fillerSet>
-		<fillerSet group="hull_glass" name="clay_%colorMetadata%" weight="20">
+		<fillerSet group="hull_glass" name="clay_%colorMetadata%" weight="10">
+			<filler block="minecraft:stained_glass" metadata="%colorMetadata%" weight="100" />
+		</fillerSet>
+		<fillerSet group="hull_plain" name="concrete_%colorMetadata%" weight="10">
+			<filler block="minecraft:concrete" metadata="%colorMetadata%" weight="100" />
+		</fillerSet>
+		<fillerSet group="hull_glass" name="concrete_%colorMetadata%" weight="10">
 			<filler block="minecraft:stained_glass" metadata="%colorMetadata%" weight="100" />
 		</fillerSet>
 		<fillerSet group="hull_plain" name="basic_%colorMetadata%" weight="40">
@@ -293,9 +388,9 @@
 	
 	
 	<!-- ship solar panel -->
-	<fillerSet group="ship_solarPanel" name="AdvancedSolarPanel" weight="20" mods="AdvancedSolarPanel">
-		<filler block="AdvancedSolarPanel:BlockAdvSolarPanel" nbt="{facing:5}" metadata="0" weight="200" />
-		<filler block="AdvancedSolarPanel:BlockAdvSolarPanel" nbt="{facing:5}" metadata="1" weight="100" />
+	<fillerSet group="ship_solarPanel" name="advanced_solar_panels" weight="20" mods="advanced_solar_panels">
+		<filler block="advanced_solar_panels:machines" nbt="{facing:5}" metadata="2" weight="200" />
+		<filler block="advanced_solar_panels:machines" nbt="{facing:5}" metadata="3" weight="100" />
 	</fillerSet>
 	<fillerSet group="ship_solarPanel" name="ic2" weight="10" mods="ic2">
 		<filler block="ic2:te" metadata="3" nbt="{facing:5,id:&quot;ic2:solar_generator&quot;}" weight="100" />
@@ -317,7 +412,7 @@
 	
 	
 	<!-- ship wiring -->
-	<fillerSet group="ship_wiring" name="advancedSolarPanel" weight="10" mods="AdvancedSolarPanel">
+	<fillerSet group="ship_wiring" name="advanced_solar_panels" weight="10" mods="advanced_solar_panels">
 		<import group="ship_wiring" name="ic2" />
 	</fillerSet>
 	<fillerSet group="ship_wiring" name="ic2" weight="10" mods="ic2">
@@ -333,7 +428,10 @@
 	</fillerSet>
 	<fillerSet group="ship_wiring" name="enderio_with_thermaldynamics" weight="5" mods="enderio,thermaldynamics">
 		<import group="ship_wiring" name="enderio" />
-		<import group="ship_wiring" name="thermaldynamics_without_enderio" />
+		<!-- manual import of group "ship_wiring" with name "thermaldynamics_without_enderio" -->
+		<filler block="thermaldynamics:ThermalDynamics_0" metadata="0" weight="100" /><!-- Leadstone Fluxduct -->
+		<filler block="thermaldynamics:ThermalDynamics_0" metadata="1" weight="40" /><!-- Hardened Fluxduct -->
+		<filler block="thermaldynamics:ThermalDynamics_0" metadata="2" weight="10" /><!-- Redstone Energy Fluxduct -->
 	</fillerSet>
 	<fillerSet group="ship_wiring" name="thermaldynamics_without_enderio" weight="5" mods="thermaldynamics,!enderio">
 		<filler block="thermaldynamics:ThermalDynamics_0" metadata="0" weight="100" /><!-- Leadstone Fluxduct -->
@@ -343,13 +441,27 @@
 	<fillerSet group="ship_wiring" name="vanilla" weight="5" mods="!ic2,!enderio,!thermaldynamics">
 		<filler block="minecraft:fence" weight="100" />
 	</fillerSet>
-
-
+	
+	
 	<!-- ship propulsion -->
 	<fillerSet group="ship_propulsion" name="vanilla" weight="5">
-		<filler block="minecraft:redstone_block" weight="100" />
-		<filler block="minecraft:lapis_block" ratio="0.2" />
-		<filler block="minecraft:coal_block" ratio="0.2" />
+		<filler block="minecraft:redstone_block"                   weight="100" />
+		<filler block="minecraft:lapis_block"                      ratio="0.150" />
+		<filler block="minecraft:coal_block"                       ratio="0.150" />
+		<filler block="bigreactors:blockmetals" metadata="1"       ratio="0.025" mods="bigreactors" /><!-- Cyanite -->
+		<filler block="embers:block_dawnstone"                     ratio="0.010" mods="embers" /><!-- Dawnstone (gold + copper) -->
+		<filler block="environmentaltech:litherite" metadata="11"  ratio="0.015" mods="environmentaltech" /><!-- Litherite -->
+		<filler block="environmentaltech:erodium" metadata="11"    ratio="0.015" mods="environmentaltech" /><!-- Erodium -->
+		<filler block="mekanism:basicblock" metadata="3"           ratio="0.080" mods="mekanism" /><!-- Charcoal -->
+		<filler block="mekanism:basicblock" metadata="4"           ratio="0.070" mods="mekanism" /><!-- Refined glowstone -->
+		<filler block="nuclearcraft:block_depleted_uranium"        ratio="0.010" mods="nuclearcraft" /><!-- Deplered uranium -->
+		<filler block="nuclearcraft:block_depleted_thorium"        ratio="0.010" mods="nuclearcraft" /><!-- Deplered thorium -->
+		<filler block="nex:amethyst_block"                         ratio="0.010" mods="nex" /><!-- Amethyst -->
+		<filler block="nex:rime_block"                             ratio="0.010" mods="nex" /><!-- Rime -->
+		<filler block="projectred-exploration:stone" metadata="5"  ratio="0.015" mods="projectred-exploration" /><!-- Ruby -->
+		<filler block="projectred-exploration:stone" metadata="6"  ratio="0.015" mods="projectred-exploration" /><!-- Sapphire -->
+		<filler block="projectred-exploration:stone" metadata="7"  ratio="0.015" mods="projectred-exploration" /><!-- Peridot -->
+		<filler block="projectred-exploration:stone" metadata="11" ratio="0.060" mods="projectred-exploration" /><!-- Electrotine -->
 	</fillerSet>
 	
 	
@@ -365,6 +477,8 @@
 	</fillerSet>
 	<fillerSet group="moon.flow" name="ice" weight="3">
 		<filler block="minecraft:ice" weight="100" />
+		<filler block="minecraft:packed_ice" weight="10" />
+		<filler block="appliedenergistics2:quartz_block" weight="2" mods="appliedenergistics2" /><!-- Certus quartz block -->
 	</fillerSet>
 	<fillerSet group="moon.flow" name="clay" weight="5">
 		<filler block="minecraft:clay" weight="100" />
@@ -372,6 +486,15 @@
 	<fillerSet group="moon.flow" name="water" weight="5">
 		<filler block="minecraft:water" weight="100" />
 	</fillerSet>
+    <fillerSet group="moon.flow" name="oil" weight="50" mods="buildcraftenergy">
+        <filler block="buildcraftenergy:fluid_block_oil_heat_0" weight="5" />
+    </fillerSet>
+    <fillerSet group="moon.flow" name="oil" weight="50" mods="buildcraftenergy">
+        <filler block="buildcraftenergy:fluid_block_oil_heat_1" weight="5" />
+    </fillerSet>
+    <fillerSet group="moon.flow" name="oil" weight="50" mods="buildcraftenergy">
+        <filler block="buildcraftenergy:fluid_block_oil_heat_2" weight="5" />
+    </fillerSet>
 	<fillerSet group="moon.flow" name="empty" ratio="0.35">
 		<!-- empty fillerSet gives a random chance for the related shell to not exist at all -->
 	</fillerSet>
@@ -380,36 +503,48 @@
 	<!-- core variation for moons -->
 	<fillerSet group="moon.core" name="lava" weight="6">
 		<filler block="minecraft:lava" weight="100" />
-		<filler block="arsmagica2:vinteumOre" metadata="4" ratio=".001" mods="arsmagica2" /><!-- Sunstone -->
+        <filler block="arsmagica2:vinteumOre" metadata="4" ratio=".005" mods="arsmagica2" /><!-- Sunstone -->
+		<filler block="StargateTech2:block.naquadah" ratio=".005" mods="StargateTech2" /><!-- Naquadah -->
+        <filler block="enderio:block_alloy" metadata="1" ratio="0.001" mods="enderio" /><!-- Energetic alloy block -->
 	</fillerSet>
 	<fillerSet group="moon.core" name="stone" weight="5">
 		<import group="overworld_rare" name="stone" />
 	</fillerSet>
 	<fillerSet group="moon.core" name="obsidian" weight="1">
 		<import group="overworld_rare" name="obsidian" />
+        <filler block="enderio:block_alloy" metadata="6" ratio="0.001" mods="enderio" /><!-- Dark steel block -->
 	</fillerSet>
 	<fillerSet group="moon.core" name="water" weight="2">
 		<filler block="minecraft:water" weight="100" />
-		<filler block="minecraft:ice" ratio="0.05" />
+		<filler block="minecraft:ice" ratio="0.075" />
+ 		<filler block="minecraft:packed_ice" ratio="0.005" />
+		<filler block="appliedenergistics2:quartz_block" ratio=".005" mods="appliedenergistics2" /><!-- Certus quartz block -->
 	</fillerSet>
 	<fillerSet group="moon.core" name="ice" weight="1">
-		<filler block="minecraft:packed_ice" weight="100" />
-		<filler block="minecraft:lapis_block" ratio="0.02" />
+        <filler block="minecraft:packed_ice" weight="100" />
+        <filler block="minecraft:lapis_block" ratio="0.02" />
+		<filler block="ebwizardry:crystal_block" metadata="0" ratio="0.001" mods="ebwizardry" /><!-- Crystal block -->
+		<filler block="appliedenergistics2:quartz_block" ratio=".010" mods="appliedenergistics2" /><!-- Certus quartz block -->
 	</fillerSet>
 	<fillerSet group="moon.core" name="diaquartz" weight="1">
 		<filler block="minecraft:quartz_block" metadata="0" weight="100" />
 		<filler block="minecraft:quartz_block" metadata="1" weight="100" />
-		<filler block="minecraft:diamond_block" ratio="0.01" />
+        <filler block="minecraft:diamond_block" ratio="0.005" />
+		<filler block="ebwizardry:crystal_block" metadata="0" ratio="0.006" mods="ebwizardry" /><!-- Crystal block -->
+        <filler block="enderio:block_alloy" metadata="2" ratio="0.001" mods="enderio" /><!-- Vibrant alloy block -->
 	</fillerSet>
 	<fillerSet group="moon.core" name="iriquartz" weight="1">
 		<filler block="minecraft:quartz_block" metadata="0" weight="100" />
-		<filler block="warpdrive:iridium_block" ratio="0.001" />
+		<filler block="warpdrive:iridium_block" ratio="0.0015" />
+		<filler block="ebwizardry:crystal_block" metadata="0" ratio="0.001" mods="ebwizardry" /><!-- Crystal block -->
+		<filler block="StargateTech2:block.naquadah" metadata="8" ratio=".001" mods="StargateTech2" /><!-- Naquadah block -->
 	</fillerSet>
 	<fillerSet group="moon.core" name="iroquartz" weight="1">
 		<filler block="minecraft:quartz_block" metadata="2" weight="33" />
 		<filler block="minecraft:quartz_block" metadata="3" weight="33" />
 		<filler block="minecraft:quartz_block" metadata="4" weight="33" />
-		<filler block="minecraft:iron_block" ratio="0.01" />
+        <filler block="minecraft:iron_block" ratio="0.005" />
+        <filler block="enderio:block_alloy" metadata="0" ratio="0.001" mods="enderio" /><!-- Electrical steel block -->
 	</fillerSet>
 	<!-- TODO: add GT granite cores -->
 	<!-- TODO: add TE/EIO block of sort -->
diff --git a/src/main/resources/config/fillerSets-undergroundbiomes.xml b/src/main/resources/config/fillerSets-undergroundbiomes.xml
index 0f47b901..40fdab59 100644
--- a/src/main/resources/config/fillerSets-undergroundbiomes.xml
+++ b/src/main/resources/config/fillerSets-undergroundbiomes.xml
@@ -3,53 +3,109 @@
 				 xmlns="http://warpdrive.lemadec.org"
 				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 				 xsi:schemaLocation="http://warpdrive.lemadec.org WarpDrive.xsd"
-				 mods="UndergroundBiomes">
+				 mods="undergroundbiomes">
 
 	<for variable="type" in="igneous,metamorphic,sedimentary">
 		<for variable="metadata" from="0" to="7">
 			<!-- common overworld ores with various base blocks -->
 			<fillerSet group="overworld_common" name="%type%@%metadata%.normal" weight="15">
 				<import group="undergroundBiomes_commonOres" name="%type%@%metadata%" />
-				<filler block="UndergroundBiomes:%type%Stone" metadata="%metadata%" weight="100" />
+				<filler block="undergroundbiomes:%type%_stone" metadata="%metadata%" weight="100" />
 			</fillerSet>
 
 			<fillerSet group="undergroundBiomes_commonOres" name="%type%@%metadata%">
 				<import group="overworld_commonOres" name="allButVanilla" />
-				<filler block="UndergroundBiomes:%type%_oreCoal" metadata="%metadata%" ratio=".08" />
-				<filler block="UndergroundBiomes:%type%_oreIron" metadata="%metadata%" ratio=".05" />
-				<filler block="UndergroundBiomes:%type%_oreRedstone" metadata="%metadata%" ratio=".02" />
+				<filler block="undergroundbiomes:%type%_stone_coal_ore" metadata="%metadata%" ratio=".06" />
+				<filler block="undergroundbiomes:%type%_stone_iron_ore" metadata="%metadata%" ratio=".04" />
+				<filler block="undergroundbiomes:%type%_stone_redstone_ore" metadata="%metadata%" ratio=".008" mods="!thermalfoundation" />
+				<filler block="undergroundbiomes:%type%_stone_redstone_ore" metadata="%metadata%" ratio=".002" mods="thermalfoundation" />
+				<filler block="undergroundbiomes:%type%_stone_tile.thermalfoundation.ore.redstone.name" metadata="%metadata%" ratio=".006" mods="thermalfoundation" /><!-- Destabilized redstone -->
+				<filler block="undergroundbiomes:%type%_stone_arsmagica2:ores" metadata="%metadata%" ratio=".024" mods="arsmagica2" /><!-- Vinteum -->
+				<filler block="undergroundbiomes:%type%_stone_appliedenergistics2_quartz_ore" metadata="%metadata%" ratio=".008" mods="appliedenergistics2" /><!-- Certus quartz -->
+				<filler block="undergroundbiomes:%type%_stone_evilcraft_dark_ore" metadata="%metadata%" ratio=".016" mods="evilcraft" /><!-- Dark gem -->
+				<filler block="undergroundbiomes:%type%_stone_voltzengine:veStoneOre.1" metadata="%metadata%" ratio=".048" mods="voltzengine" /><!-- Copper -->
+				<filler block="undergroundbiomes:%type%_stone_voltzengine:veStoneOre" metadata="%metadata%" ratio=".032" mods="voltzengine" /><!-- Tin -->
+				<filler block="undergroundbiomes:%type%_stone_voltzengine:veStoneOre.6" metadata="%metadata%" ratio=".024" mods="voltzengine" /><!-- Aluminum -->
+				<filler block="undergroundbiomes:%type%_stone_voltzengine:veStoneOre.3" metadata="%metadata%" ratio=".007" mods="voltzengine" /><!-- Lead -->
+				<filler block="undergroundbiomes:%type%_stone_voltzengine:veStoneOre.7" metadata="%metadata%" ratio=".006" mods="voltzengine" /><!-- Magnesium -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.base.ore" metadata="%metadata%" ratio=".048" mods="Metallurgy,!voltzengine" /><!-- Copper -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.base.ore.1" metadata="%metadata%" ratio=".032" mods="Metallurgy,!voltzengine" /><!-- Tin -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.base.ore.2" metadata="%metadata%" ratio=".008" mods="Metallurgy" /><!-- Manganese -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore" metadata="%metadata%" ratio=".020" mods="Metallurgy" /><!-- Prometheum -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore.1" metadata="%metadata%" ratio=".012" mods="Metallurgy" /><!-- Deep Iron -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore.2" metadata="%metadata%" ratio=".012" mods="Metallurgy" /><!-- Infuscolium -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore.4" metadata="%metadata%" ratio=".008" mods="Metallurgy" /><!-- Oureclase -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore" metadata="%metadata%" ratio=".006" mods="Metallurgy" /><!-- Sulfur -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore.1" metadata="%metadata%" ratio=".006" mods="Metallurgy" /><!-- Phosphorite -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore.2" metadata="%metadata%" ratio=".007" mods="Metallurgy" /><!-- Saltpeter -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore.3" metadata="%metadata%" ratio=".006" mods="Metallurgy,!voltzengine" /><!-- Magnesium -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore.4" metadata="%metadata%" ratio=".006" mods="off,Metallurgy" /><!-- Bitumen -->
+				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore.5" metadata="%metadata%" ratio=".006" mods="Metallurgy" /><!-- Potash -->
+				<filler block="undergroundbiomes:%type%_stone_mekanism_oreblock" metadata="%metadata%" ratio=".004" mods="mekanism" /><!-- Osmium -->
 			</fillerSet>
 
 
 			<!-- uncommon overworld ores with various base blocks -->
 			<fillerSet group="overworld_uncommon" name="%type%@%metadata%.normal" weight="20">
 				<import group="undergroundBiomes_uncommonOres" name="%type%@%metadata%" />
-				<filler block="UndergroundBiomes:%type%Stone" metadata="%metadata%" weight="100" />
+				<filler block="undergroundbiomes:%type%_stone" metadata="%metadata%" weight="100" />
 			</fillerSet>
 
 			<fillerSet group="undergroundBiomes_uncommonOres" name="%type%@%metadata%">
 				<import group="overworld_uncommonOres" name="allButVanilla" />
-				<filler block="UndergroundBiomes:%type%_oreRedstone" metadata="%metadata%" ratio=".01" />
-				<filler block="UndergroundBiomes:%type%_oreGold" metadata="%metadata%" ratio=".008" />
-				<filler block="UndergroundBiomes:%type%_oreLapis" metadata="%metadata%" ratio=".005" />
+				<filler block="undergroundbiomes:%type%_stone_redstone_ore" metadata="%metadata%" ratio=".008" mods="!thermalfoundation" />
+				<filler block="undergroundbiomes:%type%_stone_tile.thermalfoundation.ore.redstone.name" metadata="%metadata%" ratio=".008" />
+				<filler block="undergroundbiomes:%type%_stone_gold_ore" metadata="%metadata%" ratio=".010" />
+				<filler block="undergroundbiomes:%type%_stone_lapis_ore" metadata="%metadata%" ratio=".008" />
+				<filler block="undergroundbiomes:%type%_stone_appliedenergistics2_quartz_ore" metadata="%metadata%" ratio=".010" mods="appliedenergistics2" /><!-- Certus quartz -->
+				<filler block="undergroundbiomes:%type%_stone_appliedenergistics2_charged_quartz_ore" metadata="%metadata%" ratio=".004" mods="appliedenergistics2" /><!-- Charged Certus quartz -->
+				<filler block="undergroundbiomes:%type%_arsmagica2:ores.1" metadata="%metadata%" ratio=".006" mods="arsmagica2" /><!-- Chimerite -->
+				<filler block="undergroundbiomes:%type%_voltzengine:veStoneOre.5" metadata="%metadata%" ratio=".015" mods="voltzengine" /><!-- Nickel -->
+				<filler block="undergroundbiomes:%type%_voltzengine:veStoneOre.4" metadata="%metadata%" ratio=".015" mods="voltzengine" /><!-- Zinc -->
+				<filler block="undergroundbiomes:%type%_voltzengine:veStoneOre.3" metadata="%metadata%" ratio=".015" mods="voltzengine" /><!-- Lead -->
+				<filler block="undergroundbiomes:%type%_voltzengine:veStoneOre.2" metadata="%metadata%" ratio=".015" mods="voltzengine" /><!-- Silver -->
+				<filler block="undergroundbiomes:%type%_stone_techguns_basicore.3-nottested" metadata="%metadata%" ratio=".008" mods="techguns" /><!-- Titanium -->
+				<filler block="undergroundbiomes:%type%_stone_immersiveengineering_ore_4" metadata="%metadata%" ratio=".015" mods="immersiveengineering,!voltzengine" /><!-- Nickel -->
+				<filler block="undergroundbiomes:%type%_metal.block.fantasy.ore.5" metadata="%metadata%" ratio=".008" mods="Metallurgy" /><!-- Astral Silver -->
+				<filler block="undergroundbiomes:%type%_metal.block.fantasy.ore.6" metadata="%metadata%" ratio=".0064" mods="Metallurgy" /><!-- Carmot -->
+				<filler block="undergroundbiomes:%type%_metal.block.fantasy.ore.7" metadata="%metadata%" ratio=".0064" mods="Metallurgy" /><!-- Mithril -->
+				<filler block="undergroundbiomes:%type%_metal.block.fantasy.ore.8" metadata="%metadata%" ratio=".004" mods="Metallurgy" /><!-- Rubracium -->
+				<filler block="undergroundbiomes:%type%_metal.block.precious.ore" metadata="%metadata%" ratio=".015" mods="Metallurgy,!voltzengine" /><!-- Zinc -->
+				<filler block="undergroundbiomes:%type%_metal.block.precious.ore.1" metadata="%metadata%" ratio=".015" mods="Metallurgy,!voltzengine" /><!-- Silver -->
+				<filler block="undergroundbiomes:%type%_stone_mekanism_oreblock" metadata="%metadata%" ratio=".010" mods="mekanism" /><!-- Osmium -->
+				<filler block="undergroundbiomes:%type%_stone_ic2.resource.uranium_ore"   metadata="%metadata%" ratio=".001" mods="ic2" /><!-- Uranium -->
+				<filler block="undergroundbiomes:%type%_stone_immersiveengineering_ore_5" metadata="%metadata%" ratio=".001" mods="immersiveengineering,!ic2" /><!-- Uranium -->
+				<filler block="undergroundbiomes:%type%_stone_bigreactors_brore"          metadata="%metadata%" ratio=".001" mods="bigreactors,!immersiveengineering,!ic2" /><!-- Uranium -->
 			</fillerSet>
 
 			<!-- rare overworld ores with various base blocks -->
 			<fillerSet group="overworld_rare" name="%type%@%metadata%.normal" weight="20">
 				<import group="undergroundBiomes_rareOres" name="%type%@%metadata%" />
-				<filler block="UndergroundBiomes:%type%Stone" metadata="%metadata%" weight="100" />
+				<filler block="undergroundbiomes:%type%_stone" metadata="%metadata%" weight="100" />
 			</fillerSet>
 
 			<fillerSet group="undergroundBiomes_rareOres" name="%type%@%metadata%">
 				<import group="overworld_rareOres" name="allButVanilla" />
-				<filler block="UndergroundBiomes:%type%_oreGold" metadata="%metadata%" ratio=".004" />
-				<filler block="UndergroundBiomes:%type%_oreDiamond" metadata="%metadata%" ratio=".004" />
-				<filler block="UndergroundBiomes:%type%_oreEmerald" metadata="%metadata%" ratio=".001" />
+				<filler block="undergroundbiomes:%type%_stone_gold_ore" metadata="%metadata%" ratio=".004" />
+				<filler block="undergroundbiomes:%type%_stone_diamond_ore" metadata="%metadata%" ratio=".004" />
+				<filler block="undergroundbiomes:%type%_stone_emerald_ore" metadata="%metadata%" ratio=".001" />
+				<filler block="undergroundbiomes:%type%_stone_appliedenergistics2_charged_quartz_ore" metadata="%metadata%" ratio=".005" mods="appliedenergistics2" /><!-- Charged certus quartz -->
+				<filler block="undergroundbiomes:%type%_arsmagica2:ores.2" metadata="%metadata%" ratio=".008" mods="arsmagica2" /><!-- Blue topaz -->
+				<filler block="undergroundbiomes:%type%_voltzengine:veStoneOre.9" metadata="%metadata%" ratio=".006" mods="voltzengine" /><!-- Platinum -->
+				<filler block="undergroundbiomes:%type%_stone_techguns_basicore.3-nottested" metadata="%metadata%" ratio=".006" mods="techguns" /><!-- Titanium -->
+				<filler block="undergroundbiomes:%type%_metal.block.fantasy.ore.11" metadata="%metadata%" ratio=".006" mods="Metallurgy" /><!-- Orichalcum -->
+				<filler block="undergroundbiomes:%type%_metal.block.fantasy.ore.13" metadata="%metadata%" ratio=".004" mods="Metallurgy" /><!-- Adamantine -->
+				<filler block="undergroundbiomes:%type%_metal.block.fantasy.ore.14" metadata="%metadata%" ratio=".004" mods="Metallurgy" /><!-- Atlarus -->
+				<filler block="undergroundbiomes:%type%_metal.block.precious.ore.2" metadata="%metadata%" ratio=".006" mods="Metallurgy,!voltzengine" /><!-- Platinum -->
+				<filler block="undergroundbiomes:%type%_stone_ic2.resource.uranium_ore"   metadata="%metadata%" ratio=".005" mods="ic2" /><!-- Uranium -->
+				<filler block="undergroundbiomes:%type%_stone_immersiveengineering_ore_5" metadata="%metadata%" ratio=".005" mods="immersiveengineering,!ic2" /><!-- Uranium -->
+				<filler block="undergroundbiomes:%type%_stone_bigreactors_brore"          metadata="%metadata%" ratio=".005" mods="bigreactors,!immersiveengineering,!ic2" /><!-- Uranium -->
+				<filler block="undergroundbiomes:%type%_.naquadah" metadata="%metadata%" ratio=".002" mods="StargateTech2" /><!-- Naquadah -->
 			</fillerSet>
 
 			<!-- assorted overworld surface blocks -->
 			<fillerSet group="overworld_surface" name="%type%@%metadata%" weight="5">
-				<filler block="UndergroundBiomes:%type%Stone" weight="100" />
+				<filler block="undergroundbiomes:%type%_stone" weight="100" />
 			</fillerSet>
 		</for>
 	</for>
@@ -60,26 +116,26 @@
             <!-- common overworld ores with various base blocks -->
             <fillerSet group="overworld_common" name="%type%@%metadata%.corrupted" weight="5">
                 <import group="undergroundBiomes_commonOres" name="%type%@%metadata%" />
-                <filler block="UndergroundBiomes:%type%Cobblestone" metadata="%metadata%" weight="100" />
+                <filler block="undergroundbiomes:%type%_cobble" metadata="%metadata%" weight="100" />
             </fillerSet>
 
             <!-- uncommon overworld ores with various base blocks -->
             <fillerSet group="overworld_uncommon" name="%type%@%metadata%.corrupted" weight="5">
                 <import group="undergroundBiomes_uncommonOres" name="%type%@%metadata%" />
-                <filler block="UndergroundBiomes:%type%Cobblestone" metadata="%metadata%" weight="100" />
+                <filler block="undergroundbiomes:%type%_cobble" metadata="%metadata%" weight="100" />
             </fillerSet>
 
             <!-- rare overworld ores with various base blocks -->
             <fillerSet group="overworld_rare" name="%type%@%metadata%.corrupted" weight="5">
                 <import group="undergroundBiomes_rareOres" name="%type%@%metadata%" />
                 <filler block="minecraft:obsidian" weight="100" />
-                <filler block="UndergroundBiomes:%type%_oreDiamond" metadata="%metadata%" weight="10" />
+                <filler block="undergroundbiomes:%type%_stone_diamond_ore" metadata="%metadata%" weight="5" />
                 <filler block="minecraft:bedrock" weight="1" />
             </fillerSet>
 
             <!-- assorted overworld surface blocks -->
             <fillerSet group="overworld_surface" name="%type%@%metadata%.corrupted" weight="2">
-                <filler block="UndergroundBiomes:%type%Cobblestone" weight="100" />
+                <filler block="undergroundbiomes:%type%_cobble" weight="100" />
             </fillerSet>
         </for>
     </for>
diff --git a/src/main/resources/config/lootSets-default.xml b/src/main/resources/config/lootSets-default.xml
index 7475cf96..cd52024a 100644
--- a/src/main/resources/config/lootSets-default.xml
+++ b/src/main/resources/config/lootSets-default.xml
@@ -18,52 +18,52 @@
 	  When used on machines, we'll give a few trials to find a valid slot for each loot, eventually try another loot, eventually skipping it altogether.
 	  -->
 	<lootSet group="ship" name="legacy" weight="1">
-		<loot item="ic2:te"                           damage="2"  minQuantity="1" maxQuantity="3"  weight="7"  /><!-- Nuke -->
-		<loot item="ic2:te"                           damage="24" minQuantity="1" maxQuantity="1"  weight="5"  /><!-- Reactor chamber -->
-		<loot item="ic2:te"                           damage="52" minQuantity="1" maxQuantity="1"  weight="10" /><!-- Thermal centrifuge -->
-		<loot item="ic2:te"                           damage="55" minQuantity="1" maxQuantity="1"  weight="10" /><!-- Metal former -->
-		<loot item="ic2:te"                           damage="56" minQuantity="1" maxQuantity="1"  weight="7"  /><!-- Ore washing -->
-		<loot item="ic2:resource"                     damage="11" minQuantity="7" maxQuantity="20" weight="10" /><!-- Reinforced stone -->
-		<loot item="ic2:glass"                        damage="0"  minQuantity="5" maxQuantity="12" weight="10" /><!-- Reinforced glass -->
-		<loot item="ic2:scaffold"                     damage="0"  minQuantity="8" maxQuantity="35" weight="10" /><!-- (wooden) scaffolding -->
-		<loot item="ic2:scaffold"                     damage="2"  minQuantity="3" maxQuantity="32" weight="10" /><!-- Iron scaffolding -->
-		<loot item="ic2:te"                           damage="3"  minQuantity="1" maxQuantity="3"  weight="10" /><!-- Generator -->
-		<loot item="ic2:te"                           damage="17" minQuantity="1" maxQuantity="3"  weight="10" /><!-- Manual Kinetic Generator -->
-		<loot item="ic2:te"                           damage="14" minQuantity="1" maxQuantity="3"  weight="5"  /><!-- Radioisotope Heat Generator -->
-		<loot item="ic2:te"                           damage="10" minQuantity="1" maxQuantity="3"  weight="10" /><!-- Water mill -->
-		<loot item="ic2:te"                           damage="8"  minQuantity="1" maxQuantity="2"  weight="10" /><!-- Solar panel -->
-		<loot item="ic2:te"                           damage="68" minQuantity="1" maxQuantity="2"  weight="10" /><!-- ChargePad (BatBox) No energy -->
-		<loot item="ic2:te"                           damage="69" minQuantity="1" maxQuantity="2"  weight="10" /><!-- ChargePad (CESU) No energy -->
-		<loot item="ic2:te"                           damage="70" minQuantity="1" maxQuantity="1"  weight="5"  /><!-- ChargePad (MFE) No energy -->
-		<loot item="ic2:te"                           damage="71" minQuantity="1" maxQuantity="1"  weight="1"  /><!-- ChargePad (MFSU) No energy -->
-		<loot item="ic2:resource"                     damage="12" minQuantity="1" maxQuantity="8"  weight="15" /><!-- Machine casing -->
-		<loot item="ic2:resource"                     damage="13" minQuantity="1" maxQuantity="1"  weight="1"  /><!-- Advanced Machine casing -->
-		<loot item="ic2:te"                           damage="43" minQuantity="1" maxQuantity="2"  weight="15" /><!-- Compressor -->
-		<loot item="ic2:te"                           damage="92" minQuantity="1" maxQuantity="1"  weight="10" /><!-- Mass fabricator -->
-		<loot item="ic2:rubber_boots"                 damage="20" minQuantity="1" maxQuantity="1"  weight="5"  /><!-- Damaged rubber boots -->
-		<loot item="ic2:rubber_boots"                 damage="0"  minQuantity="1" maxQuantity="1"  weight="2"  /><!-- Rubber boots -->
-		<loot item="ic2:crafting"                     damage="9"  minQuantity="1" maxQuantity="4"  weight="10" /><!-- Fuel rod (Empty) -->
-		<loot item="ic2:crafting"                     damage="0"  minQuantity="5" maxQuantity="24" weight="15" /><!-- Rubber -->
-		<loot item="ic2:crafting"                     damage="1"  minQuantity="1" maxQuantity="5"  weight="10" /><!-- Basic circuit -->
-		<loot item="ic2:crafting"                     damage="13" minQuantity="1" maxQuantity="4"  weight="10" /><!-- Raw Carbon Fiber -->
-		<loot item="ic2:crafting"                     damage="14" minQuantity="1" maxQuantity="4"  weight="9"  /><!-- Raw Carbon Mesh -->
-		<loot item="ic2:crafting"                     damage="15" minQuantity="1" maxQuantity="4"  weight="8"  /><!-- Carbon Plate -->
-		<loot item="ic2:energy_crystal"               damage="0"  minQuantity="1" maxQuantity="1"  weight="12" /><!-- Energy crystal (Empty) -->
+		<loot item="ic2:te"                           damage="2"  minQuantity="1" maxQuantity="3"  weight="7"  mods="ic2" /><!-- Nuke -->
+		<loot item="ic2:te"                           damage="24" minQuantity="1" maxQuantity="1"  weight="5"  mods="ic2" /><!-- Reactor chamber -->
+		<loot item="ic2:te"                           damage="52" minQuantity="1" maxQuantity="1"  weight="10" mods="ic2" /><!-- Thermal centrifuge -->
+		<loot item="ic2:te"                           damage="55" minQuantity="1" maxQuantity="1"  weight="10" mods="ic2" /><!-- Metal former -->
+		<loot item="ic2:te"                           damage="56" minQuantity="1" maxQuantity="1"  weight="7"  mods="ic2" /><!-- Ore washing -->
+		<loot item="ic2:resource"                     damage="11" minQuantity="7" maxQuantity="20" weight="10" mods="ic2" /><!-- Reinforced stone -->
+		<loot item="ic2:glass"                        damage="0"  minQuantity="5" maxQuantity="12" weight="10" mods="ic2" /><!-- Reinforced glass -->
+		<loot item="ic2:scaffold"                     damage="0"  minQuantity="8" maxQuantity="35" weight="10" mods="ic2" /><!-- (wooden) scaffolding -->
+		<loot item="ic2:scaffold"                     damage="2"  minQuantity="3" maxQuantity="32" weight="10" mods="ic2" /><!-- Iron scaffolding -->
+		<loot item="ic2:te"                           damage="3"  minQuantity="1" maxQuantity="3"  weight="10" mods="ic2" /><!-- Generator -->
+		<loot item="ic2:te"                           damage="17" minQuantity="1" maxQuantity="3"  weight="10" mods="ic2" /><!-- Manual Kinetic Generator -->
+		<loot item="ic2:te"                           damage="14" minQuantity="1" maxQuantity="3"  weight="5"  mods="ic2" /><!-- Radioisotope Heat Generator -->
+		<loot item="ic2:te"                           damage="10" minQuantity="1" maxQuantity="3"  weight="10" mods="ic2" /><!-- Water mill -->
+		<loot item="ic2:te"                           damage="8"  minQuantity="1" maxQuantity="2"  weight="10" mods="ic2" /><!-- Solar panel -->
+		<loot item="ic2:te"                           damage="68" minQuantity="1" maxQuantity="2"  weight="10" mods="ic2" /><!-- ChargePad (BatBox) No energy -->
+		<loot item="ic2:te"                           damage="69" minQuantity="1" maxQuantity="2"  weight="10" mods="ic2" /><!-- ChargePad (CESU) No energy -->
+		<loot item="ic2:te"                           damage="70" minQuantity="1" maxQuantity="1"  weight="5"  mods="ic2" /><!-- ChargePad (MFE) No energy -->
+		<loot item="ic2:te"                           damage="71" minQuantity="1" maxQuantity="1"  weight="1"  mods="ic2" /><!-- ChargePad (MFSU) No energy -->
+		<loot item="ic2:resource"                     damage="12" minQuantity="1" maxQuantity="8"  weight="15" mods="ic2" /><!-- Machine casing -->
+		<loot item="ic2:resource"                     damage="13" minQuantity="1" maxQuantity="1"  weight="1"  mods="ic2" /><!-- Advanced Machine casing -->
+		<loot item="ic2:te"                           damage="43" minQuantity="1" maxQuantity="2"  weight="15" mods="ic2" /><!-- Compressor -->
+		<loot item="ic2:te"                           damage="92" minQuantity="1" maxQuantity="1"  weight="10" mods="ic2" /><!-- Mass fabricator -->
+		<loot item="ic2:rubber_boots"                 damage="20" minQuantity="1" maxQuantity="1"  weight="5"  mods="ic2" /><!-- Damaged rubber boots -->
+		<loot item="ic2:rubber_boots"                 damage="0"  minQuantity="1" maxQuantity="1"  weight="2"  mods="ic2" /><!-- Rubber boots -->
+		<loot item="ic2:crafting"                     damage="9"  minQuantity="1" maxQuantity="4"  weight="10" mods="ic2" /><!-- Fuel rod (Empty) -->
+		<loot item="ic2:crafting"                     damage="0"  minQuantity="5" maxQuantity="24" weight="15" mods="ic2" /><!-- Rubber -->
+		<loot item="ic2:crafting"                     damage="1"  minQuantity="1" maxQuantity="5"  weight="10" mods="ic2" /><!-- Basic circuit -->
+		<loot item="ic2:crafting"                     damage="13" minQuantity="1" maxQuantity="4"  weight="10" mods="ic2" /><!-- Raw Carbon Fiber -->
+		<loot item="ic2:crafting"                     damage="14" minQuantity="1" maxQuantity="4"  weight="9"  mods="ic2" /><!-- Raw Carbon Mesh -->
+		<loot item="ic2:crafting"                     damage="15" minQuantity="1" maxQuantity="4"  weight="8"  mods="ic2" /><!-- Carbon Plate -->
+		<loot item="ic2:energy_crystal"               damage="0"  minQuantity="1" maxQuantity="1"  weight="12" mods="ic2" /><!-- Energy crystal (Empty) -->
 
-		<loot item="ic2:fluid_cell"                                                          damage="0"  minQuantity="4" maxQuantity="35" weight="15" /><!-- Empty cell -->
-		<loot item="ic2:fluid_cell"  nbt='{Fluid:{FluidName:"ic2uu_matter",Amount:1000}}'    damage="0"  minQuantity="2" maxQuantity="16" weight="12" /><!-- UU matter cell -->
-		<loot item="ic2:fluid_cell"  nbt='{Fluid:{FluidName:"ic2air",Amount:1000}}'          damage="0"  minQuantity="1" maxQuantity="18" weight="12" /><!-- Compressed air -->
-		<loot item="ic2:cable"       nbt="{type:0b,insulation:1b}" damage="0"  minQuantity="1" maxQuantity="18" weight="15" /><!-- Insulated copper cable -->
-		<loot item="ic2:cable"       nbt="{type:0b,insulation:0b}" damage="0"  minQuantity="1" maxQuantity="18" weight="12" /><!-- Copper cable -->
-		<loot item="ic2:cable"       nbt="{type:2b,insulation:0b}" damage="2"  minQuantity="1" maxQuantity="18" weight="12" /><!-- Gold cable -->
-		<loot item="ic2:cable"       nbt="{type:2b,insulation:1b}" damage="2"  minQuantity="1" maxQuantity="18" weight="13" /><!-- Insulated gold cable -->
-		<loot item="ic2:cable"       nbt="{type:3b,insulation:0b}" damage="3"  minQuantity="1" maxQuantity="18" weight="8"  /><!-- HV cable  -->
-		<loot item="ic2:cable"       nbt="{type:3b,insulation:1b}" damage="3"  minQuantity="1" maxQuantity="6"  weight="4"  /><!-- Insulated HV cable -->
-		<loot item="ic2:cable"       nbt="{type:3b,insulation:2b}" damage="3"  minQuantity="1" maxQuantity="8"  weight="4"  /><!-- Insulated HV cable -->
-		<loot item="ic2:cable"       nbt="{type:3b,insulation:3b}" damage="3"  minQuantity="1" maxQuantity="18" weight="10" /><!-- Insulated HV cable -->
-		<loot item="ic2:cable"       nbt="{type:1b,insulation:0b}" damage="1"  minQuantity="1" maxQuantity="18" weight="8"  /><!-- Glass fiber cable -->
-		<loot item="ic2:cable"       nbt="{type:4b,insulation:0b}" damage="4"  minQuantity="1" maxQuantity="18" weight="15" /><!-- Tin cable -->
-		<loot item="ic2:cable"       nbt="{type:4b,insulation:1b}" damage="4"  minQuantity="1" maxQuantity="18" weight="15" /><!-- Insulated tin cable -->
+		<loot item="ic2:fluid_cell"                                                          damage="0"  minQuantity="4" maxQuantity="35" weight="15" mods="ic2" /><!-- Empty cell -->
+		<loot item="ic2:fluid_cell"  nbt='{Fluid:{FluidName:"ic2uu_matter",Amount:1000}}'    damage="0"  minQuantity="2" maxQuantity="16" weight="12" mods="ic2" /><!-- UU matter cell -->
+		<loot item="ic2:fluid_cell"  nbt='{Fluid:{FluidName:"ic2air",Amount:1000}}'          damage="0"  minQuantity="1" maxQuantity="18" weight="12" mods="ic2" /><!-- Compressed air -->
+		<loot item="ic2:cable"       nbt="{type:0b,insulation:1b}" damage="0"  minQuantity="1" maxQuantity="18" weight="15" mods="ic2" /><!-- Insulated copper cable -->
+		<loot item="ic2:cable"       nbt="{type:0b,insulation:0b}" damage="0"  minQuantity="1" maxQuantity="18" weight="12" mods="ic2" /><!-- Copper cable -->
+		<loot item="ic2:cable"       nbt="{type:2b,insulation:0b}" damage="2"  minQuantity="1" maxQuantity="18" weight="12" mods="ic2" /><!-- Gold cable -->
+		<loot item="ic2:cable"       nbt="{type:2b,insulation:1b}" damage="2"  minQuantity="1" maxQuantity="18" weight="13" mods="ic2" /><!-- Insulated gold cable -->
+		<loot item="ic2:cable"       nbt="{type:3b,insulation:0b}" damage="3"  minQuantity="1" maxQuantity="18" weight="8"  mods="ic2" /><!-- HV cable  -->
+		<loot item="ic2:cable"       nbt="{type:3b,insulation:1b}" damage="3"  minQuantity="1" maxQuantity="6"  weight="4"  mods="ic2" /><!-- Insulated HV cable -->
+		<loot item="ic2:cable"       nbt="{type:3b,insulation:2b}" damage="3"  minQuantity="1" maxQuantity="8"  weight="4"  mods="ic2" /><!-- Insulated HV cable -->
+		<loot item="ic2:cable"       nbt="{type:3b,insulation:3b}" damage="3"  minQuantity="1" maxQuantity="18" weight="10" mods="ic2" /><!-- Insulated HV cable -->
+		<loot item="ic2:cable"       nbt="{type:1b,insulation:0b}" damage="1"  minQuantity="1" maxQuantity="18" weight="8"  mods="ic2" /><!-- Glass fiber cable -->
+		<loot item="ic2:cable"       nbt="{type:4b,insulation:0b}" damage="4"  minQuantity="1" maxQuantity="18" weight="15" mods="ic2" /><!-- Tin cable -->
+		<loot item="ic2:cable"       nbt="{type:4b,insulation:1b}" damage="4"  minQuantity="1" maxQuantity="18" weight="15" mods="ic2" /><!-- Insulated tin cable -->
 		<!-- nano armor? -->
 
 		<!-- vanilla crap -->
@@ -90,54 +90,54 @@
 		<loot item="minecraft:dye"                    damage="13" minQuantity="1" maxQuantity="9"  weight="3"  />
 		<loot item="minecraft:dye"                    damage="14" minQuantity="1" maxQuantity="9"  weight="3"  />
 
-		<loot item="icbmclassic:antidote"             damage="0"  minQuantity="1" maxQuantity="11" weight="10" />
-		<loot item="icbmclassic:radargun"             damage="0"  minQuantity="1" maxQuantity="1"  weight="10" />
-		<loot item="icbmclassic:saltpeter"            damage="0"  minQuantity="4" maxQuantity="37" weight="15" />
-		<loot item="icbmclassic:sulfurdust"           damage="0"  minQuantity="6" maxQuantity="23" weight="15" />
-		<loot item="icbmclassic:rocketlauncher"       damage="0"  minQuantity="1" maxQuantity="1"  weight="3"  />
-		<loot item="icbmclassic:concrete"             damage="0"  minQuantity="8" maxQuantity="64" weight="15" />
-		<loot item="icbmclassic:concrete"             damage="1"  minQuantity="1" maxQuantity="8"  weight="8"  />
-		<loot item="icbmclassic:concrete"             damage="2"  minQuantity="1" maxQuantity="4"  weight="1"  />
-		<loot item="icbmclassic:reinforcedglass"      damage="0"  minQuantity="1" maxQuantity="4"  weight="1"  />
-		<loot item="icbmclassic:spikes"               damage="0"  minQuantity="1" maxQuantity="6"  weight="10" />
-		<loot item="icbmclassic:glasspressureplate"   damage="0"  minQuantity="1" maxQuantity="5"  weight="7"  />
-		<loot item="icbmclassic:launcherbase"         damage="0"  minQuantity="1" maxQuantity="1"  weight="7"  /><!-- Launcher Platform T1 -->
-		<loot item="icbmclassic:launcherframe"        damage="0"  minQuantity="1" maxQuantity="1"  weight="10" /><!-- Launcher Support Frame T1 -->
-		<loot item="icbmclassic:launcherscreen"       damage="0"  minQuantity="1" maxQuantity="1"  weight="4"  /><!-- Launcher Control Panel T1 -->
-		<loot item="icbmclassic:grenade"              damage="0"  minQuantity="1" maxQuantity="5"  weight="4"  /><!-- Conventional Grenade -->
-		<loot item="icbmclassic:rocketauncher"        damage="0"  minQuantity="1" maxQuantity="1"  weight="1"  /><!-- Rocket Launcher -->
-		<loot item="icbmclassic:missile"              damage="0"  minQuantity="1" maxQuantity="1"  weight="4"  /><!-- Conventional Missile -->
-		<loot item="icbmclassic:missile"              damage="2"  minQuantity="1" maxQuantity="1"  weight="4"  /><!-- Incendiary Missile -->
-		<loot item="icbmclassic:missile"              damage="6"  minQuantity="1" maxQuantity="1"  weight="4"  /><!-- Repulsive Missile -->
-		<loot item="icbmclassic:missile"              damage="7"  minQuantity="1" maxQuantity="1"  weight="4"  /><!-- Attractive Missile -->
-		<loot item="icbmclassic:missile"              damage="24" minQuantity="1" maxQuantity="1"  weight="15" /><!-- Missile Module -->
+		<loot item="icbmclassic:antidote"             damage="0"  minQuantity="1" maxQuantity="11" weight="10" mods="icbmclassic" />
+		<loot item="icbmclassic:radargun"             damage="0"  minQuantity="1" maxQuantity="1"  weight="10" mods="icbmclassic" />
+		<loot item="icbmclassic:saltpeter"            damage="0"  minQuantity="4" maxQuantity="37" weight="15" mods="icbmclassic" />
+		<loot item="icbmclassic:sulfurdust"           damage="0"  minQuantity="6" maxQuantity="23" weight="15" mods="icbmclassic" />
+		<loot item="icbmclassic:rocketlauncher"       damage="0"  minQuantity="1" maxQuantity="1"  weight="3"  mods="icbmclassic" />
+		<loot item="icbmclassic:concrete"             damage="0"  minQuantity="8" maxQuantity="64" weight="15" mods="icbmclassic" />
+		<loot item="icbmclassic:concrete"             damage="1"  minQuantity="1" maxQuantity="8"  weight="8"  mods="icbmclassic" />
+		<loot item="icbmclassic:concrete"             damage="2"  minQuantity="1" maxQuantity="4"  weight="1"  mods="icbmclassic" />
+		<loot item="icbmclassic:reinforcedglass"      damage="0"  minQuantity="1" maxQuantity="4"  weight="1"  mods="icbmclassic" />
+		<loot item="icbmclassic:spikes"               damage="0"  minQuantity="1" maxQuantity="6"  weight="10" mods="icbmclassic" />
+		<loot item="icbmclassic:glasspressureplate"   damage="0"  minQuantity="1" maxQuantity="5"  weight="7"  mods="icbmclassic" />
+		<loot item="icbmclassic:launcherbase"         damage="0"  minQuantity="1" maxQuantity="1"  weight="7"  mods="icbmclassic" /><!-- Launcher Platform T1 -->
+		<loot item="icbmclassic:launcherframe"        damage="0"  minQuantity="1" maxQuantity="1"  weight="10" mods="icbmclassic" /><!-- Launcher Support Frame T1 -->
+		<loot item="icbmclassic:launcherscreen"       damage="0"  minQuantity="1" maxQuantity="1"  weight="4"  mods="icbmclassic" /><!-- Launcher Control Panel T1 -->
+		<loot item="icbmclassic:grenade"              damage="0"  minQuantity="1" maxQuantity="5"  weight="4"  mods="icbmclassic" /><!-- Conventional Grenade -->
+		<loot item="icbmclassic:rocketauncher"        damage="0"  minQuantity="1" maxQuantity="1"  weight="1"  mods="icbmclassic" /><!-- Rocket Launcher -->
+		<loot item="icbmclassic:missile"              damage="0"  minQuantity="1" maxQuantity="1"  weight="4"  mods="icbmclassic" /><!-- Conventional Missile -->
+		<loot item="icbmclassic:missile"              damage="2"  minQuantity="1" maxQuantity="1"  weight="4"  mods="icbmclassic" /><!-- Incendiary Missile -->
+		<loot item="icbmclassic:missile"              damage="6"  minQuantity="1" maxQuantity="1"  weight="4"  mods="icbmclassic" /><!-- Repulsive Missile -->
+		<loot item="icbmclassic:missile"              damage="7"  minQuantity="1" maxQuantity="1"  weight="4"  mods="icbmclassic" /><!-- Attractive Missile -->
+		<loot item="icbmclassic:missile"              damage="24" minQuantity="1" maxQuantity="1"  weight="15" mods="icbmclassic" /><!-- Missile Module -->
 
-		<loot item="computercraft:cable"              damage="0"  minQuantity="1" maxQuantity="27" weight="10" /><!-- Networking Cable -->
-		<loot item="computercraft:cable"              damage="1"  minQuantity="1" maxQuantity="4"  weight="5"  /><!-- Wired Modem -->
-		<loot item="computercraft:peripheral"         damage="0"  minQuantity="1" maxQuantity="2"  weight="7"  /><!-- Speaker -->
-		<loot item="computercraft:peripheral"         damage="1"  minQuantity="1" maxQuantity="3"  weight="4"  /><!-- Wireless Modem -->
+		<loot item="computercraft:cable"              damage="0"  minQuantity="1" maxQuantity="27" weight="10" mods="computercraft" /><!-- Networking Cable -->
+		<loot item="computercraft:cable"              damage="1"  minQuantity="1" maxQuantity="4"  weight="5"  mods="computercraft" /><!-- Wired Modem -->
+		<loot item="computercraft:peripheral"         damage="0"  minQuantity="1" maxQuantity="2"  weight="7"  mods="computercraft" /><!-- Speaker -->
+		<loot item="computercraft:peripheral"         damage="1"  minQuantity="1" maxQuantity="3"  weight="4"  mods="computercraft" /><!-- Wireless Modem -->
 
-		<loot item="ironbackpacks:upgrade"            damage="0"  minQuantity="1" maxQuantity="11" weight="10" /><!-- Blank Upgrade -->
+		<loot item="ironbackpacks:upgrade"            damage="0"  minQuantity="1" maxQuantity="11" weight="10" mods="ironbackpacks" /><!-- Blank Upgrade -->
 
-		<loot item="mekanism:compressedcarbon"        damage="0"  minQuantity="1" maxQuantity="14" weight="15" />
-		<loot item="mekanism:compressedredstone"      damage="0"  minQuantity="1" maxQuantity="7"  weight="8"  />
-		<loot item="mekanism:compressedobsidian"      damage="0"  minQuantity="1" maxQuantity="12" weight="10" />
-		<loot item="mekanism:enrichedalloy"           damage="0"  minQuantity="1" maxQuantity="4"  weight="5"  />
-		<loot item="mekanism:reinforcedalloy"         damage="0"  minQuantity="1" maxQuantity="2"  weight="3"  />
-		<loot item="mekanism:energytablet"            damage="0"  minQuantity="1" maxQuantity="1"  weight="1"  />
+		<loot item="mekanism:compressedcarbon"        damage="0"  minQuantity="1" maxQuantity="14" weight="15" mods="mekanism" />
+		<loot item="mekanism:compressedredstone"      damage="0"  minQuantity="1" maxQuantity="7"  weight="8"  mods="mekanism" />
+		<loot item="mekanism:compressedobsidian"      damage="0"  minQuantity="1" maxQuantity="12" weight="10" mods="mekanism" />
+		<loot item="mekanism:enrichedalloy"           damage="0"  minQuantity="1" maxQuantity="4"  weight="5"  mods="mekanism" />
+		<loot item="mekanism:reinforcedalloy"         damage="0"  minQuantity="1" maxQuantity="2"  weight="3"  mods="mekanism" />
+		<loot item="mekanism:energytablet"            damage="0"  minQuantity="1" maxQuantity="1"  weight="1"  mods="mekanism" />
 
-		<loot item="opencomputers:cable"              damage="0"  minQuantity="1" maxQuantity="27" weight="10" />
-		<loot item="opencomputers:keyboard"           damage="0"  minQuantity="1" maxQuantity="4"  weight="5"  />
-		<loot item="opencomputers:screen1"            damage="0"  minQuantity="1" maxQuantity="2"  weight="4"  />
-		<loot item="opencomputers:screen2"            damage="0"  minQuantity="1" maxQuantity="2"  weight="3"  />
+		<loot item="opencomputers:cable"              damage="0"  minQuantity="1" maxQuantity="27" weight="10" mods="opencomputers" />
+		<loot item="opencomputers:keyboard"           damage="0"  minQuantity="1" maxQuantity="4"  weight="5"  mods="opencomputers" />
+		<loot item="opencomputers:screen1"            damage="0"  minQuantity="1" maxQuantity="2"  weight="4"  mods="opencomputers" />
+		<loot item="opencomputers:screen2"            damage="0"  minQuantity="1" maxQuantity="2"  weight="3"  mods="opencomputers" />
 
-		<loot item="openmodularturrets:ammo_meta"     damage="0"  minQuantity="4" maxQuantity="23" weight="10" /><!-- Ammo - Blazing Clay -->
-		<loot item="openmodularturrets:ammo_meta"     damage="1"  minQuantity="4" maxQuantity="23" weight="10" /><!-- Ammo - Bullet -->
-		<loot item="openmodularturrets:ammo_meta"     damage="2"  minQuantity="1" maxQuantity="13" weight="10" /><!-- Ammo - Ferro-Magnetic Slug -->
-		<loot item="openmodularturrets:ammo_meta"     damage="3"  minQuantity="1" maxQuantity="13" weight="10" /><!-- Ammo - Grenade -->
-		<loot item="openmodularturrets:ammo_meta"     damage="4"  minQuantity="1" maxQuantity="13" weight="10" /><!-- Ammo - Rocket -->
-		<loot item="openmodularturrets:upgrade_meta"  damage="2"  minQuantity="1" maxQuantity="1"  weight="10" /><!-- Turret Memory Card -->
-		<loot item="openmodularturrets:lever_block"   damage="0"  minQuantity="1" maxQuantity="1"  weight="10" /><!-- Basic Turret Base Crank -->
+		<loot item="openmodularturrets:ammo_meta"     damage="0"  minQuantity="4" maxQuantity="23" weight="10" mods="openmodularturrets" /><!-- Ammo - Blazing Clay -->
+		<loot item="openmodularturrets:ammo_meta"     damage="1"  minQuantity="4" maxQuantity="23" weight="10" mods="openmodularturrets" /><!-- Ammo - Bullet -->
+		<loot item="openmodularturrets:ammo_meta"     damage="2"  minQuantity="1" maxQuantity="13" weight="10" mods="openmodularturrets" /><!-- Ammo - Ferro-Magnetic Slug -->
+		<loot item="openmodularturrets:ammo_meta"     damage="3"  minQuantity="1" maxQuantity="13" weight="10" mods="openmodularturrets" /><!-- Ammo - Grenade -->
+		<loot item="openmodularturrets:ammo_meta"     damage="4"  minQuantity="1" maxQuantity="13" weight="10" mods="openmodularturrets" /><!-- Ammo - Rocket -->
+		<loot item="openmodularturrets:upgrade_meta"  damage="2"  minQuantity="1" maxQuantity="1"  weight="10" mods="openmodularturrets" /><!-- Turret Memory Card -->
+		<loot item="openmodularturrets:lever_block"   damage="0"  minQuantity="1" maxQuantity="1"  weight="10" mods="openmodularturrets" /><!-- Basic Turret Base Crank -->
 
 	</lootSet>
 	
diff --git a/src/main/resources/config/structures-default.xml b/src/main/resources/config/structures-default.xml
index bd75bb91..31a2c936 100644
--- a/src/main/resources/config/structures-default.xml
+++ b/src/main/resources/config/structures-default.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <worldGeneration version="3"
 				 xmlns="http://warpdrive.lemadec.org"
 				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -8,11 +8,9 @@
 		<shell name="core" minThickness="40" maxThickness="50"><!-- legacy radius was 42 -->
 			<filler weight="1" block="minecraft:redstone_block" />
 		</shell>
-
 		<shell name="low_altitude" minThickness="4" maxThickness="6">
 			<filler weight="1" block="warpdrive:gas" metadata="1" />
 		</shell>
-
 		<shell name="atmosphere" minThickness="2" maxThickness="2">
 			<filler weight="1" block="warpdrive:gas" metadata="1" />
 		</shell>
@@ -84,35 +82,35 @@
 	</structure>
 
 
-    <!-- 
-    <structure group="moon" name="test" weight="100">
-        <shell name="core" minThickness="1" maxThickness="1">
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="mantle" minThickness="1" maxThickness="1">
-            <filler block="minecraft:glass" ratio=".001" />
-        </shell>
-        <shell name="crust" minThickness="1" maxThickness="1">
-            <filler block="minecraft:stained_glass" metadata="5" ratio=".001" />
-        </shell>
-        <shell name="surface" minThickness="1" maxThickness="1">
-            <filler block="minecraft:stained_glass" metadata="15" />
-        </shell>
-    </structure>
-    -->
+	<!-- 
+	<structure group="moon" name="test" weight="100">
+		<shell name="core" minThickness="1" maxThickness="1">
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="mantle" minThickness="1" maxThickness="1">
+			<filler block="minecraft:glass" ratio=".001" />
+		</shell>
+		<shell name="crust" minThickness="1" maxThickness="1">
+			<filler block="minecraft:stained_glass" metadata="5" ratio=".001" />
+		</shell>
+		<shell name="surface" minThickness="1" maxThickness="1">
+			<filler block="minecraft:stained_glass" metadata="15" />
+		</shell>
+	</structure>
+	-->
 
 	<structure group="moon" name="overworld.base" weight="100">
 		<shell name="core" minThickness="4" maxThickness="15">
 			<import group="moon.core" />
 			<filler block="minecraft:bedrock" ratio=".001" />
 		</shell>
-        <shell name="mantle" minThickness="3" maxThickness="15">
-            <import group="overworld_uncommon" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="flow" minThickness="0" maxThickness="2">
-            <import group="moon.flow" />
-        </shell>
+		<shell name="mantle" minThickness="3" maxThickness="15">
+			<import group="overworld_uncommon" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="flow" minThickness="0" maxThickness="2">
+			<import group="moon.flow" />
+		</shell>
 		<shell name="crust" minThickness="2" maxThickness="10">
 			<import group="overworld_common" />
 			<filler block="minecraft:bedrock" ratio=".001" />
@@ -122,75 +120,82 @@
 		</shell>
 	</structure>
 
-    <structure group="moon" name="overworld.rare" weight="20">
-        <shell name="core" minThickness="1" maxThickness="10">
-            <import group="moon.core" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="mantle" minThickness="3" maxThickness="15">
-            <import group="overworld_rare" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="flow" minThickness="1" maxThickness="3">
-            <import group="moon.flow" />
-        </shell>
-        <shell name="crust" minThickness="2" maxThickness="10">
-            <import group="overworld_common" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="surface" minThickness="1" maxThickness="3">
-            <import group="overworld_surface" />
-        </shell>
-    </structure>
+	<structure group="moon" name="overworld.rare" weight="20">
+		<shell name="uranium" minThickness="0" maxThickness="2" mods="ic2">
+			<filler block="ic2:resource" metadata="10" ratio=".1" /><!-- Uranium block -->
+		</shell>
+		<shell name="core" minThickness="1" maxThickness="10">
+			<import group="moon.core" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="mantle" minThickness="3" maxThickness="15">
+			<import group="overworld_rare" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="flow" minThickness="1" maxThickness="3">
+			<import group="moon.flow" />
+		</shell>
+		<shell name="crust" minThickness="2" maxThickness="10">
+			<import group="overworld_common" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="surface" minThickness="1" maxThickness="3">
+			<import group="overworld_surface" />
+		</shell>
+	</structure>
 
-    <structure group="moon" name="overworld.empty" weight="20">
-        <shell name="core" minThickness="1" maxThickness="1">
-            <filler block="minecraft:bedrock" weight="100" />
-        </shell>
-        <shell name="empty" minThickness="6" maxThickness="29">
-            <import group="gas" />
-        </shell>
-        <shell name="innerCrust" minThickness="1" maxThickness="1">
-            <filler block="minecraft:obsidian" weight="100" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-            <filler block="minecraft:glowstone" ratio=".001" />
-        </shell>
-        <shell name="mantle" minThickness="0" maxThickness="2">
-            <filler block="minecraft:obsidian" weight="100" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="crust" minThickness="1" maxThickness="5">
-            <import group="overworld_common" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="surface" minThickness="2" maxThickness="3">
-            <import group="overworld_surface" />
-        </shell>
-    </structure>
+	<structure group="moon" name="overworld.empty" weight="20">
+		<shell name="core" minThickness="1" maxThickness="1">
+			<filler block="minecraft:bedrock" weight="100" />
+		</shell>
+		<shell name="empty" minThickness="6" maxThickness="29">
+			<import group="gas" />
+		</shell>
+		<shell name="innerCrust" minThickness="1" maxThickness="1">
+			<filler block="minecraft:obsidian" weight="100" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+			<filler block="minecraft:glowstone" ratio=".001" />
+		</shell>
+		<shell name="mantle" minThickness="0" maxThickness="2">
+			<filler block="minecraft:obsidian" weight="100" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="crust" minThickness="1" maxThickness="5">
+			<import group="overworld_common" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="surface" minThickness="2" maxThickness="3">
+			<import group="overworld_surface" />
+		</shell>
+	</structure>
 
-    <structure group="moon" name="overworld.ship" weight="10">
-        <schematic group="smallship" filename="notImplemented.schematic" />
-        <shell name="core" minThickness="5" maxThickness="16">
-            <import group="gas" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="mantle" minThickness="3" maxThickness="17">
-            <import group="overworld_uncommon" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="flow" minThickness="0" maxThickness="2">
-            <filler block="minecraft:obsidian" weight="100" />
-        </shell>
-        <shell name="crust" minThickness="2" maxThickness="10">
-            <import group="overworld_common" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="surface" minThickness="1" maxThickness="3">
-            <import group="overworld_surface" />
-        </shell>
-    </structure>
+	<structure group="moon" name="overworld.ship" weight="10">
+		<generate group="smallship" />
+		<shell name="core" minThickness="5" maxThickness="16">
+			<import group="gas" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="mantle" minThickness="3" maxThickness="17">
+			<import group="overworld_uncommon" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="flow" minThickness="0" maxThickness="2">
+			<filler block="minecraft:obsidian" weight="100" mods="!appliedenergistics2" />
+			<filler block="appliedenergistics2:sky_stone_block" weight="100" mods="appliedenergistics2" /><!-- Sky stone block -->
+		</shell>
+		<shell name="crust" minThickness="2" maxThickness="10">
+			<import group="overworld_common" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="surface" minThickness="1" maxThickness="3">
+			<import group="overworld_surface" />
+		</shell>
+	</structure>
 
 	<structure group="moon" name="overworld.corrupted" weight="20">
+		<shell name="uranium" minThickness="0" maxThickness="1" mods="ic2">
+			<filler block="ic2:resource" metadata="10" ratio=".1" /><!-- Uranium block -->
+		</shell>
 		<shell name="core" minThickness="5" maxThickness="16">
 			<import group="overworld_rare" />
 			<filler block="minecraft:bedrock" ratio=".001" />
@@ -198,13 +203,13 @@
 		<shell name="mantle" minThickness="6" maxThickness="20">
 			<import group="overworld_uncommon" />
 			<filler block="minecraft:bedrock" ratio=".001" />
-            <filler block="minecraft:gravel" ratio=".1" />
+			<filler block="minecraft:gravel" ratio=".1" />
 			<filler block="minecraft:lava" ratio=".05" />
 		</shell>
 		<shell name="crust" minThickness="10" maxThickness="20">
 			<import group="overworld_common" />
 			<filler block="minecraft:bedrock" ratio=".001" />
-            <filler block="minecraft:sand" ratio=".1" />
+			<filler block="minecraft:sand" ratio=".1" />
 			<filler block="minecraft:air" ratio=".2" />
 		</shell>
 		<shell name="surface" minThickness="2" maxThickness="4">
@@ -213,27 +218,32 @@
 		</shell>
 	</structure>
 
-    <structure group="moon" name="nether" ratio="0.1">
-        <shell name="core" minThickness="1" maxThickness="5">
-            <filler block="minecraft:air" weight="1" />
-            <filler block="minecraft:bedrock" ratio=".01" />
-        </shell>
-        <shell name="coreShell" minThickness="1" maxThickness="1">
-            <filler block="minecraft:obsidian" weight="100" />
-        </shell>
-        <shell name="mantle" minThickness="6" maxThickness="20">
-            <import group="nether" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-            <filler block="minecraft:glass" ratio=".2" />
-        </shell>
-        <shell name="crust" minThickness="10" maxThickness="20">
-            <import group="nether" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="surface" minThickness="2" maxThickness="4">
-            <import group="nether_surface" />
-        </shell>
-    </structure>
+	<structure group="moon" name="nether" ratio="0.1">
+		<shell name="uranium" minThickness="0" maxThickness="2" mods="ic2">
+			<filler block="ic2:resource" metadata="10" ratio=".1" /><!-- Uranium block -->
+		</shell>
+		<shell name="core" minThickness="1" maxThickness="5">
+			<filler block="minecraft:air" weight="1" />
+			<filler block="minecraft:bedrock" ratio=".01" />
+		</shell>
+		<shell name="coreShell" minThickness="1" maxThickness="1">
+			<filler block="minecraft:obsidian" weight="100" />
+		</shell>
+		<shell name="mantle" minThickness="6" maxThickness="20">
+			<import group="nether" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+			<filler block="minecraft:sand" metadata="1" ratio=".2" mods="!natura" />
+			<filler block="natura:nether_tainted_soil" ratio=".2" mods="natura" />
+		</shell>
+		<shell name="crust" minThickness="10" maxThickness="20">
+			<import group="nether" />
+			<filler block="minecraft:nether_brick" ratio=".2" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="surface" minThickness="2" maxThickness="4">
+			<import group="nether_surface" />
+		</shell>
+	</structure>
 
 	<structure group="moon" name="nether.corrupted" ratio="0.1">
 		<shell name="core" minThickness="1" maxThickness="5">
@@ -241,17 +251,20 @@
 			<filler block="minecraft:bedrock" ratio=".001" />
 		</shell>
 		<shell name="coreShell" minThickness="1" maxThickness="1">
-			<filler block="minecraft:obsidian" weight="100" />
+			<filler block="minecraft:obsidian" weight="100" mods="!appliedenergistics2" />
+			<filler block="appliedenergistics2:sky_stone_block" weight="100" mods="appliedenergistics2" /><!-- Sky stone block -->
 		</shell>
 		<shell name="mantle" minThickness="6" maxThickness="12">
 			<import group="nether" />
 			<filler block="minecraft:bedrock" ratio=".001" />
-			<filler block="minecraft:glass" ratio=".1" />
+			<filler block="minecraft:sand" metadata="1" ratio=".2" mods="!natura" />
+			<filler block="natura:nether_tainted_soil" ratio=".2" mods="natura" />
 		</shell>
 		<shell name="crust" minThickness="8" maxThickness="16">
 			<import group="nether" />
 			<filler block="minecraft:bedrock" ratio=".001" />
-            <filler block="minecraft:air" ratio=".2" />
+			<filler block="minecraft:nether_brick" ratio=".2" />
+			<filler block="minecraft:air" ratio=".2" />
 		</shell>
 		<shell name="surface" minThickness="2" maxThickness="4">
 			<import group="nether_surface" />
@@ -259,13 +272,19 @@
 		</shell>
 	</structure>
 
-	<structure group="moon" name="enderack" ratio="0.03">
-		<shell name="core" minThickness="5" maxThickness="15">
-			<import group="end" />
+	<structure group="moon" name="end.hollow" ratio="0.03">
+		<shell name="core" minThickness="5" maxThickness="14">
+			<filler block="minecraft:air" weight="100" />
 			<filler block="minecraft:bedrock" ratio=".001" />
 		</shell>
+		<shell name="coreShell" minThickness="1" maxThickness="2">
+			<filler block="minecraft:obsidian" weight="100" mods="!appliedenergistics2" />
+			<filler block="appliedenergistics2:sky_stone_block" weight="100" mods="appliedenergistics2" /><!-- Sky stone block -->
+		</shell>
 		<shell name="mantle" minThickness="10" maxThickness="25">
 			<import group="end" />
+			<filler block="minecraft:obsidian" weight="60" mods="!appliedenergistics2" />
+			<filler block="appliedenergistics2:sky_stone_block" weight="60" mods="appliedenergistics2" /><!-- Sky stone block -->
 			<filler block="minecraft:bedrock" ratio=".001" />
 		</shell>
 		<shell name="surface" minThickness="2" maxThickness="3">
@@ -273,19 +292,24 @@
 		</shell>
 	</structure>
 
-    <structure group="moon" name="end" ratio="0.05">
-        <shell name="core" minThickness="5" maxThickness="15">
-            <import group="end" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="mantle" minThickness="10" maxThickness="25">
-            <import group="end" />
-            <filler block="minecraft:bedrock" ratio=".001" />
-        </shell>
-        <shell name="surface" minThickness="2" maxThickness="3">
-            <import group="end_surface" />
-        </shell>
-    </structure>
+	<structure group="moon" name="end" ratio="0.05">
+		<shell name="core" minThickness="5" maxThickness="15">
+			<import group="end" />
+			<filler block="minecraft:obsidian" weight="30" mods="!appliedenergistics2" />
+			<filler block="appliedenergistics2:sky_stone_block" weight="30" mods="appliedenergistics2" /><!-- Sky stone block -->
+			<filler block="warpdrive:iridium_block" weight="1" mods="!netherores" />
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="mantle" minThickness="10" maxThickness="25">
+			<import group="end" />
+			<filler block="minecraft:obsidian" weight="60" />
+			<filler block="undergroundbiomes:metamorphic_stone" metadata="2" ratio="0.05" /><!-- Marble -->
+			<filler block="minecraft:bedrock" ratio=".001" />
+		</shell>
+		<shell name="surface" minThickness="2" maxThickness="3">
+			<import group="end_surface" />
+		</shell>
+	</structure>
 
 
 
@@ -311,8 +335,6 @@
 		<metashell block="minecraft:iron_ore" minCount="6" maxCount="10" minRadius="2" relativeRadius="0.5" />
 		<shell name="mantle" minThickness="3" maxThickness="7">
 			<import group="overworld_common" />
-			<filler weight="10" block="minecraft:stone" />
-			<filler weight="5" block="minecraft:cobblestone" />
 		</shell>
 	</structure>
 
@@ -320,8 +342,6 @@
 		<metashell block="minecraft:iron_ore" minCount="1" maxCount="3" minRadius="2" relativeRadius="0.5" />
 		<shell name="mantle" minThickness="2" maxThickness="6">
 			<import group="overworld_uncommon" />
-			<filler weight="10" block="minecraft:stone" />
-			<filler weight="5" block="minecraft:cobblestone" />
 		</shell>
 	</structure>
 
@@ -329,8 +349,6 @@
 		<metashell block="minecraft:diamond_ore" minCount="1" maxCount="2" minRadius="2" relativeRadius="0.5" />
 		<shell name="mantle" minThickness="2" maxThickness="6">
 			<import group="overworld_rare" />
-			<filler weight="10" block="minecraft:stone" />
-			<filler weight="5" block="minecraft:cobblestone" />
 		</shell>
 	</structure>
 
@@ -348,8 +366,6 @@
 		<metashell block="minecraft:diamond_ore" minCount="1" maxCount="2" minRadius="2" relativeRadius="0.5" />
 		<shell name="mantle" minThickness="2" maxThickness="6">
 			<import group="nether" />
-			<filler weight="10" block="minecraft:stone" />
-			<filler weight="5" block="minecraft:cobblestone" />
 		</shell>
 	</structure>
 
@@ -357,8 +373,6 @@
 		<metashell block="minecraft:diamond_ore" minCount="1" maxCount="2" minRadius="2" relativeRadius="0.5" />
 		<shell name="mantle" minThickness="2" maxThickness="6">
 			<import group="end" />
-			<filler weight="10" block="minecraft:stone" />
-			<filler weight="5" block="minecraft:cobblestone" />
 		</shell>
 	</structure>
 </worldGeneration>
diff --git a/src/main/resources/config/structures-ship.xml b/src/main/resources/config/structures-ship.xml
index 66b3687d..b56559dc 100644
--- a/src/main/resources/config/structures-ship.xml
+++ b/src/main/resources/config/structures-ship.xml
@@ -1,34 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <worldGeneration version="3"
 				 xmlns="http://warpdrive.lemadec.org"
 				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 				 xsi:schemaLocation="http://warpdrive.lemadec.org WarpDrive.xsd">
 	
 	<structure group="ship_small" name="legacy" weight="1">
-		<replacement block="minecraft:stone" metadata="0">
+		<schematic filename="legacy" weight="1" />
+		<replacement blockState="minecraft:stone">
 			<import group="hull_plain" name="%hull1%" />
 		</replacement>
-		<replacement block="minecraft:glass" metadata="0">
+		<replacement blockState="minecraft:glass">
 			<import group="hull_glass" name="%hull1%" />
 		</replacement>
-		<replacement block="minecraft:sandstone" metadata="0">
+		<replacement blockState="minecraft:sandstone">
 			<import group="hull_plain" name="%hull2%" />
 		</replacement>
-		<replacement block="minecraft:stained_glass" metadata="0">
+		<replacement blockState="minecraft:stained_glass">
 			<import group="hull_glass" name="%hull2%" />
 		</replacement>
-		<replacement block="minecraft:wool" metadata="0">
+		<replacement blockState="minecraft:wool@color=red">
 			<for variable="colorMetadata" in="0,1,2,3,4,5,6,8">
 				<filler block="minecraft:wool" metadata="%colorMetadata%" weight="1" />
 			</for>
 		</replacement>
-		<replacement block="minecraft:wool" metadata="14">
+		<replacement blockState="minecraft:wool@color=silver">
 			<for variable="colorMetadata" in="7,9,10,11,12,13,14,15,16">
 				<filler block="minecraft:wool" metadata="%colorMetadata%" weight="1" />
 			</for>
 		</replacement>
-		<replacement block="computercraft:CC-Computer">
-			<filler block="computercraft:CC-Computer" weight="1" mods="computercraft" />
+		<replacement blockState="computercraft:computer">
+			<filler block="computercraft:computer" weight="1" mods="computercraft" />
 			<filler block="minecraft:air" ratio="0.5" />
 		</replacement>
 		<insertion blockState="opencomputers:case1">
@@ -43,56 +44,57 @@
 	</structure>
 	
 	<structure group="ship_small" name="legacy" weight="1">
-		<replacement block="minecraft:stone" metadata="0">
+		<schematic filename="legacy_corrupted" weight="1" />
+		<replacement blockState="minecraft:stone">
 			<import group="hull_plain" name="%hull1%" />
 			<filler block="minecraft:air" ratio="0.1" />
 			<filler block="warpdrive:ship_corruption" ratio="0.0025" />
 		</replacement>
-		<replacement block="minecraft:glass" metadata="0">
+		<replacement blockState="minecraft:glass">
 			<import group="hull_glass" name="%hull1%" />
 			<filler block="minecraft:air" ratio="0.2" />
 		</replacement>
-		<replacement block="minecraft:sandstone" metadata="0">
+		<replacement blockState="minecraft:sandstone">
 			<import group="hull_plain" name="%hull2%" />
 			<filler block="minecraft:air" ratio="0.1" />
 			<filler block="warpdrive:ship_corruption" ratio="0.0025" />
 		</replacement>
-		<replacement block="minecraft:stained_glass" metadata="0">
+		<replacement blockState="minecraft:stained_glass">
 			<import group="hull_glass" name="%hull2%" />
 			<filler block="minecraft:air" ratio="0.2" />
 		</replacement>
-		<replacement block="minecraft:stone" metadata="0">
+		<replacement blockState="minecraft:fence">
 			<import group="cable" />
 			<filler block="minecraft:air" ratio="0.25" />
 		</replacement>
-		<replacement block="minecraft:glass" metadata="0">
+		<replacement blockState="minecraft:glass">
 			<import group="solar" />
 			<filler block="minecraft:air" ratio="0.25" />
 		</replacement>
-		<replacement block="minecraft:wool" metadata="0">
+		<replacement blockState="minecraft:wool@color=red">
 			<for variable="colorMetadata" in="0,1,2,3,4,5,6,8">
 				<filler block="minecraft:wool" metadata="%colorMetadata%" weight="1" />
 			</for>
 		</replacement>
-		<replacement block="minecraft:wool" metadata="14">
+		<replacement blockState="minecraft:wool@color=silver">
 			<for variable="colorMetadata" in="7,9,10,11,12,13,14,15,16">
 				<filler block="minecraft:wool" metadata="%colorMetadata%" weight="1" />
 			</for>
 		</replacement>
-		<replacement block="warpdrive:ship_core.basic">
+		<replacement blockState="warpdrive:ship_core.basic">
 			<filler block="warpdrive:ship_core.basic" weight="1" />
 			<filler block="minecraft:air" ratio="0.5" />
 		</replacement>
-		<replacement block="warpdrive:air_generator.basic">
+		<replacement blockState="warpdrive:air_generator.basic">
 			<filler block="warpdrive:air_generator.basic" weight="1" />
 			<filler block="minecraft:air" ratio="0.5" />
 		</replacement>
-		<replacement block="warpdrive:ship_controller.basic">
+		<replacement blockState="warpdrive:ship_controller.basic">
 			<filler block="warpdrive:ship_controller.basic" weight="1" />
 			<filler block="minecraft:air" ratio="0.5" />
 		</replacement>
-		<replacement block="computercraft:CC-Computer">
-			<filler block="computercraft:CC-Computer" weight="1" mods="computercraft" />
+		<replacement blockState="computercraft:computer">
+			<filler block="computercraft:computer" weight="1" mods="computercraft" />
 			<filler block="minecraft:air" ratio="0.5" />
 		</replacement>
 	</structure>