Merge pull request #2322 from AllTheMods/Staging

1.8.1, 1.8.2 & 1.8.3

config/MouseTweaks.cfg

@@ -0,0 +1,8 @@
+RMBTweak=0
+LMBTweakWithItem=1
+LMBTweakWithoutItem=1
+WheelTweak=1
+WheelSearchOrder=1
+WheelScrollDirection=0
+ScrollItemScaling=0
+Debug=0

config/ProjectRed.cfg

@@ -1,7 +1,6 @@
 "General Settings" {
 	B:"Unbreakable Screwdriver"=true
 }
-
 "Machine Settings" {
 	B:"Enable the Diamond Block Breaker"=true
 }

config/adchimneys-client.toml

@@ -1,46 +1,3 @@
-
 [Smoke]
-	#Affects probability of coloring smoke by chimneys
-	#Range: 0.0 ~ 1.0
-	coloringFactor = 0.10000000149011612
-	#Maximum smoke particles that can be rendered at scene.
-	#If exceeded, smoke amount will be reduced proportionally for each rendered chimney
-	#Range: 0 ~ 2000
-	maxRenderedParticlesAmount = 800
-	#If true, smoke particles will collide with obstacles
-	canCollide = true
-	#If true, all emitters will produce smoke even without connected chimneys
 	emitWithoutChimney = false
-	#Use retro smoke particles instead of modern ones
-	retroSmokeParticles = false
-	#Completely disables vanilla cozy smoke particles from a campfire
-	disableVanillaCampfireSmoke = false
-	#Whether or not to colorize smoke particles
-	colorize = true
-
-[MaterialGroups]
-
-	[MaterialGroups.Brick]
-		#Whether to display this group of blocks or not
-		enabled = true
-
-	[MaterialGroups.Cobblestone]
-		#Whether to display this group of blocks or not
-		enabled = true
-
-	[MaterialGroups.Concrete]
-		#Whether to display this group of blocks or not
-		enabled = true
-
-	[MaterialGroups.Glass]
-		#Whether to display this group of blocks or not
-		enabled = true
-
-	[MaterialGroups.Terracotta]
-		#Whether to display this group of blocks or not
-		enabled = true
-
-	[MaterialGroups.Other]
-		#Whether to display this group of blocks or not
-		enabled = true
 

config/advancedperipherals-common.toml

@@ -1,10 +1,6 @@
 [Features]
-	#Enable the Chunky Turtle or not.
 	enableChunkyTurtle = false
-
 [world]
-	#Enable the villager structures for the computer scientist.
 	enableVillagerStructures = false
-	#Gives the ap documentation to new players on a world.
 	givePlayerBookOnJoin = false
 

config/allthetweaks-common.toml

@@ -1,25 +1,12 @@
-
 [packmode]
 	#ATM = 0 SLOP = 1 SKY = 2 MAGIC = 3 EXPERT = 4
-	#Range: 0 ~ 4
 	enable = 0
-
 [discord]
-	#Enable Discord Rich Prescence
 	discord = true
-
 [packversionmaj]
-	#Pack Release Version Format : X
-	#Range: 0 ~ 32768
 	major = 1
-
 [packversionmin]
-	#Pack Minor Version : X
-	#Range: 0 ~ 32768
 	minor = 8
-
 [packversionminrev]
-	#Pack Minor Version Revision : X
-	#Range: 0 ~ 32768
-	minorrev = 0
+	minorrev = 3
 

config/botanicalmachinery/server.json5

@@ -0,0 +1,3 @@
+{
+  "reminder": false
+}

config/cyclic.toml

@@ -1,6 +1,5 @@
 [cyclic]
 	[cyclic.enchantment]
-		#Beheading enchant add player skin head drop, add any mob id and any skin
 		beheadingEntityMHF = []
 		magnet = false
 

config/defaultoptions/options.txt

@@ -32,7 +32,7 @@ difficulty:2
 graphicsMode:1
 ao:2
 biomeBlendRadius:2
-renderClouds:true
+renderClouds:false
 resourcePacks:[]
 incompatibleResourcePacks:[]
 lastServer:

config/dynview-common.toml

@@ -1,19 +1,8 @@
 ["Dynamic Chunk View Distance Settings"]
-	#The minimum chunk view distance allowed to use. Default: 4
-	#Range: 3 ~ 200
-	minChunkViewDist = 4
-	#The maximum chunk view distance allowed to use. Set to the max a player could benefit from. Default: 20
-	#Range: 1 ~ 200
 	maxChunkViewDist = 10
-	#The average tick time to stabilize the chunk view distance around. Setting it higher than 50ms is not advised, as after 50ms the TPS will go below 20. Default: 45ms
-	#Range: 10 ~ 100
 	meanAvgTickTime = 43
-	#The update frequency of average server tick time checks to update view distances. Default: 30sec
-	#Range: 1 ~ 1000
 	viewDistanceUpdateRate = 120
