Merge pull request #3189 from AllTheMods/changelog

Changelog updates

Author: jeremiahwinsley

changelog/1.9.0.md

@@ -94,3 +94,12 @@
 - ToolBelt-1.16.5-1.16.3.jar
 - trashcans-1.0.18-forge-mc1.16.jar
 - woot-1.16.5-1.0.8.4.jar
+
+### Other Changes
+- Added Embeddium and Oculus for shaderpack support
+- Remove uncrafting tables from structure loot (#3175)
+- Add tag support to silicon press recipe (#3141)
+- Remove Quark sugar cane bundle recipe (#3142)
+- Add Mekanism quest line (thanks to ToshibaEC0Microwave)
+- Add Blood Magic quest line (thanks to Laithur)
+- General quest overhaul

config/ProjectRed.cfg

@@ -1,12 +1,23 @@
-"General Settings" {
-	B:"Unbreakable Screwdriver"=true
+# General settings
+"general" {
+	# If set to true, the basic screwdriver will not take damage
+	B:"infinite_screwdriver"=true
 }
-"Machine Settings" {
-	B:"Enable the Diamond Block Breaker"=true
+
+# Settings related to machines and devices
+"machines" {
+	# Allow the Diamond Block Breaker to be crafted
+	B:"diamond_block_breaker"=true
 }
-"World Gen" {
-	B:"Marble Caves"=false
-	B:"Copper Ore"=false
-	B:"Tin Ore"=false
-	B:"Silver Ore"=false
+
+# World gen settings
+"world_gen" {
+	# Enable Copper Ore generation
+	B:"copper_ore"=false
+	# Enable Tin Ore generation
+	B:"tin_ore"=false
+	# Enable Silver Ore generation
+	B:"silver_ore"=false
+	# Enable Marble Cave generation
+	B:"marble_cave"=false
 }

config/moreminecartsconfig.toml

@@ -1 +1 @@
-chunk_loader_multiplier = 00
+chunk_loader_multiplier = 0

config/mythicbotany.json5

@@ -1,5 +1,5 @@
-{  
-  "mjoellnir": {    
+{
+  "mjoellnir": {
     "base_attack_speed": -2.5,
     "base_damage_melee": 15000.0,
     "base_damage_ranged": 15000.0,

config/pneumaticcraft-common.toml

@@ -1,3 +1,2 @@
 [General]
 	oil_world_gen_blacklist = ["minecraft:soul_sand_valley", "minecraft:crimson_forest", "minecraft:warped_forest", "minecraft:nether_wastes", "minecraft:the_void", "minecraft:the_end", "minecraft:small_end_islands", "minecraft:end_midlands", "minecraft:end_highlands", "minecraft:end_barrens", "allthemodium:mining"]
-	vacuum_trap_blacklist = ["#mob_grinding_utils:noswab"]

config/terraforged/general.conf

@@ -1,5 +1,5 @@
 # The version of this config. Do not edit (it'll wipe your settings!)
-version = "1.1"
+version = "1.2"
 # Set the preset to use when creating a new world.
 default_preset = "All The Mods 6"
 # Set whether tooltips should be displayed by default in the config gui.
@@ -14,7 +14,7 @@ structure_search_timeout = 5000
 # The number of milliseconds a single feature/structure can generate for before a warning
 # is printed to the logs. This may help track down mods that are causing world-gen to run slow.
 # Set to -1 to disable.
-feature_warn_time = 100
+feature_warn_time = 500
 # The number of milliseconds after which the server will be considered 'deadlocked' (when it
 # gets stuck trying to generate a feature/structure). This is usually caused by third-party mods.
 # Set to -1 to disable deadlock detection & reporting (the game may freeze indefinitely without it).

kubejs/data/mysticalagriculture/recipes/essence/appliedenergistics2/silicon_press.json

@@ -0,0 +1,26 @@
+{
+  "type": "cucumber:shaped_no_mirror",
+  "conditions": [
+    {
+      "type": "mysticalagriculture:crop_enabled",
+      "crop": "mysticalagriculture:certus_quartz"
+    }
+  ],
+  "pattern": [
+    "EEE",
+    "EME",
+    "EEE"
+  ],
+  "key": {
+    "E": {
+      "item": "mysticalagriculture:certus_quartz_essence"
+    },
+    "M": {
+      "tag": "forge:silicon"
+    }
+  },
+  "result": {
+    "item": "appliedenergistics2:silicon_press",
+    "count": 1
+  }
+}

kubejs/server_scripts/mod_specific/applied_energistics2/applied_energistics2.js

@@ -10,27 +10,29 @@ onEvent('recipes', e => {
     S: 'minecraft:stone',
     B: 'minecraft:blackstone'
   }).id(`kubejs:appliedenergistics2/sky_stone_brick`)
-  e.shaped('appliedenergistics2:calculation_processor_press', ['CFC', 'FVF', 'PFP'], {
-    C: 'appliedenergistics2:purified_certus_quartz_crystal',
-    F: '#forge:ingots/fluix_steel',
-    V: '#forge:storage_blocks/vibranium',
-    P: 'appliedenergistics2:fluix_pearl'
+  e.shaped('appliedenergistics2:calculation_processor_press', ['HBH', 'IXI', 'HBH'], {
+    X: 'appliedenergistics2:purified_certus_quartz_crystal',
+    I: 'minecraft:iron_ingot',
+    B: 'minecraft:iron_block',
+    H: 'minecraft:iron_bars'
   }).id(`kubejs:appliedenergistics2/calculation_press`)
-  e.shaped('appliedenergistics2:logic_processor_press', ['BFB', 'FVF', 'CFC'], {
-    B: '#forge:ingots/blaze_gold',
-    F: '#forge:ingots/fluix_steel',
-    V: '#forge:storage_blocks/vibranium',
-    C: '#forge:ingots/rose_gold'
+  e.shaped('appliedenergistics2:logic_processor_press', ['HBH', 'IXI', 'HBH'], {
+    X: 'minecraft:gold_ingot',
+    I: 'minecraft:iron_ingot',
+    B: 'minecraft:iron_block',
+    H: 'minecraft:iron_bars'
   }).id(`kubejs:appliedenergistics2/logic_press`)
-  e.shaped('appliedenergistics2:engineering_processor_press', ['DFD', 'FVF', 'DFD'], {
-    D: '#forge:gems/mana_diamond',
-    F: '#forge:ingots/fluix_steel',
-    V: '#forge:storage_blocks/vibranium'
+  e.shaped('appliedenergistics2:engineering_processor_press', ['HBH', 'IXI', 'HBH'], {
+    X: 'minecraft:diamond',
+    I: 'minecraft:iron_ingot',
+    B: 'minecraft:iron_block',
+    H: 'minecraft:iron_bars'
   }).id(`kubejs:appliedenergistics2/engineering_press`)
-  e.shaped('appliedenergistics2:silicon_press', ['WFW', 'FVF', 'WFW'], {
-    W: '#forge:silicon',
-    F: '#forge:ingots/fluix_steel',
-    V: '#forge:storage_blocks/vibranium'
+  e.shaped('appliedenergistics2:silicon_press', ['HBH', 'IXI', 'HBH'], {
+    X: '#forge:silicon',
+    I: 'minecraft:iron_ingot',
+    B: 'minecraft:iron_block',
+    H: 'minecraft:iron_bars'
   }).id(`kubejs:appliedenergistics2/silicon_press`)
 
   e.recipes.appliedenergistics2.grinder({

kubejs/server_scripts/mod_specific/quark/quark.js

@@ -15,6 +15,7 @@ onEvent('recipes', e => {
   })
 
   removeRecipeByOutput(e, [
+    'quark:sugar_cane_block',
     'quark:apple_crate',
     'quark:potato_crate',
     'quark:carrot_crate',

kubejs/server_scripts/tags.js

@@ -242,6 +242,7 @@ onEvent('entity_type.tags', e => {
   e.add('industrialforegoing:mob_imprisonment_tool_blacklist', [/resourcefulbees:.+_bee/, /iceandfire:myrmex.+/, /iceandfire:.+_dragon/, 'iceandfire:dragon_multipart', 'iceandfire:dragon_egg', 'artifacts:mimic',/mana-and-artifice:.+/])
   e.add('mob_grinding_utils:noswab', [/resourcefulbees:.+_bee/, /iceandfire:myrmex.+/, /iceandfire:.+_dragon/, 'iceandfire:dragon_multipart', 'iceandfire:dragon_egg', 'artifacts:mimic', /mana-and-artifice:.+/])
   e.add('mob_grinding_utils:no_spawn', '#mob_grinding_utils:noswab')
+  e.add('pneumaticcraft:vacuum_trap_blacklisted', '#mob_grinding_utils:noswab')
 })
 //#endregion