Merge pull request #2002 from AllTheMods/Staging

Staging 1.7.0

.gitignore

@@ -1 +1,2 @@
-kubejs/exported
+kubejs/exported
+.idea

config/create-client.toml

@@ -0,0 +1,89 @@
+
+# 
+#Client-only settings - If you're looking for general settings, look inside your worlds serverconfig folder!
+[client]
+	# 
+	#Show item descriptions on Shift and controls on Ctrl.
+	enableTooltips = true
+	# 
+	#Display a tooltip when looking at overstressed components.
+	enableOverstressedTooltip = true
+	# 
+	#Log a stack-trace when rendering issues happen within a moving contraption.
+	explainRenderErrors = false
+	# 
+	#Range: 0.0 ~ 1.0
+	fanParticleDensity = 0.5
+	# 
+	#Show colourful debug information while the F3-Menu is open.
+	enableRainbowDebug = true
+	# 
+	#Use modern OpenGL features to drastically increase performance.
+	experimentalRendering = true
+	# 
+	#The maximum amount of blocks for which to try and calculate dynamic contraption lighting. Decrease if large contraption cause too much lag
+	#Range: > 0
+	maximumContraptionLightVolume = 16384
+	# 
+	#Offset the overlay from goggle- and hover- information by this many pixels on the X axis; Use /create overlay
+	#Range: > -2147483648
+	overlayOffsetX = 20
+	# 
+	#Offset the overlay from goggle- and hover- information by this many pixels on the Y axis; Use /create overlay
+	#Range: > -2147483648
+	overlayOffsetY = 0
+	# 
+	#Choose the menu row that the Create config button appears on in the main menu
+	#Set to 0 to disable the button altogether
+	#Range: 0 ~ 4
+	mainMenuConfigButtonRow = 0
+	# 
+	#Offset the Create config button in the main menu by this many pixels on the X axis
+	#The sign (+/-) of this value determines what side of the row the button appears on (right/left)
+	#Range: > -2147483648
+	mainMenuConfigButtonOffsetX = -4000
+	# 
+	#Choose the menu row that the Create config button appears on in the in-game menu
+	#Set to 0 to disable the button altogether
+	#Range: 0 ~ 5
+	ingameMenuConfigButtonRow = 0
+	# 
+	#Offset the Create config button in the in-game menu by this many pixels on the X axis
+	#The sign (+/-) of this value determines what side of the row the button appears on (right/left)
+	#Range: > -2147483648
+	ingameMenuConfigButtonOffsetX = -4
+	# 
+	#Setting this to true will prevent Create from sending you a warning when playing with Fabulous graphics enabled
+	ignoreFabulousWarning = false
+
+	# 
+	#Settings for the Placement Assist
+	[client.placementAssist]
+		# 
+		#What indicator should be used when showing where the assisted placement ends up relative to your crosshair
+		#Choose 'NONE' to disable the Indicator altogether
+		#Allowed Values: TEXTURE, TRIANGLE, NONE
+		indicatorType = "TEXTURE"
+		# 
+		#Change the size of the Indicator by this multiplier
+		#Range: 0.0 ~ 3.4028234663852886E38
+		indicatorScale = 1.0
+
+	# 
+	#Ponder settings
+	[client.ponder]
+		# 
+		#Slow down a ponder scene whenever there is text on screen.
+		comfyReading = false
+
+	# 
+	#Sound settings
+	[client.sound]
+		# 
+		#Make cogs rumble and machines clatter.
+		enableAmbientSounds = true
+		# 
+		#Maximum volume modifier of Ambient noise
+		#Range: 0.0 ~ 1.0
+		ambientVolumeCap = 0.10000000149011612
+

config/ftbquests/quests/chapters/ars_nouveau.snbt

@@ -1352,17 +1352,6 @@
 				item: "ars_nouveau:archmage_spell_book"
 			}]
 		},
