Skip to content

Commit 3d5fe4b

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents bbfc261 + 6d5d7e4 commit 3d5fe4b

File tree

144 files changed

+5358
-1118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+5358
-1118
lines changed

constants/abiphone.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,15 @@
222222
"y": 73,
223223
"z": -68
224224
},
225+
"Jake": {
226+
"requirement": [
227+
"§6- 1x Chocoberry"
228+
],
229+
"island": "farming_1",
230+
"x": 203,
231+
"y": 14,
232+
"z": -497
233+
},
225234
"Jax": {
226235
"requirement": [
227236
"§6- 10,000,000 Coins or",

constants/bestiary.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3438,6 +3438,26 @@
34383438
],
34393439
"bracket": 6
34403440
},
3441+
{
3442+
"name": "§aPraying Mantis",
3443+
"skullOwner": "e36704a8-21e6-30f2-a2d7-a197bc679485",
3444+
"texture": "ewogICJ0aW1lc3RhbXAiIDogMTc2MDQ1MDQxOTYxMiwKICAicHJvZmlsZUlkIiA6ICI0OWIzODUyNDdhMWY0NTM3YjBmN2MwZTFmMTVjMTc2NCIsCiAgInByb2ZpbGVOYW1lIiA6ICJiY2QyMDMzYzYzZWM0YmY4IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzFlMDRiYjYzNjdjYWE0ZTg4ZjVmZDBlZTgwZjA3NDVkMTM3YTYwNjAyMjNkYmJjNDJhMTY0NzFmZGY2NGJiODMiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ",
3445+
"cap": 250,
3446+
"mobs": [
3447+
"pest_praying_mantis_1"
3448+
],
3449+
"bracket": 6
3450+
},
3451+
{
3452+
"name": "§aFirefly",
3453+
"skullOwner": "e36704a8-21e6-30f2-a2d7-a197bc679485",
3454+
"texture": "ewogICJ0aW1lc3RhbXAiIDogMTc2MDQ1MDQyMjEzNiwKICAicHJvZmlsZUlkIiA6ICIzNDY4Y2VjMWFlOTY0YWRmYWQyNjEzMGEwZGQ0NjRkYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJzdXJlZWxta18iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGNlNzllOTBhZGYzNDcxOGYzMTNlYzI0ZDZjNjEzNWI2OWIzNzg4YzYxODQ5ODQ0NmNjYzgzY2E2NDBjMGIxNCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9",
3455+
"cap": 250,
3456+
"mobs": [
3457+
"pest_firefly_1"
3458+
],
3459+
"bracket": 6
3460+
},
34413461
{
34423462
"name": "§aRat",
34433463
"skullOwner": "8842a457-5e25-3ad0-958e-dfbebbb1129c",

constants/enchants.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@
201201
"turbo_carrot",
202202
"turbo_potato",
203203
"turbo_mushrooms",
204+
"turbo_rose",
205+
"turbo_moonflower",
206+
"turbo_sunflower",
204207
"cultivating",
205208
"delicate",
206209
"dedication"

constants/fairy_souls.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"//": "If you would like to contribute to this list please ensure that you: take the coordinates of the soul its self and not where you stand.",
3-
"Max Souls": 266,
3+
"Max Souls": 267,
44
"hub": [
55
"138,66,129",
66
"169,60,129",

0 commit comments

Comments
 (0)