Merge pull request #740 from AllTheMods/1.3.9

Cleanup of Unify
Cleanup of misc errors in the scripts, 
Updated tags regex and line terminations.
Updated some configs to incorporate mod author changes with ATM6 configs.
Updated Crash Utils to unload chunks after 7 days of the player file not being modified.
Updated some bee textures.

config/Mekanism/additions-common.toml

@@ -26,6 +26,8 @@
 			weightPercentage = 0.5
 			#Enable the spawning of baby endermen. Think baby zombies.
 			shouldSpawn = false
+			#The list of structure ids that baby endermen will not spawn in even if the normal mob variant can spawn.
+			structureBlackList = []
 
 		#Config options regarding baby creepers.
 		[additions-common.spawning.baby-creepers]
@@ -48,6 +50,8 @@
 			weightPercentage = 0.5
 			#Enable the spawning of baby creepers. Think baby zombies.
 			shouldSpawn = false
+			#The list of structure ids that baby creepers will not spawn in even if the normal mob variant can spawn.
+			structureBlackList = []
 
 		#Config options regarding baby wither skeletons.
 		[additions-common.spawning.baby-wither-skeletons]
@@ -70,6 +74,8 @@
 			weightPercentage = 0.5
 			#Enable the spawning of baby wither skeletons. Think baby zombies.
 			shouldSpawn = false
+			#The list of structure ids that baby wither skeletons will not spawn in even if the normal mob variant can spawn.
+			structureBlackList = []
 
 		#Config options regarding baby skeletons.
 		[additions-common.spawning.baby-skeletons]
@@ -92,6 +98,8 @@
 			weightPercentage = 0.5
 			#Enable the spawning of baby skeletons. Think baby zombies.
 			shouldSpawn = false
+			#The list of structure ids that baby skeletons will not spawn in even if the normal mob variant can spawn.
+			structureBlackList = []
 
 		#Config options regarding baby strays.
 		[additions-common.spawning.baby-strays]
@@ -114,4 +122,6 @@
 			weightPercentage = 0.5
 			#Enable the spawning of baby strays. Think baby zombies.
 			shouldSpawn = false
+			#The list of structure ids that baby strays will not spawn in even if the normal mob variant can spawn.
+			structureBlackList = []
 

config/Mekanism/client.toml

@@ -33,6 +33,9 @@
 	#How much light to produce if ambient lighting is enabled.
 	#Range: 1 ~ 15
 	ambientLightingLevel = 15
+	#Range at which Tile Entity Renderer's added by Mekanism can render at, for example the contents of multiblocks. Vanilla defaults the rendering range for TERs to 64 for most blocks, but uses a range of 256 for beacons and end gateways.
+	#Range: 1 ~ 1024
+	terRange = 256
 
 	#QIO Config
 	[client.qio]

config/Mekanism/general.toml

@@ -6,7 +6,7 @@
 	maxUpgradeMultiplier = 10
 	#Peak processing rate for the Solar Neutron Activator. Note: It can go higher than this value in some extreme environments.
 	maxSolarNeutronActivatorRate = 64
-	#Any mod ids added to this list will not be able to have any of their blocks, picked up by the cardboard box.
+	#Any mod ids added to this list will not be able to have any of their blocks, picked up by the cardboard box. For example: ["mekanism"]
 	cardboardModBlacklist = []
 	#Disable to make the anchor upgrade not do anything.
 	allowChunkloading = true
@@ -144,6 +144,12 @@
 		negativeEffectsMinSeverity = 0.1
 		#Enable worldwide radiation effects. Don't be a downer and disable this.
 		radiationEnabled = true
+		#Number of ticks required for radioactive gas stored in a Radioactive Waste Barrel to decay radioactiveWasteBarrelDecayAmount mB.
+		#Range: > 1
+		radioactiveWasteBarrelProcessTicks = 1200
+		#Number of mB of gas that decay every radioactiveWasteBarrelProcessTicks ticks when stored in a Radioactive Waste Barrel. Set to zero to disable decay all together. (Gases in the mekanism:waste_barrel_decay_blacklist tag will not decay).
+		#Range: 0 ~ 9223372036854775807
+		radioactiveWasteBarrelDecayAmount = 1
 
 	#SPS Settings
 	[general.sps]

config/Mekanism/world.toml

@@ -1,5 +1,5 @@
 