-	#Whether to output log messages for actions done. This can be helpful to balance the other settings nicely.
 	logMessages = true
-
 ["Chunk slow unload settings"]
 	chunkunload = true
 

config/equipmentcompare-common.toml

@@ -0,0 +1,3 @@
+[client]
+	[client.control_options]
+		blacklist = ["sophisticatedbackpacks:backpack", "sophisticatedbackpacks:iron_backpack", "sophisticatedbackpacks:gold_backpack", "sophisticatedbackpacks:diamond_backpack", "sophisticatedbackpacks:netherite_backpack"]

config/fluxnetworks-common.toml

@@ -1,6 +1,5 @@
 [networks]
 maximumPerPlayer = -1
-
 [general]
 	enableChunkLoading = false
 

config/ftbquests/quests/chapters/creative.snbt

@@ -902,7 +902,7 @@
 				{
 					id: "08D9DBD77105C43B"
 					type: "item"
-					item: "kubejs:atm_star_block"
+					item: "allthecompressed:atm_star_block"
 					consume_items: false
 				}
 				{

config/ftbquests/quests/chapters/tips_and_tricks.snbt

@@ -351,7 +351,8 @@
 			tasks: [{
 				id: "4A080582AC11BEB1"
 				type: "item"
-				item: {
+				title: "Mob Shard (Gaia Guardian)"
+				icon: {
 					id: "woot:mobshard"
 					Count: 1b
 					tag: {
@@ -362,6 +363,38 @@
 						Kills: 5
 					}
 				}
+				item: {
+					id: "itemfilters:and"
+					Count: 1b
+					tag: {
+						items: [
+							{
+								id: "woot:mobshard"
+								Count: 1b
+								tag: {
+									Mob: {
+										keyTag: ""
+										keyEntity: "botania:doppleganger"
+									}
+									Kills: 5
+								}
+							}
+							{
+								id: "itemfilters:weak_nbt"
+								Count: 1b
+								tag: {
+									value: {
+										Mob: {
+											keyTag: ""
+											keyEntity: "botania:doppleganger"
+										}
+										Kills: 5
+									}
+								}
+							}
+						]
+					}
+				}
 			}]
 		}
 	]

config/iceandfire-common.toml

@@ -16,14 +16,12 @@
 		"Dangerous World Gen Dist Seperation" = 128
 		"Mausoleum Gen Chance" = 800
 [Dragons]
-
 		"Max Dragon Flight Height" = 250
 	[Dragons.Griefing]
 		blacklistedBreakBlocks = ["minecraft:obsidian", "minecraft:bedrock", "minecraft:ancient_debris", "minecraft:barrier", "cyclic:unbreakable_block", "cyclic:unbreakable_reactive", "metalbarrels:obsidian_barrel", "ironfurnaces:million_furnace", "powah:energy_cell_creative", "mekanism:creative_energy_cube", "ctiers:centrifuge_controller_tier_creative", "ctiers:centrifuge_casing_tier_creative", "refinedstorage:creative_controller", "creativewirelesstransmitter:creative_wireless_transmitter", "creativecrafter:creative_crafter", "creativeapiary:tcreative_apiary", "compactmachines:solid_wall"]
 		"Dragon Griefing" = 1
 		"Tamed Dragon Griefing" = false
 		noDropBreakBlocks = ["minecraft:stone", "minecraft:dirt", "minecraft:grass_block", "minecraft:netherrack"]
-
 	[Dragons.Attributes]
 		"Dragon Attack Damage(Lightning breath)" = 33.5
 		"Dragon Health" = 32768.0

config/jeresources-common.toml

@@ -1,34 +1,3 @@
-#Range: 1 ~ 4
-itemsPerColumn = 4
-#Range: 1 ~ 4
-itemsPerRow = 4
-diyData = true
-showDevData = false
 enchantsBlacklist = ["flimflam","soulBound","reactive"]
-hiddenTabs = [
-  "minecolonies:baker/crafting",
-  "minecolonies:blacksmith/crafting",
-  "minecolonies:composting",
-  "minecolonies:concretemixer/custom",
-  "minecolonies:cook/smelting",
-  "minecolonies:cookassistant/crafting",
-  "minecolonies:crusher/custom",
-  "minecolonies:dyer/crafting",
-  "minecolonies:dyer/smelting",
-  "minecolonies:enchanter/custom",
-  "minecolonies:farmer/crafting",
-  "minecolonies:fletcher/crafting",
-  "minecolonies:glassblower/crafting",
-  "minecolonies:glassblower/smelting",
-  "minecolonies:lumberjack/custom",
-  "minecolonies:mechanic/crafting",
-  "minecolonies:planter/crafting",
-  "minecolonies:sawmill/crafting",
-  "minecolonies:sifter/custom",
-  "minecolonies:smelter/smelting",
-  "minecolonies:stonemason/crafting",
-  "minecolonies:stonesmeltery/smelting"
-]
-dimensionsBlacklist = [-11]
 disableLootManagerReloading = true