-		{
-			x: -7.5d,
-			y: 6.5d,
-			dependencies: ["34A173721735401B"],
-			id: "78B03FA829B0EFA3",
-			tasks: [{
-				id: "73ACBE4680F4AF15",
-				type: "item",
-				item: "ars_nouveau:wixie_cauldron"
-			}]
-		},
 		{
 			x: -4.5d,
 			y: 0.0d,

config/ftbquests/quests/chapters/create.snbt

@@ -498,7 +498,7 @@
 		},
 		{
 			x: -7.5d,
-			y: 2.0d,
+			y: 0.0d,
 			description: ["&cCurrently this item has no uses."],
 			dependencies: ["5EE53C2C83F73244"],
 			id: "5EBCFDDB3D74F000",
@@ -757,31 +757,7 @@
 		},
 		{
 			x: -7.5d,
-			y: 0.0d,
-			description: [
-				"The &n&5Deforester&r, as the name suggests, is very good at cutting down trees.",
-				"",
-				"If you mine all the base blocks of a tree, the entire tree will fall.",
-				"",
-				"Much like Ultimine, but better if  it's a huge tree or you don't want your saturation to go down."
-			],
-			dependencies: ["21CF93BDCE7BA2F9"],
-			id: "4F4D1A18CEDA0B2B",
-			tasks: [{
-				id: "68FE0DC94C8A28C0",
-				type: "item",
-				item: {
-					id: "create:deforester",
-					Count: 1b,
-					tag: {
-						Damage: 0
-					}
-				}
-			}]
-		},
-		{
-			x: -7.5d,
-			y: -1.5d,
+			y: -2.0d,
 			description: [
 				"The &n&5Wand of Symmetry&r will place down a mirror wherever you R-Click it. Everything you place on one side of the mirror, will be copied to the other side.",
 				"",
@@ -954,39 +930,6 @@
 				item: "create:portable_fluid_interface"
 			}]
 		},
