diff --git a/.minecraft/config/deepresonance/main.cfg b/.minecraft/config/deepresonance/main.cfg
diff --git a/.minecraft/config/deepresonance/version.cfg b/.minecraft/config/deepresonance/version.cfg
@@ -0,0 +1,7 @@
+# Configuration file
+
+version {
+    I:version=1
+}
+
+
diff --git a/.minecraft/config/earthworks.cfg b/.minecraft/config/earthworks.cfg
@@ -32,7 +32,7 @@ world {
     I:chalk_min_spawn=48
 
     # Attempts the world generator will make to spawn a CHALK vein per chunk.  Set to 0 to turn off CHALK. [range: 0 ~ 42, default: 3]
-    I:chalk_spawn_rate=3
+    I:chalk_spawn_rate=0
 
     # Vein size that CHALK can spawn in. [range: 0 ~ 33, default: 33]
     I:chalk_vein_size=33
@@ -44,7 +44,7 @@ world {
     I:slate_min_spawn=0
 
     # Attempts the world generator will make to spawn a SLATE vein per chunk.  Set to 0 to turn off SLATE. [range: 0 ~ 42, default: 10]
-    I:slate_spawn_rate=10
+    I:slate_spawn_rate=0
 
     # Vein size that SLATE can spawn in. [range: 0 ~ 33, default: 33]
     I:slate_vein_size=33

diff --git a/.minecraft/config/eleccore.cfg b/.minecraft/config/eleccore.cfg
@@ -0,0 +1,17 @@
+# Configuration file
+
+client {
+    # Set to true to remove all the Json model errors from the log. [default: true]
+    B:removeJsonExceptions=true
+}
+
+
+general {
+    # Set to true to print debug info to the log. [default: false]
+    B:debug=false
+
+    # Set to true to prevent multiblock crashes when Sponge is installed. WARNING: Unsupported, this may cause unexpected behaviour, use with caution! [default: false]
+    B:supressSpongeIssues=false
+}
+
+
diff --git a/.minecraft/config/fairylights.cfg b/.minecraft/config/fairylights.cfg
@@ -0,0 +1,11 @@
+# Configuration file
+
+general {
+    # If true jingles will play during Christmas. [default: true]
+    B:"Enable Jingling"=true
+
+    # The distance that jingles can be heard in blocks. [range: 1 ~ 2147483647, default: 40]
+    I:"Jingle Volume"=40
+}
+
+
diff --git a/.minecraft/config/immersiveengineering.cfg b/.minecraft/config/immersiveengineering.cfg
@@ -136,7 +136,7 @@ general {
         D:arcFurnace_energyModifier=0.2
 
         # A modifier to apply to the time of every Arc Furnace recipe
-        D:arcFurnace_timeModifier=0.33
+        D:arcFurnace_timeModifier=0.25
 
         # Set this to true to make the blueprint for graphite electrodes craftable in addition to villager/dungeon loot
         B:arcfurnace_electrodeCrafting=true
@@ -157,22 +157,22 @@ general {
         D:autoWorkbench_timeModifier=1.0
 
         # The Flux per tick the belljar consumes to grow plants
-        I:belljar_consumption=8
+        I:belljar_consumption=12
 
         # The amount of ticks one dose of fertilizer lasts in the belljar
-        I:belljar_fertilizer=6000
+        I:belljar_fertilizer=4000
 
         # The amount of fluid the belljar uses per dose of fertilizer
         I:belljar_fluid=250
 
         # A base-modifier for all fluid fertilizers in the belljar
-        D:belljar_fluid_fertilizer_mod=1.0
+        D:belljar_fluid_fertilizer_mod=0.75
 
         # A modifier to apply to the belljars total growing speed
-        D:belljar_growth_mod=1.0
+        D:belljar_growth_mod=0.5
 
         # A base-modifier for all solid fertilizers in the belljar
-        D:belljar_solid_fertilizer_mod=1.0
+        D:belljar_solid_fertilizer_mod=0.75
 
         # A modifier to apply to the energy costs of every Bottling Machine's process
         D:bottlingMachine_energyModifier=1.0
@@ -220,7 +220,7 @@ general {
         D:crusher_energyModifier=1.0
 
         # A modifier to apply to the time of every Crusher recipe
-        D:crusher_timeModifier=1.0
+        D:crusher_timeModifier=0.8
 
         # The Flux per tick that the Diesel Generator will output. The burn time of the fuel determines the total output
         I:dieselGen_output=4096
@@ -288,7 +288,7 @@ general {
         D:metalPress_energyModifier=1.0
 
         # A modifier to apply to the time of every MetalPress recipe
-        D:metalPress_timeModifier=1.0
+        D:metalPress_timeModifier=0.8
 
         # A modifier to apply to the energy costs of every Mixer's process
         D:mixer_energyModifier=1.0

diff --git a/.minecraft/config/reccomplex.cfg b/.minecraft/config/reccomplex.cfg
@@ -55,7 +55,7 @@ balancing {
     S:structureLoadMatcher=
 
     # How often do structures spawn? [range: 0.0 ~ 10.0, default: 1.0]
-    S:structureSpawnChance=0.6
+    S:structureSpawnChance=0.5
 
     # Biome Expression that will be checked for every single structure. Use this if you want to blacklist / whitelist specific biomes that shouldn't have structures. [default: ]
     S:universalBiomeMatcher=

diff --git a/.minecraft/config/rftools/rftools.cfg b/.minecraft/config/rftools/rftools.cfg
@@ -74,10 +74,10 @@ builder {
     I:builderRfPerPlayer=40000
 
     # Base RF per block operation for the builder when used as a quarry or voider (actual cost depends on hardness of block)
-    I:builderRfPerQuarry=300
+    I:builderRfPerQuarry=800
 
     # RF per block that is skipped (used when a filter is added to the builder)
-    I:builderRfPerSkipped=50
+    I:builderRfPerSkipped=75
 
     # If true we allow the clearing quarry cards to be crafted (these can be heavier on the server)
     B:clearingQuarryAllowed=true
@@ -98,13 +98,13 @@ builder {
     D:dimensionCostFactor=5.0
 
     # The RF per operation of the builder is multiplied with this factor when using the fortune quarry shape card
-    D:fortunequarryShapeCardFactor=2.0
+    D:fortunequarryShapeCardFactor=3.0
 
     # Maximum dimension of the shape when a shape card is used in the builder
-    I:maxBuilderDimension=512
+    I:maxBuilderDimension=256
 
     # Maximum offset of the shape when a shape card is used in the builder
-    I:maxBuilderOffset=260
+    I:maxBuilderOffset=128
 
     # Maximum dimension for the space chamber
     I:maxSpaceChamberDimension=128
@@ -116,7 +116,7 @@ builder {
     B:quarryAllowed=true
 
     # The base speed (number of blocks per tick) of the quarry
-    I:quarryBaseSpeed=8
+    I:quarryBaseSpeed=6
 
     # If true the quarry will chunkload a chunk at a time. If false the quarry will stop if a chunk is not loaded
     B:quarryChunkloads=true

diff --git a/.minecraft/config/roguelike_dungeons/roguelike.cfg b/.minecraft/config/roguelike_dungeons/roguelike.cfg
@@ -10,6 +10,6 @@ lowerLimit=60
 preciousBlocks=true
 random=false
 rogueSpawners=true
-spawnChance=1.0
+spawnChance=0.75
 spawnFrequency=10
 upperLimit=100
diff --git a/.minecraft/config/rustic.cfg b/.minecraft/config/rustic.cfg
@@ -55,7 +55,7 @@ all {
         I:"Maximum Brew Time"=12000
 
         # enable/disable all slate blocks and world gen [default: true]
-        B:"Enable Slate"=true
+        B:"Enable Slate"=false
 
         # enable/disable all stone pillar blocks [default: true]
         B:"Enable Stone Pillars"=true

diff --git a/.minecraft/config/tconstruct.cfg b/.minecraft/config/tconstruct.cfg
@@ -89,7 +89,7 @@ worldgen {
     B:generateIslandsInSuperflat=false
 
     # One in every X chunks will contain a slime island
-    I:slimeIslandRate=4200
+    I:slimeIslandRate=5600
 
     # One in every X chunks will contain a magma island in the nether
     I:magmaIslandRate=100

diff --git a/.minecraft/config/veinminer/tools-and-blocks.json b/.minecraft/config/veinminer/tools-and-blocks.json
@@ -180,6 +180,7 @@
         "appliedenergistics2:quartz_ore/0",
         "astralsorcery:blockcustomore/1",
         "astralsorcery:blockcustomsandore/0",
+        "deepresonance:resonating_ore/0",
         "enderore:ore_ender",
         "immersiveengineering:ore/0",
         "immersiveengineering:ore/1",

diff --git a/.minecraft/mods/ElecCore-1.12.2-1.8.434.jar b/.minecraft/mods/ElecCore-1.12.2-1.8.434.jar
diff --git a/.minecraft/mods/deepresonance-1.12-1.6.0.jar b/.minecraft/mods/deepresonance-1.12-1.6.0.jar
diff --git a/.minecraft/mods/fairylights-2.1.2-1.12.x.jar b/.minecraft/mods/fairylights-2.1.2-1.12.x.jar
diff --git a/...ecraft/mods/journeymap-1.12.2-5.6.0b1.jar → .minecraft/mods/journeymap-1.12.2-5.5.2.jar b/...ecraft/mods/journeymap-1.12.2-5.6.0b1.jar → .minecraft/mods/journeymap-1.12.2-5.5.2.jar
diff --git a/.minecraft/mods/malisisswitches-1.12.2-5.1.0.jar b/.minecraft/mods/malisisswitches-1.12.2-5.1.0.jar
diff --git a/.minecraft/scripts/ImmersiveEngineering.zs b/.minecraft/scripts/ImmersiveEngineering.zs
@@ -5,8 +5,6 @@ var brick 			= <ore:ingotBrick>;
 var brickNether 	= <ore:ingotBrickNether>;
 var sandstone		= <ore:sandstone>;
 var blazePowder		= <ore:powderBlaze>;
-var dustCoal 		= <ore:dustCoal>;
-var dustIron 		= <ore:dustIron>;
 var silicon			= <ore:itemSilicon>;
 var redstone 		= <minecraft:redstone>;
 var enderPearl		= <minecraft:ender_pearl>;
@@ -33,6 +31,8 @@ var dustPlatinum			= <ore:dustPlatinum>;
 var dustCopper				= <ore:dustCopper>;
 var dustTin 				= <ore:dustTin>;
 var dustSilver 				= <ore:dustSilver>;
+var dustCoal 		= <ore:dustCoal>;
+var dustIron 		= <ore:dustIron>;
 
 
 

diff --git a/.minecraft/scripts/ThermalExpansion.zs b/.minecraft/scripts/ThermalExpansion.zs
@@ -37,6 +37,7 @@ var cokeTF			= <thermalfoundation:material:802>;
 var redstone 		= <minecraft:redstone>;
 var bucket			= <minecraft:bucket>;
 var glass 			= <minecraft:glass>;
+var plateSteel		= <ore:plateSteel>;
 
 
 
@@ -51,9 +52,9 @@ recipes.addShaped("HardenedUpgrade", <thermalfoundation:upgrade>,
 
 recipes.remove(<thermalfoundation:upgrade:1>);
 recipes.addShaped("ReinforcedUpgrade", <thermalfoundation:upgrade:1>,
-	[[ingotGraphite, ingotGraphite, ingotGraphite],
+	[[plateSteel, plateSteel, plateSteel],
 	[ingotGraphite, gearSilver, ingotGraphite],
-	[glassHardened, ingotGraphite, glassHardened]]);
+	[glassHardened, <ore:plateGold>, glassHardened]]);
 
 
 // remove induction smelter steel recipes
@@ -75,6 +76,10 @@ recipes.addShaped("Accumulator", accumulator,
 	[bucket, servo, bucket]]);
 
 
+// remove smelter alloying for enderium and signalum
+mods.tconstruct.Alloy.removeRecipe(<liquid:enderium>);
+mods.tconstruct.Alloy.removeRecipe(<liquid:signalum>);
+
 
 // Remove gear recipes
 recipes.remove(<thermalfoundation:material:24>);

diff --git a/.minecraft/scripts/food.zs b/.minecraft/scripts/food.zs
@@ -7,5 +7,5 @@ recipes.addShapeless(<cookingforblockheads:recipe_book:2>, [<cookingforblockhead
 recipes.removeShapeless(<harvestcraft:saltitem>, [<harvestcraft:potitem>, <ore:listAllwater>]);
 recipes.addShapeless("salt", <harvestcraft:saltitem> * 3, [<ore:toolPot>, <ore:listAllwater>]);
 
-// chestnut to flower
-recipes.removeShapeless(<harvestcraft:flouritem>, [<harvestcraft:mortarandpestleitem>, <harvestcraft:chestnutitem>]);
+// chestnut to flour
+recipes.addShapeless("chestnutOil", <harvestcraft:chestnutbutteritem>, [<harvestcraft:juiceritem>, <harvestcraft:chestnutitem>] );
diff --git a/.minecraft/scripts/misc.zs b/.minecraft/scripts/misc.zs
@@ -1,6 +1,6 @@
 
 var ingotIron		= <minecraft:iron_ingot>;
-var redstone	= <minecraft:redstone>;
+var redstone		= <minecraft:redstone>;
 
 
 
@@ -70,4 +70,9 @@ recipes.remove(<rustic:candle>);
 recipes.addShaped("candle", <rustic:candle>,
 	[[null, <minecraft:string>, null],
 	[null, <ore:tallow>, null],
-	[null, ingotIron, null]]);
+	[null, ingotIron, null]]);
+
+
+// add chalk to marble oredict (for chisel)
+val marbleDict = <ore:stoneMarble>;
+marbleDict.add(<earthworks:block_chalk>);