Merge branch 'develop' into chs

.github/ISSUE_TEMPLATE/---feature-request-form.yml

@@ -1,6 +1,6 @@
 name: "Feature Request"
 description: "Suggest a mod or a change to the config or scripts"
-labels: ["Feature Request"]
+labels: ["enhancement"]
 assignees:
   - Darkosto
 body:

src/minecraft/config/carryon-common.toml

@@ -353,14 +353,20 @@ forbiddenTiles = [
   "biggerreactors:*",
   "magic_mirror:*",
   "sophisticatedstorage:chest",
+  "sophisticatedstorage:copper_chest",
+  "sophisticatedstorage:iron_chest",
+  "sophisticatedstorage:gold_chest",
+  "sophisticatedstorage:diamond_chest",
+  "sophisticatedstorage:netherite_chest",
   "enderio:energy_conduit",
   "enderio:fluid_conduit",
   "enderio:pressurized_fluid_conduit",
   "enderio:ender_fluid_conduit",
   "enderio:redstone_conduit",
   "enderio:item_conduit",
   "enderio:dense_me_conduit",
-  "enderio:me_conduit"
+  "enderio:me_conduit",
+  "refurbished_furniture:*"
 ]
 # Entities that cannot be picked up
 forbiddenEntities = [
@@ -387,7 +393,8 @@ forbiddenEntities = [
   "taterzens:npc",
   "easy_npc:*",
   "bodiesbodies:dead_body",
-  "luggage:*"
+  "luggage:*",
+  "littlelogistics:*"
 ]
 # Entities that cannot have other entities stacked on top of them
 forbiddenStacking = ["minecraft:horse"]

src/minecraft/config/jei/blacklist.cfg

@@ -2019,3 +2019,24 @@ occultism:silver_block
 occultism:raw_silver_block
 occultism:silver_ore
 occultism:silver_ore_deepslate
+enderio:flour
+enderio:cake_base
+draconicevolution:info_tablet
+ars_nouveau:creative_spell_book
+botania:infrangible_platform
+draconicevolution:creative_op_capacitor
+draconicevolution:creative_capacitor
+mininggadgets:upgrade_battery_creative
+botania:mana_tablet:{creative: 1, mana: 500000}
+cyclic:anvil_magma
+cyclic:anvil
+mininggadgets:minerslight
+ae2:ender_dust
+enderio:powered_spawner
+industrialforegoing:mob_duplicator
+hostilenetworks:overworld_prediction
+hostilenetworks:nether_prediction
+hostilenetworks:end_prediction
+exnihilosequentia:witch_water
+exnihilosequentia:witch_water_bucket
+woodenbucket:wooden_bucket:{Fluid:{Amount:1000,FluidName:"exnihilosequentia:witch_water"}}

src/minecraft/defaultconfigs/inventorysorter-server.toml

@@ -3,4 +3,7 @@
 # Container blacklist
 containerBlacklist = []
 # Slot type blacklist
-slotBlacklist = []
+slotBlacklist = [
+  "top.theillusivec4.curios.common.inventory.CurioSlot",
+  "tfar.craftingstation.slot.BigSlot"
+]

src/minecraft/global_packs/required_data/skyfactory_5/data/bhc/recipes/smelting/blue_heart_melted.json

@@ -0,0 +1,7 @@
+{
+  "conditions": [
+    {
+      "type": "forge:false"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/bhc/recipes/smelting/green_heart_melted.json

@@ -0,0 +1,7 @@
+{
+  "conditions": [
+    {
+      "type": "forge:false"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/bhc/recipes/smelting/red_heart_melted.json

@@ -0,0 +1,7 @@
+{
+  "conditions": [
+    {
+      "type": "forge:false"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/bhc/recipes/smelting/yellow_heart_melted.json

@@ -0,0 +1,7 @@
+{
+  "conditions": [
+    {
+      "type": "forge:false"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/craftingforblockheads/craftingforblockheads/plants_and_seed_resources.json

@@ -19,35 +19,31 @@
         "item": "exnihilosequentia:grass_seeds"
       },
       "includes": [
-        {
-          "item": "exnihilosequentia:grass_seeds"
-        },
-        {
-          "item": "minecraft:sugar_cane"
-        },
-        {
-          "item": "minecraft:bamboo"
-        },
-        {
-          "item": "minecraft:kelp"
-        },
-        {
-          "item": "exnihilosequentia:mycelium_spores"
-        },
-        {
-          "item": "exnihilosequentia:crimson_nylium_spores"
-        },
-        {
-          "item": "exnihilosequentia:warped_nylium_spores"
-        },
+        { "item": "exnihilosequentia:grass_seeds" },
+        { "item": "minecraft:sugar_cane" },
+        { "item": "minecraft:bamboo" },
+        { "item": "minecraft:kelp" },
+        { "item": "exnihilosequentia:mycelium_spores" },
+        { "item": "exnihilosequentia:crimson_nylium_spores" },
+        { "item": "exnihilosequentia:warped_nylium_spores" },
         { "item": "sushigocrafting:cucumber_seeds" },
         { "item": "thermal:corn_seeds" },
         { "item": "immersiveengineering:seed" },
         { "item": "thermal:onion_seeds" },
         { "item": "thermal:bell_pepper_seeds" },
         { "item": "thermal:eggplant_seeds" },
         { "item": "thermal:tomato_seeds" },
-        { "item": "thermal:flax_seeds" }
+        { "item": "thermal:flax_seeds" },
+        { "item": "thermal:sadiroot_seeds" },
+        { "item": "minecraft:pumpkin_seeds" },
+        { "item": "thermal:amaranth_seeds" },
+        { "item": "thermal:strawberry_seeds" },
+        { "item": "thermal:barley_seeds" },
+        { "item": "thermal:radish_seeds" },
+        { "item": "thermal:rice_seeds" },
+        { "item": "thermal:spinach_seeds" },
+        { "item": "thermal:green_bean_seeds" },
+        { "item": "thermal:peanut_seeds" }
       ],
       "soft_requirements": ["vanilla_composter_present"],
       "hard_requirements": ["colored_crafting_table_present"],

src/minecraft/global_packs/required_data/skyfactory_5/data/craftingforblockheads/craftingforblockheads/skyfactory_5_white.json

@@ -57,7 +57,7 @@
         },
         {
           "item": "sophisticatedstorage:chest",
-          "nbt": "{accentColor:6710886,mainColor:16383999}"
+          "nbt": "{accentColor:6710886,mainColor:16383998}"
         },
         {
           "item": "craftingstation:crafting_station"

src/minecraft/global_packs/required_data/skyfactory_5/data/craftingforblockheads/craftingforblockheads/skyfactory_5_white_rainbow.json

@@ -57,7 +57,7 @@
         },
         {
           "item": "sophisticatedstorage:chest",
-          "nbt": "{accentColor:6710886,mainColor:16383999}"
+          "nbt": "{accentColor:6710886,mainColor:16383998}"
         },
         {
           "item": "craftingstation:crafting_station"

src/minecraft/global_packs/required_data/skyfactory_5/data/create/recipes/milling/compat/ae2/ender_pearl.json

@@ -0,0 +1,14 @@
+{
+  "type": "create:milling",
+  "ingredients": [
+    {
+      "tag": "forge:ender_pearls"
+    }
+  ],
+  "processingTime": 100,
+  "results": [
+    {
+      "item": "thermal:ender_pearl_dust"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/createaddition/recipes/pressing/electrum_ingot.json

@@ -0,0 +1,13 @@
+{
+  "type": "create:pressing",
+  "ingredients": [
+    {
+      "tag": "forge:ingots/electrum"
+    }
+  ],
+  "results": [
+    {
+      "item": "thermal:electrum_plate"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/cyclic/recipes/anvil.json

@@ -0,0 +1,7 @@
+{
+  "conditions": [
+    {
+      "type": "forge:false"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/cyclic/recipes/anvil_magma.json

@@ -0,0 +1,7 @@
+{
+  "conditions": [
+    {
+      "type": "forge:false"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/cyclic/recipes/crusher/glow_ink_sack.json

@@ -0,0 +1,7 @@
+{
+  "conditions": [
+    {
+      "type": "forge:false"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/enderio/recipes/alloy_smelting/cake_base.json

@@ -0,0 +1,23 @@
+{
+  "type": "enderio:alloy_smelting",
+  "energy": 2000,
+  "experience": 0.3,
+  "inputs": [
+    {
+      "count": 3,
+      "ingredient": {
+        "tag": "forge:flour/wheat"
+      }
+    },
+    {
+      "count": 1,
+      "ingredient": {
+        "item": "minecraft:egg"
+      }
+    }
+  ],
+  "result": {
+    "count": 2,
+    "item": "createaddition:cake_base_baked"
+  }
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/enderio/recipes/alloy_smelting/cookie.json

@@ -0,0 +1,23 @@
+{
+  "type": "enderio:alloy_smelting",
+  "energy": 2000,
+  "experience": 0.3,
+  "inputs": [
+    {
+      "count": 1,
+      "ingredient": {
+        "tag": "forge:flour/wheat"
+      }
+    },
+    {
+      "count": 1,
+      "ingredient": {
+        "item": "minecraft:cocoa_beans"
+      }
+    }
+  ],
+  "result": {
+    "count": 8,
+    "item": "minecraft:cookie"
+  }
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/enderio/recipes/cake.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "C": {
+      "item": "createaddition:cake_base_baked"
+    },
+    "M": {
+      "item": "minecraft:milk_bucket"
+    },
+    "S": {
+      "item": "minecraft:sugar"
+    }
+  },
+  "pattern": ["MMM", "SCS"],
+  "result": {
+    "item": "minecraft:cake"
+  },
+  "show_notification": true
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/enderio/recipes/enderios.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "item": "minecraft:bowl"
+    },
+    {
+      "item": "minecraft:milk_bucket"
+    },
+    {
+      "item": "minecraft:wheat"
+    },
+    {
+      "item": "thermal:ender_pearl_dust"
+    }
+  ],
+  "result": {
+    "item": "enderio:enderios"
+  }
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/enderio/recipes/sag_milling/ender_pearl.json

@@ -0,0 +1,18 @@
+{
+  "type": "enderio:sag_milling",
+  "bonus": "none",
+  "energy": 2400,
+  "input": {
+    "tag": "forge:ender_pearls"
+  },
+  "outputs": [
+    {
+      "chance": 1.0,
+      "item": {
+        "count": 1,
+        "item": "thermal:ender_pearl_dust"
+      },
+      "optional": false
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/enderio/recipes/sag_milling/wheat.json

@@ -0,0 +1,24 @@
+{
+  "type": "enderio:sag_milling",
+  "energy": 2400,
+  "input": {
+    "tag": "forge:crops/wheat"
+  },
+  "outputs": [
+    {
+      "chance": 1.0,
+      "item": {
+        "tag": "forge:flour/wheat"
+      },
+      "optional": false
+    },
+    {
+      "chance": 0.2,
+      "item": {
+        "count": 1,
+        "tag": "forge:seeds/wheat"
+      },
+      "optional": true
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/enderio/recipes/soulbinding/broken_spawner.json

@@ -0,0 +1,7 @@
+{
+  "conditions": [
+    {
+      "type": "forge:false"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/enderio/recipes/soulbinding/powered_spawner.json

@@ -0,0 +1,7 @@
+{
+  "conditions": [
+    {
+      "type": "forge:false"
+    }
+  ]
+}

src/minecraft/global_packs/required_data/skyfactory_5/data/hostilenetworks/data_models/mooshroom.json

@@ -26,6 +26,14 @@
     {
       "item": "minecraft:leather",
       "count": 44
+    },
+    {
+      "item": "minecraft:brown_mushroom",
+      "count": 8
+    },
+    {
+      "item": "minecraft:red_mushroom",
+      "count": 8
     }
   ],
   "tier_data": [12, 60, 360, 1260],