Merge pull request #2767 from AllTheMods/Staging

Staging
AllTheMods · Dec 6, 2021 · 236e314 · 236e314
2 parents a5827df + 3888eb7
commit 236e314
Show file tree

Hide file tree

Showing 20 changed files with 270 additions and 21 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.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.11
         - 1.8.10
         - 1.8.9
         - 1.8.8

diff --git a/.github/ISSUE_TEMPLATE/crash.yaml b/.github/ISSUE_TEMPLATE/crash.yaml
@@ -25,6 +25,7 @@ body:
       label: Modpack Version
       description: What version of the pack are you using?
       options:
+        - 1.8.11
         - 1.8.10
         - 1.8.9
         - 1.8.8

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 kubejs/exported
 .idea
-config/jei/bookmarks.ini
+config/jei/bookmarks.ini
+/tmp
+*.zip
diff --git a/config/Advancedperipherals/peripherals.toml b/config/Advancedperipherals/peripherals.toml
@@ -0,0 +1,6 @@
+
+#Peripherals config
+[Peripherals]
+	[Peripherals.Chunky_Turtle]
+		#Enable the Chunky Turtle or not.
+		enableChunkyTurtle = false
diff --git a/config/Advancedperipherals/world.toml b/config/Advancedperipherals/world.toml
@@ -0,0 +1,11 @@
+
+#Config to adjust world settings
+[World]
+	#Enable the villager structures for the computer scientist.
+	enableVillagerStructures = false
+	#Gives the ap documentation to new players on a world.
+	givePlayerBookOnJoin = false
+	#The weight of the villager structures
+	#Range: 0 ~ 16000
+	villagerStructureWeight = 10
+
diff --git a/config/advancedperipherals-common.toml b/config/advancedperipherals-common.toml
diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml
@@ -8,4 +8,4 @@
 [packversionmin]
 	minor = 8
 [packversionminrev]