-#World generation settings for Mekanism. This config is not synced from server to client
+#World generation settings for Mekanism. This config is synced from server to client
 [world_generation]
 	#Allows chunks to retrogen Mekanism ore blocks.
 	enableRegeneration = false
@@ -12,97 +12,121 @@
 		#Determines if copper ore should be added to world generation.
 		shouldGenerate = false
 		#Chance that copper generates in a chunk.
-		#Range: 1 ~ 512
+		#Range: 1 ~ 128
 		perChunk = 16
 		#Maximum number of blocks in a vein of copper.
 		#Range: 1 ~ 512
 		maxVeinSize = 8
-		#Maximum height (exclusive) that veins of copper can spawn.
+		#Maximum height (exclusive) that veins of copper can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
 		#Range: 1 ~ 256
 		maxHeight = 60
+		#Top offset for calculating height that veins of copper can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		topOffset = 0
+		#Bottom offset for calculating height that veins of copper can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		bottomOffset = 0
 
 	#Generation Settings for tin ore.
 	[world_generation.tin]
 		#Determines if tin ore should be added to world generation.
 		shouldGenerate = false
 		#Chance that tin generates in a chunk.
-		#Range: 1 ~ 512
+		#Range: 1 ~ 128
 		perChunk = 14
 		#Maximum number of blocks in a vein of tin.
 		#Range: 1 ~ 512
 		maxVeinSize = 8
-		#Maximum height (exclusive) that veins of tin can spawn.
+		#Maximum height (exclusive) that veins of tin can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
 		#Range: 1 ~ 256
 		maxHeight = 60
+		#Top offset for calculating height that veins of tin can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		topOffset = 0
+		#Bottom offset for calculating height that veins of tin can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		bottomOffset = 0
 
 	#Generation Settings for osmium ore.
 	[world_generation.osmium]
 		#Determines if osmium ore should be added to world generation.
 		shouldGenerate = false
 		#Chance that osmium generates in a chunk.
-		#Range: 1 ~ 512
+		#Range: 1 ~ 128
 		perChunk = 12
 		#Maximum number of blocks in a vein of osmium.
 		#Range: 1 ~ 512
 		maxVeinSize = 8
-		#Maximum height (exclusive) that veins of osmium can spawn.
+		#Maximum height (exclusive) that veins of osmium can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
 		#Range: 1 ~ 256
 		maxHeight = 60
+		#Top offset for calculating height that veins of osmium can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		topOffset = 0
+		#Bottom offset for calculating height that veins of osmium can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		bottomOffset = 0
 
 	#Generation Settings for uranium ore.
 	[world_generation.uranium]
 		#Determines if uranium ore should be added to world generation.
 		shouldGenerate = false
 		#Chance that uranium generates in a chunk.
-		#Range: 1 ~ 512
+		#Range: 1 ~ 128
 		perChunk = 8
 		#Maximum number of blocks in a vein of uranium.
 		#Range: 1 ~ 512
 		maxVeinSize = 8
-		#Maximum height (exclusive) that veins of uranium can spawn.
+		#Maximum height (exclusive) that veins of uranium can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
 		#Range: 1 ~ 256
 		maxHeight = 60
+		#Top offset for calculating height that veins of uranium can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		topOffset = 0
+		#Bottom offset for calculating height that veins of uranium can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		bottomOffset = 0
 
 	#Generation Settings for fluorite ore.
 	[world_generation.fluorite]
 		#Determines if fluorite ore should be added to world generation.
 		shouldGenerate = true
 		#Chance that fluorite generates in a chunk.
-		#Range: 1 ~ 512
+		#Range: 1 ~ 128
 		perChunk = 6
 		#Maximum number of blocks in a vein of fluorite.
 		#Range: 1 ~ 512
 		maxVeinSize = 12
-		#Maximum height (exclusive) that veins of fluorite can spawn.
+		#Maximum height (exclusive) that veins of fluorite can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
 		#Range: 1 ~ 256
 		maxHeight = 32
+		#Top offset for calculating height that veins of fluorite can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		topOffset = 0
+		#Bottom offset for calculating height that veins of fluorite can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		bottomOffset = 0
 
 	#Generation Settings for lead ore.
 	[world_generation.lead]
 		#Determines if lead ore should be added to world generation.
 		shouldGenerate = false
 		#Chance that lead generates in a chunk.
