Merge pull request #2636 from AllTheMods/Staging

Staging

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -26,6 +26,7 @@ body:
       label: Modpack Version
       description: What version of the pack are you using?
       options:
+        - 1.8.8
         - 1.8.7
         - 1.8.6
         - 1.8.5

.github/ISSUE_TEMPLATE/crash.yaml

@@ -25,6 +25,9 @@ body:
       label: Modpack Version
       description: What version of the pack are you using?
       options:
+        - 1.8.8
+        - 1.8.7
+        - 1.8.6
         - 1.8.5
         - 1.8.4
         - 1.8.3

config/allthetweaks-common.toml

@@ -8,4 +8,4 @@
 [packversionmin]
 	minor = 8
 [packversionminrev]
-	minorrev = 7
+	minorrev = 8

config/bloodmagic-common.toml

@@ -0,0 +1,15 @@
+
+#Stops the listed entities from being used in the Well of Suffering.
+#Use the registry name of the entity. Vanilla entities do not require the modid.
+[Blacklist]
+	wellOfSuffering = ["dummmmmmy:target_dummy"]
+
+#Amount of LP the Sacrificial Dagger should provide for each damage dealt.
+["Config Values"]
+	#Declares the amount of LP gained per HP sacrificed for the given entity.
+	#Setting the value to 0 will blacklist it.
+	#Use the registry name of the entity followed by a ';' and then the value you want.
+	#Vanilla entities do not require the modid.
+	sacrificialValues = ["villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100", "dummmmmmy:target_dummy;0"]
+
+

config/compactmachines-common.toml

@@ -1,2 +1,2 @@
 [recipes]
-	vanillaRecipes = false
+	vanillaRecipes = true

config/cyclic.toml

@@ -2,4 +2,4 @@
 	[cyclic.enchantment]
 		beheadingEntityMHF = []
 		magnet = false
-
+		traveler = false

config/resourcefulbees/bees/Dense/Dense Uranium.json

@@ -46,7 +46,7 @@
     "hasCentrifugeOutput": true,
     "mainInputCount": 1,
     "mainOutput": "alltheores:ore_uranium",
-    "mainOutputWeight": 0.02,
+    "mainOutputWeight": 0.50,
     "mainOutputCount": 4,
     "secondaryOutput": "alltheores:uranium_ingot",
     "secondaryOutputWeight": 0.01,

config/resourcefulbees/bees/bred/bees_ingot/Uranium.json

@@ -36,7 +36,7 @@
     "hasCentrifugeOutput": true,
     "mainInputCount": 1,
     "mainOutput": "alltheores:ore_uranium",
-    "mainOutputWeight": 0.02,
+    "mainOutputWeight": 0.50,
     "mainOutputCount": 1,
     "secondaryOutput": "alltheores:uranium_ingot",
     "secondaryOutputWeight": 0.01,

config/tombstone-common.toml

@@ -6,3 +6,9 @@
 [loot]
 	#Entities that can't found as loot in a Familiar Receptacle
 	unhandled_tameable_entities = ["iceandfire:fire_dragon", "iceandfire:ice_dragon", "iceandfire:lightning_dragon"]
+#Miscellaneous options
+[general]
+	#Beneficial effects that can't used by certain features such as ankh of pray, lollipop, scroll of preservation, alchemy perk and magic siphon enchantment
+	unhandled_beneficial_effects = ["extraalchemy", "astralsorcery:potiontimefreeze", "xreliquary:flight", "mana-and-artifice"]
+	#Harmful effects that can't used by certain features such as tablet of cupidity and the enchantment plague bringer
+	unhandled_harmful_effects = ["minecraft:nausea", "mana-and-artifice", "mahoutsukai"]

defaultconfigs/mahoutsukai-server.toml

@@ -1,4 +1,7 @@
-[projection]
-		PROJECTION_BLACKLIST = ["silentgear"]
-		POWER_CONSOLIDATION_TIERS = [10000.0, 50000.0, 500000.0, 1000000.0, 5000000.0]
-		POWER_CONSOLIDATION_TIER_UPGRADE_ITEM = ["atmadditions:atm_star"]
+[projection]
+	PROJECTION_BLACKLIST = ["silentgear"]
+	POWER_CONSOLIDATION_TIERS = [10000.0, 50000.0, 500000.0, 1000000.0, 5000000.0]
+	POWER_CONSOLIDATION_TIER_UPGRADE_ITEM = ["atmadditions:atm_star"]
+[boundary]
+#Entities that won't be considered for the boundary
+	DRAIN_LIFE_ENTITY_BLACKLIST = ["dummmmmmy:target_dummy"]

