Merge branch 'develop' of https://github.com/EnigmaticaModpacks/Enigm…

…atica10 into develop

.gitignore

@@ -213,4 +213,4 @@ config/ars_nouveau-client.toml
 config/ftbessentials.snbt
 config/iris.properties
 config/clienttweaks-common.toml
-config/productivetrees/generated
+/config/productivetrees/generated

CHANGELOG.md

@@ -1,4 +1,4 @@
-### Enigmatica 10 1.13.1
+### Enigmatica 10 1.14.0
 
 #### ⭐ Improvements
 
@@ -9,6 +9,9 @@
 -   Dragons in drygmy farms will now drop eggs, heads, and breath at a reduced rate [(\#218)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/218)
 -   Theurgy Creature Salt may be crafted from meat and fish now [(\#221)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/221)
 -   Unify EIO's Organic Dyes [(\#239)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/239)
+-   More recipes for xp bottles [(\#249)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/249)
+-   More crushing recipe compat [(\#251)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/251)
+-   Pretty Pipes quests! [(\#253)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/253)
 
 #### 🦟 Bugs Fixed
 
@@ -19,6 +22,8 @@
 -   Vengeance Spirits will no longer spawn unless using a Vengeance Ring [(\#233)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/233)
 -   Gysahl Greens are now compostable [(\#235)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/235)
 -   Fix output rates for many EIO Sag Mill recipes [(\#241)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/241)
+-   Fix missing coal tags [(\#251)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/251)
+-   Fix JDT Bow enchantability [(\#255)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/255)
 
 ---
 

config/actuallyadditions-common.toml

@@ -10,10 +10,6 @@
 	doCatDrops = true
 	#Should Bat wings drop from Bats?
 	doBatDrops = true
-	#The 1/n drop chance, per tick, for a fur ball to be dropped.
-	# Default: 5000
-	# Range: > 1
-	furDropChance = 5000
 	#If true, worms will drop from tilling the soil.
 	tillingWorms = true
 	#The amount of ticks it takes for a worm to die. When at 0 ticks, it will not die.

config/aquaculture-common.toml

@@ -3,7 +3,7 @@
 	"Enable debug mode? (Enables additional logging)" = false
 	"Show Fillet recipes in JEI?" = true
 	# Default: 13
-	# Range: -63 ~ 0
+	# Range: 0 ~ 63
 	"How many blocks below sea level Aquaculture fish can spawn" = 0
 
 	["basic options"."Amount of Message In A Bottle messages"]

config/arts_and_crafts-common.toml

@@ -0,0 +1,9 @@
+	#Setting these values to false will disable features using the vanilla isEnabled method
+	#It is recommended to create a new world after changing the config!
+	["Arts & Crafts Config".Features]
+		#Allows flower pots to be dyed when true. Default value: true
+		enableDyedFlowerPots = true
+		#Should chalk sticks be enabled? Default value: true
+		enableChalkSticks = true
+		#Allows decorated pots to be dyed when true. Default value: true
+		enableDyedDecoratedPots = true

config/betterchunkloading.json

@@ -3,17 +3,21 @@
     "desc:": "Enables predictive chunkloading, which predicts player movement and preloads an area in movement direction: default:true",
     "enablePrediction": true
   },
+  "predictionLoadingSpeed": {
+    "desc:": "Set a modifier to prediction area loading speed, increasing the value increases the speed at which chunks load around the player. Note that faster loading also means higher impact on TPS. range: [0.01 -> 10.0], default: 1.0",
+    "predictionLoadingSpeed": 1.0
+  },
   "predictionarea": {
     "desc:": "Size of the area marked for preloading: default:7 chunks, max: 32, min: 2",
     "predictionarea": 7
   },
   "enableSmartChunkLoading": {
-    "desc:": "Enables smart chunkloading around the player, which dynamically loads the around the player and adapts to player movement speed, to improve server performance on fast movement : default:true",
+    "desc:": "Enables smart chunkloading around the player, which dynamically loads the around the player : default:true",
     "enableSmartChunkLoading": true
   },
-  "smartChunkLoadModifier": {
-    "desc:": "Set a modifier to smart chunkloading, increasing the value increases the view distance used while moving fast, range: [0.1 -> 10.0], default: 1.0",
-    "smartChunkLoadModifier": 1.0
+  "smartChunkLoadingSpeed": {
+    "desc:": "Set a modifier to smart chunkloading speed, increasing the value increases the speed at which chunks load around the player. Note that faster loading also means higher impact on TPS. range: [0.01 -> 10.0], default: 1.0",
+    "smartChunkLoadingSpeed": 1.0
   },
   "preventWalkUnloaded": {
     "desc:": "Prevents players from moving into unloaded areas on serverside, which stalls the server and forceloads the chunk: default:true",
@@ -24,9 +28,13 @@
     "enableSmartPostProcessing": true
   },
   "enableFasterChunkTasks": {
-    "desc:": "Enables faster worldgen tasks: default:true",
+    "desc:": "Enables faster worldgen tasks: default:false",
     "enableFasterChunkTasks": true
   },
+  "optimizeWaiting": {
+    "desc:": "Optimizes time the world is stalled while waiting for a chunk: default:true",
+    "optimizeWaiting": true
+  },
   "debugLogging": {
     "desc:": "Enables debug logging to show chunk loading changes: default:false",
     "debugLogging": false

config/cable_facades-common.toml

@@ -0,0 +1,6 @@
+#List of blocks that are allowed to be covered. Supports '*' as a wildcard.
+blocks = ["pipez:*_pipe", "mekanism:*_cable", "mekanism:*_conductor", "mekanism:*_pipe", "mekanism:*_tube", "mekanism:*_transporter", "mekanism_extras:*_cable", "mekanism_extras:*_conductor", "mekanism_extras:*_pipe", "mekanism_extras:*_tube", "mekanism_extras:*_transporter", "thermal:*_duct", "thermal:*_duct_windowed", "computercraft:cable", "powah:energy_cable_*", "pneumaticcraft:*_tube", "ppfluids:fluid_pipe", "prettypipes:pipe", "laserio:laser_*", "cyclic:*_pipe", "embers:*_pipe", "elementalcraft:elementpipe*", "gtceu:*wire", "gtceu:*pipe"]
+#List of blocks that are explicitly not allowed to be used as a cover. Supports '*' as a wildcard.
+not_allowed_blocks = []
+#Whether the facade should be consumed when placed.
+consumeFacade = true

config/enigmaticunity-server.toml

@@ -1,67 +1,86 @@
 #Conversion multiplier from Aura to Power
-#Range: 4.9E-324 ~ 1.7976931348623157E308
+# Default: 10.0
+# Range: 4.9E-324 ~ 1.7976931348623157E308
 auraConversion = 40.0
 #Conversion multiplier from Source to Power
-#Range: 4.9E-324 ~ 1.7976931348623157E308
+# Default: 10.0
+# Range: 4.9E-324 ~ 1.7976931348623157E308
 sourceConversion = 400.0
 
 ["Dim type"]
 	#Power Buffer size  of the Dim type
-	#Range: > 0
+	# Default: 1000
+	# Range: > 0
 	powerBuffer = 240000
 	#Max amount of power transfer for the Dim type per tick
-	#Range: > 0
+	# Default: 100
+	# Range: > 0
 	maxPowertransfer = 240000
 	#Range the Dim type can connect to Source containers
-	#Range: > 0
+	# Default: 2
+	# Range: > 0
 	range = 8
 	#Ticks to wait for next operation for the DIM type
-	#Range: > 0
+	# Default: 100
+	# Range: > 0
 	tickinterval = 80
 	#Amount of Source to convert per Operation with the Dim type
-	#Range: > 0
+	# Default: 10
+	# Range: > 0
 	amountperoperation = 20
 	#Amount of Aura to drain/provide when theDim type operates
-	#Range: > 0
+	# Default: 10
+	# Range: > 0
 	change = 800
 
 ["Bright type"]
 	#Power Buffer size  of the Bright type
-	#Range: > 0
+	# Default: 10000
+	# Range: > 0
 	powerBuffer = 960000
 	#Max amount of power transfer for the Bright type per tick
-	#Range: > 0
+	# Default: 1000
+	# Range: > 0
 	maxPowertransfer = 960000
 	#Range the Bright type can connect to Source containers
-	#Range: > 0
+	# Default: 5
+	# Range: > 0
 	range = 8
 	#Ticks to wait for next operation for the BRIGHT type
-	#Range: > 0
+	# Default: 50
+	# Range: > 0
 	tickinterval = 40
 	#Amount of Source to convert per Operation with the Bright type
-	#Range: > 0
+	# Default: 100
+	# Range: > 0
 	amountperoperation = 20
 	#Amount of Aura to drain/provide when theBright type operates
-	#Range: > 0
+	# Default: 50
+	# Range: > 0
 	change = 3800
 
 ["Iridescent type"]
 	#Power Buffer size  of the Iridescent type
-	#Range: > 0
+	# Default: 100000
+	# Range: > 0
 	powerBuffer = 1920000
 	#Max amount of power transfer for the Iridescent type per tick
-	#Range: > 0
+	# Default: 10000
+	# Range: > 0
 	maxPowertransfer = 1920000
 	#Range the Iridescent type can connect to Source containers
-	#Range: > 0
+	# Default: 10
+	# Range: > 0
 	range = 8
 	#Ticks to wait for next operation for the IRIDESCENT type
-	#Range: > 0
+	# Default: 20
+	# Range: > 0
 	tickinterval = 20
 	#Amount of Source to convert per Operation with the Iridescent type
-	#Range: > 0
+	# Default: 1000
+	# Range: > 0
 	amountperoperation = 20
 	#Amount of Aura to drain/provide when theIridescent type operates
-	#Range: > 0
+	# Default: 100
+	# Range: > 0
 	change = 7800
-