-		#Range: 1 ~ 512
+		#Range: 1 ~ 128
 		perChunk = 8
 		#Maximum number of blocks in a vein of lead.
 		#Range: 1 ~ 512
 		maxVeinSize = 8
-		#Maximum height (exclusive) that veins of lead can spawn.
+		#Maximum height (exclusive) that veins of lead can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
 		#Range: 1 ~ 256
 		maxHeight = 48
+		#Top offset for calculating height that veins of lead can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		topOffset = 0
+		#Bottom offset for calculating height that veins of lead can spawn. Height is calculated by: random.nextInt(maxHeight - topOffset) + bottomOffset
+		bottomOffset = 0
 
 	#Generation Settings for salt.
 	[world_generation.salt]
 		#Determines if salt should be added to world generation.
 		shouldGenerate = true
 		#Chance that salt generates in a chunk.
-		#Range: 1 ~ 65536
+		#Range: 1 ~ 128
 		perChunk = 2
 		#Base radius of a vein of salt.
-		#Range: 1 ~ 65536
+		#Range: 1 ~ 4
 		baseRadius = 2
 		#Extended variability (spread) for the radius in a vein of salt.
-		#Range: 1 ~ 65536
+		#Range: 1 ~ 4
 		spread = 3
 		#Number of blocks to extend up and down when placing a vein of salt.
 		#Range: 0 ~ 127

config/byg/byg-world.toml

@@ -7,7 +7,7 @@
 	#Is the list of biomes a blacklist or whitelist?
 	#When this list is a blacklist, the values in the list will not be in world generation.
 	#When this list is a whitelist, Adding a biome several times gives it more weight in generation and it must contain at least 1 value.
-	#When set to true, datapack biomes will work automatically!
+	#When set to true, datapack biomes will work automatically! When set to false, you will need to manually add datapack entries.
 	#Default: true
 	isBlacklistEnd = true
 	#
@@ -18,7 +18,7 @@
 	#
 	#This works as a whitelist or blacklist depending on the "isBlacklistEnd" value.
 	#NO SPACES AFTER COMMAS!
-	#DOES NOT ACCEPT DATAPACK VALUES!
+                                  
 	#Default: "byg:viscal_isles,byg:shattered_viscal_isles,minecraft:small_end_islands,minecraft:the_end,minecraft:end_barrens"
 	BlacklistEnd = "byg:viscal_isles,byg:shattered_viscal_isles,minecraft:small_end_islands,minecraft:the_end,minecraft:end_barrens"
 	#
@@ -32,7 +32,7 @@
 		#Add biomes by their registry String ID's in a commented list.
 		#Adding a biome several times gives it more weight in generation.
 		#NO SPACES AFTER COMMAS!
-		#DOES NOT ACCEPT DATAPACK VALUES!
+                                   
 		#Default: "byg:viscal_isles,byg:shattered_viscal_isles,minecraft:small_end_islands"
 		VoidBiomes = "byg:viscal_isles,byg:shattered_viscal_isles,minecraft:small_end_islands"
 		#
@@ -154,7 +154,7 @@
 	#Is the list of biomes a blacklist or whitelist?
 	#When this list is a blacklist, the values in the list will not be in world generation.
 	#When this list is a whitelist, Adding a biome several times gives it more weight in generation and it must contain at least 1 value.
-	#When set to true, datapack biomes will work automatically!
+	#When set to true, datapack biomes will work automatically! When set to false, you will need to manually add datapack entries.
 	#Default: true
 	isBlacklistNether = true
 	#
@@ -168,6 +168,7 @@
 	#
 	#This works as a whitelist or blacklist depending on the "isBlacklistNether" value.
 	#NO SPACES AFTER COMMAS!
-	#DOES NOT ACCEPT DATAPACK VALUES!
+                                  
 	#Default: ""
 	BlacklistNether = "byg:embur_bog,allthemodium:modified_gravelly_mountains,allthemodium:gravelly_mountains,allthemodium:mining,allthemodium:badlands,allthemodium:badlands_plateau,allthemodium:basalt_deltas,allthemodium:crimson_forest,allthemodium:desert,allthemodium:desert_hills,allthemodium:eroded_badlands,allthemodium:mining,allthemodium:modified_badlands_plateau,allthemodium:mountain_edge,allthemodium:mountains,allthemodium:nether_wastes,allthemodium:soul_sand_valley,allthemodium:the_other,allthemodium:warped_forest"
+