-	minorrev = 10
+	minorrev = 11
diff --git a/config/brandon3055/DraconicEvolution.cfg b/config/brandon3055/DraconicEvolution.cfg
@@ -0,0 +1,102 @@
+"Server" {
+    "Stabilized Spawner" {
+        S:"spawnerList" <
+            resourcefulbees:allthemodium_bee
+            resourcefulbees:aluminum_bee
+            resourcefulbees:aquamarine_bee
+            resourcefulbees:awakened_bee
+            resourcefulbees:beediddy_bee
+            resourcefulbees:beeper_bee
+            resourcefulbees:blazing_bee
+            resourcefulbees:certus_bee
+            resourcefulbees:chaotic_bee
+            resourcefulbees:coal_bee
+            resourcefulbees:cobalt_bee
+            resourcefulbees:cobbee_bee
+            resourcefulbees:copper_bee
+            resourcefulbees:cotton_candy_bee
+            resourcefulbees:crimson_iron_bee
+            resourcefulbees:cropy_bee
+            resourcefulbees:dense_copper_bee
+            resourcefulbees:dense_gold_bee
+            resourcefulbees:dense_iron_bee
+            resourcefulbees:dense_lead_bee
+            resourcefulbees:dense_netherite_bee
+            resourcefulbees:dense_nickel_bee
+            resourcefulbees:dense_osmium_bee
+            resourcefulbees:dense_platinum_bee
+            resourcefulbees:dense_silver_bee
+            resourcefulbees:dense_tin_bee
+            resourcefulbees:dense_uranium_bee
+            resourcefulbees:dense_zinc_bee
+            resourcefulbees:diamond_bee
+            resourcefulbees:dirty_bee
+            resourcefulbees:draconium_bee
+            resourcefulbees:dragonic_bee
+            resourcefulbees:emerald_bee
+            resourcefulbees:ender_bee
+            resourcefulbees:fluorite_bee
+            resourcefulbees:ghastly_bee
+            resourcefulbees:glowing_bee
+            resourcefulbees:gold_bee
+            resourcefulbees:gravely_bee
+            resourcefulbees:guardian_bee
+            resourcefulbees:icey_bee
+            resourcefulbees:iron_bee
+            resourcefulbees:kitten_bee
+            resourcefulbees:kobee_beef_bee
+            resourcefulbees:lapis_bee
+            resourcefulbees:lava_bee
+            resourcefulbees:lead_bee
+            resourcefulbees:leafy_bee
+            resourcefulbees:lumber_bee
+            resourcefulbees:magma_bee
+            resourcefulbees:mana_bee
+            resourcefulbees:mason_bee
+            resourcefulbees:mystical_bee
+            resourcefulbees:netherite_bee
+            resourcefulbees:nickel_bee
+            resourcefulbees:obsidian_bee
+            resourcefulbees:oreo_bee
+            resourcefulbees:osmium_bee
+            resourcefulbees:papa_beemeritus_bee
+            resourcefulbees:platinum_bee
+            resourcefulbees:quartz_bee
+            resourcefulbees:redstone_bee
+            resourcefulbees:rgbee_bee
+            resourcefulbees:salt_baee_bee
+            resourcefulbees:sandy_bee
+            resourcefulbees:silver_bee
+            resourcefulbees:slimy_bee
+            resourcefulbees:soul_lava_bee
+            resourcefulbees:spider_bee
+            resourcefulbees:spooky_bee
+            resourcefulbees:stan_bee
+            resourcefulbees:starry_bee
+            resourcefulbees:stoned_bee
+            resourcefulbees:tin_bee
+            resourcefulbees:unobtainium_bee
+            resourcefulbees:uraninite_bee
+            resourcefulbees:uranium_bee
+            resourcefulbees:vibranium_bee
+            resourcefulbees:water_bee
+            resourcefulbees:wither_bee
+            resourcefulbees:withered_bee
+            resourcefulbees:yeti_bee
+            resourcefulbees:zinc_bee
+            resourcefulbees:zombee_bee
+            iceandfire:lightning_dragon
+            iceandfire:fire_dragon
+            iceandfire:ice_dragon
+            iceandfire:dragon_egg
+            iceandfire:myrmex_egg
+            iceandfire:myrmex_queen
+            iceandfire:myrmex_royal
+            iceandfire:myrmex_sentinel
+            iceandfire:myrmex_soldier
+            iceandfire:myrmex_swarmer
+            iceandfire:myrmex_worker
+            artifacts:mimic
+        >
+    }
+}
diff --git a/config/polymorph-integrations.toml b/config/polymorph-integrations.toml
@@ -0,0 +1,3 @@
+refinedstorage = false
+appliedenergistics2 = false
+
diff --git a/config/quark-common.toml b/config/quark-common.toml
@@ -88,4 +88,5 @@
 	[client.greener_grass]
 		"Block List" = ["minecraft:large_fern", "minecraft:tall_grass", "minecraft:grass_block", "minecraft:fern", "minecraft:grass", "minecraft:potted_fern", "minecraft:sugar_cane"]
 		"Leaves List" = ["minecraft:spruce_leaves", "minecraft:birch_leaves", "minecraft:oak_leaves", "minecraft:jungle_leaves", "minecraft:acacia_leaves", "minecraft:dark_oak_leaves", "minecraft:vine"]
-
+	[client.improved_tooltips]
+		"Food Tooltips" = false
diff --git a/config/supplementaries-common.toml b/config/supplementaries-common.toml
@@ -0,0 +1,7 @@
+
+#Vanilla tweaks
+[tweaks]
+
+	[tweaks.placeable_books]
+		#Allow books and enchanted books to be placed on the ground
+		enabled = false
diff --git a/config/woot-common.toml b/config/woot-common.toml
@@ -1,13 +1,13 @@
 [policy]
 	[policy.mob]
