Merge pull request #504 from AllTheMods/staging

Staging
AllTheMods · Jul 22, 2021 · 21e6100 · 21e6100
2 parents 098dbe6 + ce14f43
commit 21e6100
Show file tree

Hide file tree

Showing 14 changed files with 503 additions and 14 deletions.
diff --git a/config/resourcefulbees/bees/Breed/bees_ingot/Allthemodium.json b/config/resourcefulbees/bees/Breed/bees_ingot/Allthemodium.json
@@ -88,7 +88,7 @@
     "BreedData": {
         "isBreedable": false,
         "parent1": "Quartz",
-        "parent2": "Rocky",
+        "parent2": "Stoned",
         "breedWeight": 10,
         "breedChance": 0.6,
         "feedItem": "tag:forge:storage_blocks/allthemodium",
@@ -99,4 +99,4 @@
     "TraitData": {
         "hasTraits": false
     }
-}
+}
diff --git a/config/resourcefulbees/bees/Breed/bees_ingot/Iron.json b/config/resourcefulbees/bees/Breed/bees_ingot/Iron.json
@@ -30,13 +30,13 @@
         "mutationCount": 1,
         "mutations": [{
             "type": "BLOCK_TO_ITEM",
-            "inputID": "resourcefulbees:lead_honeycomb_block",
+            "inputID": "resourcefulbees:iron_honeycomb_block",
             "outputs": [{
                     "outputID": "minecraft:iron_ingot",
                     "weight": 80
                 },
                 {
-                    "outputID": "resourcefulbees:lead_bee_spawn_egg",
+                    "outputID": "resourcefulbees:iron_bee_spawn_egg",
                     "weight": 20
                 }
             ]

diff --git a/config/resourcefulbees/bees/Breed/bees_misc/Obsidian.json b/config/resourcefulbees/bees/Breed/bees_misc/Obsidian.json
@@ -30,7 +30,7 @@
         "mutationCount": 1,
         "mutations": [{
             "type": "BLOCK_TO_ITEM",
-            "inputID": "resourcefulbees:obsiadian_honeycomb_block",
+            "inputID": "resourcefulbees:obsidian_honeycomb_block",
             "outputs": [{
                     "outputID": "minecraft:obsidian",
                     "weight": 80

diff --git a/config/resourcefulbees/bees/Breed/bees_misc/Stoned.json b/config/resourcefulbees/bees/Breed/bees_misc/Stoned.json
@@ -30,13 +30,13 @@
         "mutationCount": 1,
         "mutations": [{
             "type": "BLOCK_TO_ITEM",
-            "inputID": "resourcefulbees:rocky_honeycomb_block",
+            "inputID": "resourcefulbees:stoned_honeycomb_block",
             "outputs": [{
                     "outputID": "minecraft:stone",
                     "weight": 80
                 },
                 {
-                    "outputID": "resourcefulbees:rocky_bee_spawn_egg",
+                    "outputID": "resourcefulbees:stoned_bee_spawn_egg",
                     "weight": 20
                 }
             ]

diff --git a/config/resourcefulbees/bees/Breed/bees_mob/Dragonic.json b/config/resourcefulbees/bees/Breed/bees_mob/Dragonic.json
@@ -67,8 +67,8 @@
         "secondaryOutputWeight": 0.2,
         "secondaryOutputCount": 1,
         "secondaryNBTData": {},
-        "bottleOutput": "minecraft:honey_bottle",
-        "bottleOutputWeight": 0.25,
+        "bottleOutput": "minecraft:dragon_breath",
+        "bottleOutputWeight": 0.05,
         "bottleOutputCount": 1,
         "bottleNBTData": {},
         "recipeTime": 200,

diff --git a/config/skyblockbuilder/starter_item.json b/config/skyblockbuilder/starter_item.json
@@ -15,6 +15,16 @@
                             "patchouli:book": "industrialforegoing:industrial_foregoing"
                         }
                     },
+                    "psi": {
+                        "id": "patchouli:guide_book",
+                        "Count": 1,
+                        "tag": {
+                            "akashictome:displayName": {
+                                "text": "EncylopaediaPsionica"
+                            },
+                            "patchouli:book": "psi:encyclopaedia_psionica"
+                        }
+                    },
                     "tconstruct": {
                         "id": "tconstruct:materials_and_you",
                         "Count": 1,