kubejs/client_scripts/jei_removals.js

@@ -169,7 +169,7 @@ onEvent('jei.hide.items', e => {
   //#region hideStuff
   hideStuff('thermal', 'dust', ['iron', 'gold'])
   hideStuff('immersiveengineering', 'dust', ['iron', 'gold', 'sulfur', 'wood'])
-  hideStuff('immersiveengineering', 'plate', ['iron', 'gold', 'copper', 'aluminum', 'lead', 'silver', 'nickel', 'constantan', 'electrum'])
+  hideStuff('immersiveengineering', 'plate', ['iron', 'gold', 'copper', 'lead', 'silver', 'nickel', 'constantan', 'electrum'])
   hideStuff('mekanism', 'dust', ['lapis_lazuli', 'emerald', 'diamond', 'quartz', 'iron', 'gold'])
   hideStuff('mekanism', 'crystal', ['osmium', 'copper', 'tin', 'lead', 'uranium'])
   hideStuff('mekanism', 'shard', ['osmium', 'copper', 'tin', 'lead', 'uranium'])
@@ -182,7 +182,7 @@ onEvent('jei.hide.items', e => {
   hideStuff('solarflux', 'sp', [6, 7, 8])
   hideStuff('quark', 'crate', ['apple', 'carrot', 'beetroot', 'potato'])
   hideStuff('quark', 'block', ['bamboo', 'charcoal', 'sugar_cane'])
-  hideStuff('mysticalagriculture', 'seeds', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'crimson_steel', 'chrome', 'electrum', 'elementium', 'enderium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'lumium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'oratchalcum', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril'])
-  hideStuff('mysticalagriculture', 'essence', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'crimson_steel', 'chrome', 'electrum', 'elementium', 'enderium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'lumium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'oratchalcum', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril'])
+  hideStuff('mysticalagriculture', 'seeds', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon'])
+  hideStuff('mysticalagriculture', 'essence', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon'])
   //#endregion
 })

kubejs/client_scripts/tooltips.js

@@ -27,7 +27,7 @@ onEvent('item.tooltip', e => {
     'draconicevolution:creative_op_capacitor'
   ]
 
-  let formattedTooltip = (item, tooltip, signature) => {
+  let formattedTooltip = (item, tooltip) => {
     e.add(item, '')
     let line = ''
     tooltip.split(' ').forEach(word => {
@@ -38,7 +38,6 @@ onEvent('item.tooltip', e => {
       }
     })
     if (line.length > 0) e.add(item, Text.of(line).darkPurple())
-    if (signature) e.add(item, Text.of(`   - ${signature}`).darkRed())
     e.add(item, '')
   }
   //#endregion

kubejs/data/botanytrees/recipes/upgrade_aquatic/river.json

@@ -0,0 +1,57 @@
+{
+  "type": "botanypots:crop",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "upgrade_aquatic"
+    },
+    {
+      "type": "forge:item_exists",
+      "item": "upgrade_aquatic:river_sapling"
+    }
+  ],
+  "seed": {
+    "item": "upgrade_aquatic:river_sapling"
+  },
+  "categories": [
+    "dirt"
+  ],
+  "growthTicks": 2400,
+  "display": {
+    "block": "upgrade_aquatic:river_sapling"
+  },
+  "results": [
+    {
+      "chance": 0.5,
+      "output": {
+        "item": "upgrade_aquatic:river_log"
+      },
+      "minRolls": 1,
+      "maxRolls": 1
+    },
+    {
+      "chance": 0.1,
+      "output": {
+        "item": "minecraft:stick"
+      },
+      "minRolls": 1,
+      "maxRolls": 2
+    },
+    {
+      "chance": 0.05,
+      "output": {
+        "item": "upgrade_aquatic:river_sapling"
+      },
+      "minRolls": 1,
+      "maxRolls": 2
+    },
+    {
+      "chance": 0.75,
+      "output": {
+        "item": "upgrade_aquatic:mulberry"
+      },
+      "minRolls": 1,
+      "maxRolls": 4
+    }
+  ]
+}