-		spawnTicks = ["minecraft:wither,1200", "minecraft:ender_dragon,12000", "botania:doppleganger,12000"]
-		tier = ["minecraft:wither_skeleton,4", "minecraft:villager,4", "minecraft:magma_cube,3", "minecraft:enderman,4", "minecraft:villager_golem,4", "minecraft:guardian,4", "minecraft:blaze,3", "minecraft:witch,3", "minecraft:ghast,3", "minecraft:zombie_pigman,3", "minecraft:ender_dragon,5", "minecraft:wither,5", "botania:doppleganger,5"]
-		xp = ["minecraft:iron_golem,20", "minecraft:bat,1", "minecraft:snow_golem,1", "minecraft:villager,2", "minecraft:wandering_villager,2", "minecraft:ender_dragon,500", "botania:doppleganger,1"]
-		health = ["minecraft:ender_dragon,500", "botania:doppleganger,250"]
-		customDropsOnly = ["minecraft:ender_dragon", "botania:doppleganger"]
+		spawnTicks = ["minecraft:wither,1200", "minecraft:ender_dragon,12000", "botania:doppleganger,12000", "iceandfire:ice_dragon,12000", "iceandfire:fire_dragon,12000", "iceandfire:lightning_dragon,12000"]
+		tier = ["minecraft:wither_skeleton,4", "minecraft:villager,4", "minecraft:magma_cube,3", "minecraft:enderman,4", "minecraft:villager_golem,4", "minecraft:guardian,4", "minecraft:blaze,3", "minecraft:witch,3", "minecraft:ghast,3", "minecraft:zombie_pigman,3", "minecraft:ender_dragon,5", "minecraft:wither,5", "botania:doppleganger,5", "iceandfire:ice_dragon,5", "iceandfire:fire_dragon,5", "iceandfire:lightning_dragon,5"]
+		xp = ["minecraft:iron_golem,20", "minecraft:bat,1", "minecraft:snow_golem,1", "minecraft:villager,2", "minecraft:wandering_villager,2", "minecraft:ender_dragon,500", "botania:doppleganger,1", "iceandfire:ice_dragon,1", "iceandfire:fire_dragon,1", "iceandfire:lightning_dragon,1"]
+		health = ["minecraft:ender_dragon,500", "botania:doppleganger,250", "iceandfire:ice_dragon,500", "iceandfire:fire_dragon,500", "iceandfire:lightning_dragon,500"]
+		customDropsOnly = ["minecraft:ender_dragon", "botania:doppleganger", "iceandfire:ice_dragon", "iceandfire:fire_dragon", "iceandfire:lightning_dragon"]
 		[policy.mob.perk]
-			mass1 = ["minecraft:ender_dragon,2", "minecraft:wither,2", "botania:doppleganger,2"]
-			mass2 = ["minecraft:ender_dragon,3", "minecraft:wither,3", "botania:doppleganger,3"]
-			mass3 = ["minecraft:ender_dragon,4", "minecraft:wither,4", "botania:doppleganger,4"]
+			mass1 = ["minecraft:ender_dragon,2", "minecraft:wither,2", "botania:doppleganger,2", "iceandfire:ice_dragon,2", "iceandfire:fire_dragon,2", "iceandfire:lightning_dragon,2"]
+			mass2 = ["minecraft:ender_dragon,3", "minecraft:wither,3", "botania:doppleganger,3", "iceandfire:ice_dragon,3", "iceandfire:fire_dragon,3", "iceandfire:lightning_dragon,3"]
+			mass3 = ["minecraft:ender_dragon,4", "minecraft:wither,4", "botania:doppleganger,4", "iceandfire:ice_dragon,4", "iceandfire:fire_dragon,4", "iceandfire:lightning_dragon,4"]
 	[policy.blacklist]
 		captureMod = []