-		{
-			icon: {
-				id: "create:handheld_blockzapper",
-				Count: 1b,
-				tag: {
-					Retriever: "Chromatic",
-					Scope: "Chromatic",
-					Amplifier: "Chromatic",
-					Body: "Chromatic",
-					Accelerator: "Chromatic"
-				}
-			},
-			x: -6.0d,
-			y: -2.5d,
-			description: ["The &n&5Handheld Blockzapper&r is much like a building wand. you can place or mine blocks and has a lot of unique settings!"],
-			dependencies: ["21CF93BDCE7BA2F9"],
-			id: "35F8BFBF2CE7D6A0",
-			tasks: [{
-				id: "165FC223739A8F1E",
-				type: "item",
-				item: {
-					id: "create:handheld_blockzapper",
-					Count: 1b,
-					tag: {
-						Retriever: "None",
-						Scope: "None",
-						Amplifier: "None",
-						Body: "None",
-						Accelerator: "None"
-					}
-				}
-			}]
-		},
 		{
 			x: 10.5d,
 			y: 3.0d,

config/ftbquests/quests/chapters/refined_storage.snbt

@@ -424,9 +424,9 @@
 			dependencies: ["7DD638E4111D66E7"],
 			id: "0EA6F1852CCD2E16",
 			tasks: [{
-				id: "6606B7D00BD25934",
+				id: "075ABCA23A90448A",
 				type: "item",
-				item: "extrastorage:disk_256k"
+				item: "extradisks:256k_storage_disk"
 			}],
 			rewards: [{
 				id: "16A780A82BB81AC8",
@@ -440,9 +440,9 @@
 			dependencies: ["7DD638E4111D66E7"],
 			id: "730042321ED43902",
 			tasks: [{
-				id: "40D31519A01A74EC",
+				id: "031361B3FBCD3A89",
 				type: "item",
-				item: "extrastorage:disk_1024k"
+				item: "extradisks:1024k_storage_disk"
 			}],
 			rewards: [{
 				id: "51ED1C67DAC6757D",
@@ -456,9 +456,9 @@
 			dependencies: ["7DD638E4111D66E7"],
 			id: "183F24A9BEB6D127",
 			tasks: [{
-				id: "600D77963899AB2F",
+				id: "2CA18734F97DB412",
 				type: "item",
-				item: "extrastorage:disk_4096k"
+				item: "extradisks:4096k_storage_disk"
 			}],
 			rewards: [{
 				id: "424EC620A61979D9",
@@ -472,9 +472,9 @@
 			dependencies: ["7DD638E4111D66E7"],
 			id: "4EAFD1EB1F657B17",
 			tasks: [{
-				id: "577217F8B7E9C081",
+				id: "5BC0F09A11F1A7A9",
 				type: "item",
-				item: "extrastorage:disk_16384k"
+				item: "extradisks:16384k_storage_disk"
 			}],
 			rewards: [{
 				id: "2A9C25F91C5A5036",

config/ftbultimine-common.toml

@@ -7,7 +7,7 @@ exhaustion_per_block = 20.0
 #Doesn't stop at different types of stones
 merge_stone = true
 #Tools that won't let you active ultimine when held
-tool_blacklist = ["mininggadgets:mininggadget"]
+tool_blacklist = ["mininggadgets:mininggadget", "mininggadgets:mininggadget_simple", "mininggadgets:mininggadget_fancy"]
 #Required for some modpacks
 #Range: -1 ~ 8
 render_text_manually = -1

config/iceandfire-common.toml

@@ -117,7 +117,7 @@
 
 	[Dragons.Griefing]
 		#Blocks that a dragon cannot break. Use the format like "minecraft:chest" or "rats:block_of_cheese" 
-		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"]
+		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 - 2 is no griefing, 1 is breaking weak blocks, 0 is default
 		#Range: 0 ~ 2
 		"Dragon Griefing" = 1
@@ -343,6 +343,9 @@
 		#How many maximum individuals a myrmex colony can have.
 		#Range: 10 ~ 10000
 		"Myrmex Colony Max Size" = 80
+		#The maximum radius myrmex area allowed to wander/forage
+		#Range: 100 ~ 20000
+		"Myrmex Maximum Wnader Radius" = 100
 
 	[Mobs.Pixies]
 		#size of pixie villages

config/incontrol/spawn.json

@@ -48,5 +48,65 @@
       "perplayer": true
     },
     "result": "deny"
+  },
+  {
+    "dimension": "allthemodium:the_other",
+    "mob": "iceandfire:dread_knight",
+    "mincount": {
+      "amount": 10,
+      "hostile": true,
+      "perplayer": true
+    },
+    "result": "deny"
+  },
+  {
+    "dimension": "allthemodium:the_other",
+    "mob": "iceandfire:dread_ghoul",
+    "mincount": {
+      "amount": 10,
+      "hostile": true,
+      "perplayer": true
+    },
+    "result": "deny"
+  },
+  {
+    "dimension": "allthemodium:the_other",
+    "mob": "iceandfire:dread_thrall",
+    "mincount": {
+      "amount": 10,
+      "hostile": true,
+      "perplayer": true
+    },
+    "result": "deny"
+  },
+  {
+    "dimension": "allthemodium:the_other",
+    "mob": "iceandfire:dread_horse",
+    "mincount": {
+      "amount": 10,
+      "hostile": true,
+      "perplayer": true
+    },
+    "result": "deny"
+  },
+  {
+    "dimension": "allthemodium:the_other",
+    "mob": "iceandfire:dread_beast",
+    "mincount": {
+      "amount": 10,
+      "hostile": true,
+      "perplayer": true
+    },
+    "result": "deny"
+  },
+  {
+    "dimension": "allthemodium:the_other",
+    "mob": "iceandfire:dread_scuttler",
+    "mincount": {
+      "amount": 10,
+      "hostile": true,
+      "perplayer": true
+    },
+    "result": "deny"
   }
 ]

config/invtweaks-client.toml

@@ -113,6 +113,10 @@
 		containerClass = "appeng.container.me.items.WirelessTermContainer"
 		sortRange = ""
 
+	[[sorting.containerOverrides]]
+		containerClass = "refinedstorage.container.CrafterManagerContainer"
+		sortRange = ""
+
 #Tweaks
 [tweaks]
 	#Enable auto-refill

config/jeresources-common.toml

@@ -7,4 +7,4 @@ showDevData = false
 enchantsBlacklist = ["flimflam", "soulBound", "reactive"]
 hiddenTabs = []
 dimensionsBlacklist = [-11]
-
+disableLootManagerReloading = true

config/jeresources.toml

@@ -7,4 +7,4 @@ showDevData = false
 enchantsBlacklist = ["flimflam", "soulBound", "reactive"]
 hiddenTabs = []
 dimensionsBlacklist = [-11]
-
+disableLootManagerReloading = true

config/quark-common.toml

@@ -18,7 +18,7 @@
 	#Set to true if you need to find the class name for a screen that's causing problems
 	"Print Screen Classnames" = false
 	#A list of screens that don't play well with quark's buttons. Use "Print Screen Classnames" to find the names of any others you'd want to add.
-	"Ignored Screens" = ["com.tfar.craftingstation.client.CraftingStationScreen", "com.refinedmods.refinedstorage.screen.grid.GridScreen", "appeng.client.gui.implementations.CraftingTermScreen", "appeng.client.gui.implementations.PatternTermScreen"]
+	"Ignored Screens" = ["blusunrize.immersiveengineering.client.gui.CraftingTableScreen", "com.tfar.craftingstation.client.CraftingStationScreen", "com.refinedmods.refinedstorage.screen.grid.GridScreen", "appeng.client.gui.implementations.CraftingTermScreen", "appeng.client.gui.implementations.PatternTermScreen", "com.blakebr0.extendedcrafting.client.screen.EliteTableScreen", "com.blakebr0.extendedcrafting.client.screen.EliteAutoTableScreen", "com.blakebr0.extendedcrafting.client.screen.UltimateTableScreen", "com.blakebr0.extendedcrafting.client.screen.UltimateAutoTableScreen", "me.desht.modularrouters.client.gui.filter.GuiFilterScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.CentrifugeScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.MechanicalCentrifugeScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.CentrifugeMultiblockScreen", "com.refinedmods.refinedstorage.screen.FilterScreen", "appeng.client.gui.me.items.CraftingTermScreen", "appeng.client.gui.me.items.PatternTermScreen"]
 	#Set to true to make the quark big worldgen features such as stone clusters or underground biomes generate as spheres rather than unique shapes. It's faster, but won't look as cool
 	"Use Fast Worldgen" = false
 	#Enables quark network profiling features. Do not enable this unless requested to.

config/resourcefulbees/bees/bred/bees_gem/Certus.json

@@ -1,7 +1,7 @@
 {
     "flower": "appliedenergistics2:quartz_block",
     "maxTimeInHive": 2400,
-    "traits": [""],
+    "traits": [],
     "hasHoneycomb": true,
     "baseLayerTexture": "misc/certus_bee",
     "ColorData": {

config/resourcefulbees/bees/bred/bees_gem/Diamond.json

@@ -1,7 +1,7 @@
 {
     "flower": "tag:forge:storage_blocks/diamond",
     "maxTimeInHive": 2400,
-    "traits": [""],
+    "traits": [],
     "hasHoneycomb": true,
     "baseLayerTexture": "ores/diamond/diamond_bee",
     "ColorData": {

config/resourcefulbees/bees/bred/bees_gem/Emerald.json

@@ -1,7 +1,7 @@
 {
     "flower": "tag:forge:storage_blocks/emerald",
     "maxTimeInHive": 2400,
-    "traits": [""],
+    "traits": [],
     "hasHoneycomb": true,
     "baseLayerTexture": "ores/emerald/emerald_bee",
     "ColorData": {