Merge remote-tracking branch 'upstream/master' into master

This commit is contained in:
ThatGamerBlue
2021-04-14 13:20:19 +01:00
24 changed files with 612 additions and 129 deletions

View File

@@ -1413,12 +1413,14 @@
"coal bag": [
764,
12019,
24480
24480,
25627
],
"gem bag": [
766,
12020,
24481
24481,
25628
],
"phoenix crossbow": [
767,
@@ -7769,6 +7771,10 @@
12851,
12853
],
"flamtaer bag": [
12854,
25630
],
"thanksgiving dinner": [
12861,
12862
@@ -9583,6 +9589,10 @@
24824,
24840
],
"plank sack": [
24882,
25629
],
"oak table": [
24887,
24891,
@@ -9739,5 +9749,26 @@
"fish sack barrel": [
25585,
25587
],
"barronite mace": [
25625,
25641,
25643
],
"imcando hammer": [
25633,
25644
],
"simple lockbox": [
25646,
25647
],
"elaborate lockbox": [
25648,
25649
],
"ornate lockbox": [
25650,
25651
]
}