diff --git a/kubejs/client_scripts/jei_removals.js b/kubejs/client_scripts/jei_removals.js
@@ -127,6 +127,8 @@ onEvent('jei.hide.items', e => {
     'mekanism:dust_sulfur',
     'translocators:diamond_nugget',
     'createaddition:diamond_grit',
+    'zycraft:aluminium_block',
+    'zycraft:aluminium',
     'zycraft:aluminium_foil',
     'zycraft:quartz_bucket',
     'zycraft:aluminium_can',

diff --git a/kubejs/data/allthetweaks/recipes/factory/fire_dragon.json b/kubejs/data/allthetweaks/recipes/factory/fire_dragon.json
@@ -0,0 +1,36 @@
+{
+  "type": "woot:factory",
+  "mob": "iceandfire:fire_dragon",
+  "items": [{
+    "item": "draconicevolution:dragon_heart",
+    "count": 1
+  }],
+  "fluids": [],
+  "drops": [
+    {
+      "item": "iceandfire:dragonscales_red",
+      "sizes": [3, 3, 3, 3],
+      "chances": [100.0, 100.0, 100.0, 100.0]
+    },
+    {
+      "item": "iceandfire:fire_dragon_blood",
+      "sizes": [1, 1, 1, 1],
+      "chances": [100.0, 100.0, 100.0, 100.0]
+    },
+    {
+      "item": "iceandfire:fire_dragon_flesh",
+      "sizes": [1, 1, 1, 1],
+      "chances": [100.0, 100.0, 100.0, 100.0]
+    },
+    {
+      "item": "iceandfire:fire_dragon_heart",
+      "sizes": [1, 1, 1, 1],
+      "chances": [10.0, 10.0, 10.0, 10.0]
+    },
+    {
+      "item": "atmadditions:dragon_soul",
+      "sizes": [1, 1, 1, 1],
+      "chances": [10.0, 10.0, 10.0, 10.0]
+    }
+  ]
+}
diff --git a/kubejs/data/allthetweaks/recipes/factory/ice_dragon.json b/kubejs/data/allthetweaks/recipes/factory/ice_dragon.json
@@ -0,0 +1,36 @@
+{
+  "type": "woot:factory",
+  "mob": "iceandfire:ice_dragon",
+  "items": [{
+    "item": "draconicevolution:dragon_heart",
+    "count": 1
+  }],
+  "fluids": [],
+  "drops": [
+    {
+      "item": "iceandfire:dragonscales_white",
+      "sizes": [3, 3, 3, 3],
+      "chances": [100.0, 100.0, 100.0, 100.0]
+    },
+    {
+      "item": "iceandfire:ice_dragon_blood",
+      "sizes": [1, 1, 1, 1],
+      "chances": [100.0, 100.0, 100.0, 100.0]
+    },
+    {
+      "item": "iceandfire:ice_dragon_flesh",
+      "sizes": [1, 1, 1, 1],
+      "chances": [100.0, 100.0, 100.0, 100.0]
+    },
+    {
+      "item": "iceandfire:ice_dragon_heart",
+      "sizes": [1, 1, 1, 1],
+      "chances": [10.0, 10.0, 10.0, 10.0]
+    },
+    {
+      "item": "atmadditions:dragon_soul",
+      "sizes": [1, 1, 1, 1],
+      "chances": [10.0, 10.0, 10.0, 10.0]
+    }
+  ]
+}
diff --git a/kubejs/data/allthetweaks/recipes/factory/lightning_dragon.json b/kubejs/data/allthetweaks/recipes/factory/lightning_dragon.json
@@ -0,0 +1,36 @@
+{
+  "type": "woot:factory",
+  "mob": "iceandfire:lightning_dragon",
+  "items": [{
+    "item": "draconicevolution:dragon_heart",
+    "count": 1
+  }],
+  "fluids": [],
+  "drops": [
+    {
+      "item": "iceandfire:dragonscales_black",
+      "sizes": [3, 3, 3, 3],
+      "chances": [100.0, 100.0, 100.0, 100.0]
+    },
+    {
+      "item": "iceandfire:lightning_dragon_blood",
+      "sizes": [1, 1, 1, 1],
+      "chances": [100.0, 100.0, 100.0, 100.0]
+    },
+    {
+      "item": "iceandfire:lightning_dragon_flesh",
+      "sizes": [1, 1, 1, 1],
+      "chances": [100.0, 100.0, 100.0, 100.0]
+    },
+    {
+      "item": "iceandfire:lightning_dragon_heart",
+      "sizes": [1, 1, 1, 1],
+      "chances": [10.0, 10.0, 10.0, 10.0]
+    },
+    {
+      "item": "atmadditions:dragon_soul",
+      "sizes": [1, 1, 1, 1],
+      "chances": [10.0, 10.0, 10.0, 10.0]
+    }
+  ]
+}
diff --git a/kubejs/server_scripts/mod_specific/botania/botania.js b/kubejs/server_scripts/mod_specific/botania/botania.js
@@ -5,9 +5,6 @@ onEvent('recipes', e => {
     R: '#botania:runes'
   }).id('kubejs:botania/creative_pool')
 
-  e.shapeless(item.of('botania:mana_tablet', { mana: 500000, creative: '1b' }), 'botania:creative_pool').id('kubejs:botania/creative_mana_tablet')
-  e.shapeless('botania:creative_pool', Item.of('botania:mana_tablet', { mana: 500000, creative: true })).id('kubejs:botania/creative_pool_from_creative_mana_tablet')
-
   e.recipes.botania.runic_altar({
     output: { item: 'kubejs:rune_of_sins' },
     mana: 25000,

diff --git a/kubejs/server_scripts/mod_specific/pneumaticcraft/pneumaticcraft.js b/kubejs/server_scripts/mod_specific/pneumaticcraft/pneumaticcraft.js
@@ -147,4 +147,15 @@ onEvent('recipes', e => {
     'count': 1
   }], 'pneumaticcraft:empty_pcb', 3, 1.5)
   e.remove({ id: 'pneumaticcraft:pressure_chamber/empty_pcb' })
+
+  // change construction bricks to only take pneumaticcraft:plastic
+  function brickRecipe(color) {
+    e.shaped(`pneumaticcraft:plastic_brick_${color}`, ['PPP', 'PDP', 'PPP'], {
+      P: 'pneumaticcraft:plastic',
+      D: `#forge:dyes/${color}`
+    }).id(`kubejs:pneumaticcraft/plastic_brick_${color}`)
+    e.remove({ id: `pneumaticcraft:plastic_brick_${color}` })
+  }
+
+  colors.forEach(color => brickRecipe(color))
 })
diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js
@@ -117,7 +117,7 @@ onEvent('item.tags', e => {
   e.add('misctags:botany_pots', colors.map(color => `botanypots:${color}_botany_pot`).concat('botanypots:botany_pot'))
   //#endregion
   //#region removals
-  e.remove(`minecraft:flowers`, `#botania:special_flowers`)
+  e.remove(`minecraft:small_flowers`, `#botania:special_flowers`)
   e.remove('forge:leather', 'forbidden_arcanus:rotten_leather')
   e.remove('engineerstools:musli_bar_food_blacklisted', 'minecraft:chicken')
   e.remove('forge:dyes/yellow', 'mekanism:dust_sulfur')

diff --git a/kubejs/server_scripts/unify.js b/kubejs/server_scripts/unify.js
@@ -457,6 +457,9 @@ onEvent('recipes', e => {
 
   // #endregion Tinkers Unification
 
+  e.replaceInput('zycraft:aluminium_block', '#forge:storage_blocks/aluminum')
+  e.remove({id: 'zycraft:aluminium_block'})
+
   e.replaceInput('appliedenergistics2:certus_quartz_dust', '#forge:dusts/certus_quartz')
   e.replaceInput('thermal:bitumen', '#forge:bitumen')
   e.replaceInput('immersivepetroleum:bitumen', '#forge:bitumen')
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ body: @@
           label: Modpack Version
           description: What version of the pack are you using?
           options:
+            - 1.8.11
             - 1.8.10
             - 1.8.9
             - 1.8.8
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		refinedstorage = false
		appliedenergistics2 = false