aboutsummaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/misc.json3
-rw-r--r--constants/parents.json45
2 files changed, 33 insertions, 15 deletions
diff --git a/constants/misc.json b/constants/misc.json
index af8ec3d2..92dc5a7c 100644
--- a/constants/misc.json
+++ b/constants/misc.json
@@ -989,6 +989,9 @@
],
"PERSONAL_DELETOR_6000": [
"PERSONAL_DELETOR_7000"
+ ],
+ "BAIT_RING": [
+ "SPIKED_ATROCITY"
]
},
diff --git a/constants/parents.json b/constants/parents.json
index 5d21fe54..9a63f48d 100644
--- a/constants/parents.json
+++ b/constants/parents.json
@@ -1468,7 +1468,8 @@
"WHEAT_GENERATOR_8",
"WHEAT_GENERATOR_9",
"WHEAT_GENERATOR_10",
- "WHEAT_GENERATOR_11"
+ "WHEAT_GENERATOR_11",
+ "WHEAT_GENERATOR_12"
],
"MELON_GENERATOR_1":[
"MELON_GENERATOR_2",
@@ -1480,7 +1481,8 @@
"MELON_GENERATOR_8",
"MELON_GENERATOR_9",
"MELON_GENERATOR_10",
- "MELON_GENERATOR_11"
+ "MELON_GENERATOR_11",
+ "MELON_GENERATOR_12"
],
"PUMPKIN_GENERATOR_1":[
"PUMPKIN_GENERATOR_2",
@@ -1492,7 +1494,8 @@
"PUMPKIN_GENERATOR_8",
"PUMPKIN_GENERATOR_9",
"PUMPKIN_GENERATOR_10",
- "PUMPKIN_GENERATOR_11"
+ "PUMPKIN_GENERATOR_11",
+ "PUMPKIN_GENERATOR_12"
],
"CARROT_GENERATOR_1":[
"CARROT_GENERATOR_2",
@@ -1504,7 +1507,8 @@
"CARROT_GENERATOR_8",
"CARROT_GENERATOR_9",
"CARROT_GENERATOR_10",
- "CARROT_GENERATOR_11"
+ "CARROT_GENERATOR_11",
+ "CARROT_GENERATOR_12"
],
"POTATO_GENERATOR_1":[
"POTATO_GENERATOR_2",
@@ -1516,7 +1520,8 @@
"POTATO_GENERATOR_8",
"POTATO_GENERATOR_9",
"POTATO_GENERATOR_10",
- "POTATO_GENERATOR_11"
+ "POTATO_GENERATOR_11",
+ "POTATO_GENERATOR_12"
],
"MUSHROOM_GENERATOR_1":[
"MUSHROOM_GENERATOR_2",
@@ -1528,7 +1533,8 @@
"MUSHROOM_GENERATOR_8",
"MUSHROOM_GENERATOR_9",
"MUSHROOM_GENERATOR_10",
- "MUSHROOM_GENERATOR_11"
+ "MUSHROOM_GENERATOR_11",
+ "MUSHROOM_GENERATOR_12"
],
"CACTUS_GENERATOR_1":[
"CACTUS_GENERATOR_2",
@@ -1540,7 +1546,8 @@
"CACTUS_GENERATOR_8",
"CACTUS_GENERATOR_9",
"CACTUS_GENERATOR_10",
- "CACTUS_GENERATOR_11"
+ "CACTUS_GENERATOR_11",
+ "CACTUS_GENERATOR_12"
],
"COCOA_GENERATOR_1":[
"COCOA_GENERATOR_2",
@@ -1552,7 +1559,8 @@
"COCOA_GENERATOR_8",
"COCOA_GENERATOR_9",
"COCOA_GENERATOR_10",
- "COCOA_GENERATOR_11"
+ "COCOA_GENERATOR_11",
+ "COCOA_GENERATOR_12"
],
"SUGAR_CANE_GENERATOR_1":[
"SUGAR_CANE_GENERATOR_2",
@@ -1564,7 +1572,8 @@
"SUGAR_CANE_GENERATOR_8",
"SUGAR_CANE_GENERATOR_9",
"SUGAR_CANE_GENERATOR_10",
- "SUGAR_CANE_GENERATOR_11"
+ "SUGAR_CANE_GENERATOR_11",
+ "SUGAR_CANE_GENERATOR_12"
],
"NETHER_WARTS_GENERATOR_1":[
"NETHER_WARTS_GENERATOR_2",
@@ -1576,7 +1585,8 @@
"NETHER_WARTS_GENERATOR_8",
"NETHER_WARTS_GENERATOR_9",
"NETHER_WARTS_GENERATOR_10",
- "NETHER_WARTS_GENERATOR_11"
+ "NETHER_WARTS_GENERATOR_11",
+ "NETHER_WARTS_GENERATOR_12"
],
"FLOWER_GENERATOR_1":[
"FLOWER_GENERATOR_2",
@@ -1757,7 +1767,8 @@
"COW_GENERATOR_8",
"COW_GENERATOR_9",
"COW_GENERATOR_10",
- "COW_GENERATOR_11"
+ "COW_GENERATOR_11",
+ "COW_GENERATOR_12"
],
"PIG_GENERATOR_1":[
"PIG_GENERATOR_2",
@@ -1769,7 +1780,8 @@
"PIG_GENERATOR_8",
"PIG_GENERATOR_9",
"PIG_GENERATOR_10",
- "PIG_GENERATOR_11"
+ "PIG_GENERATOR_11",
+ "PIG_GENERATOR_12"
],
"CHICKEN_GENERATOR_1":[
"CHICKEN_GENERATOR_2",
@@ -1781,7 +1793,8 @@
"CHICKEN_GENERATOR_8",
"CHICKEN_GENERATOR_9",
"CHICKEN_GENERATOR_10",
- "CHICKEN_GENERATOR_11"
+ "CHICKEN_GENERATOR_11",
+ "CHICKEN_GENERATOR_12"
],
"SHEEP_GENERATOR_1":[
"SHEEP_GENERATOR_2",
@@ -1793,7 +1806,8 @@
"SHEEP_GENERATOR_8",
"SHEEP_GENERATOR_9",
"SHEEP_GENERATOR_10",
- "SHEEP_GENERATOR_11"
+ "SHEEP_GENERATOR_11",
+ "SHEEP_GENERATOR_12"
],
"RABBIT_GENERATOR_1":[
"RABBIT_GENERATOR_2",
@@ -1805,7 +1819,8 @@
"RABBIT_GENERATOR_8",
"RABBIT_GENERATOR_9",
"RABBIT_GENERATOR_10",
- "RABBIT_GENERATOR_11"
+ "RABBIT_GENERATOR_11",
+ "RABBIT_GENERATOR_12"
],
"OAK_GENERATOR_1":[
"OAK_GENERATOR_2",