Skip to content

Commit 516fbf6

Browse files
whatthedrunkwhatthedrunk
authored
Merge pull request #2074 from AllTheMods/Staging
Staging 1.7.6
2 parents 683552b + d7429b0 commit 516fbf6

21 files changed

+112
-174
lines changed

‎config/allthetweaks-common.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
[packversionminrev]
2222
#Pack Minor Version Revision : X
2323
#Range: 0 ~ 32768
24-
minorrev = 3
24+
minorrev = 6
2525

‎config/incontrol/spawn.json

Lines changed: 30 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,62 @@
11
[
22
{
33
"dimension": "rats:ratlantis",
4-
"mob": "iceandfire:sea_serpent",
4+
"mob": [
5+
"iceandfire:siren",
6+
"iceandfire:sea_serpent",
7+
"iceandfire:hippocampus"
8+
],
59
"mincount": {
610
"amount": 10,
7-
"hostile": true,
811
"perplayer": true
912
},
1013
"result": "deny"
1114
},
1215
{
1316
"dimension": "twilightforest:twilightforest",
14-
"mob": "iceandfire:siren",
17+
"mob": [
18+
"iceandfire:siren",
19+
"iceandfire:sea_serpent",
20+
"iceandfire:hippocampus"
21+
],
1522
"mincount": {
1623
"amount": 10,
17-
"hostile": true,
18-
"perplayer": true
19-
},
20-
"result": "deny"
21-
},
22-
{
23-
"dimension": "twilightforest:twilightforest",
24-
"mob": "iceandfire:sea_serpent",
25-
"mincount": {
26-
"amount": 10,
27-
"hostile": true,
28-
"perplayer": true
29-
},
30-
"result": "deny"
31-
},
32-
{
33-
"dimension": "allthemodium:the_other",
34-
"mob": "iceandfire:hydra",
35-
"mincount": {
36-
"amount": 10,
37-
"hostile": true,
38-
"perplayer": true
39-
},
40-
"result": "deny"
41-
},
42-
{
43-
"dimension": "allthemodium:the_other",
44-
"mob": "iceandfire:ghost",
45-
"mincount": {
46-
"amount": 10,
47-
"hostile": true,
48-
"perplayer": true
49-
},
50-
"result": "deny"
51-
},
52-
{
53-
"dimension": "allthemodium:the_other",
54-
"mob": "iceandfire:dread_knight",
55-
"mincount": {
56-
"amount": 10,
57-
"hostile": true,
58-
"perplayer": true
59-
},
60-
"result": "deny"
61-
},
62-
{
63-
"dimension": "allthemodium:the_other",
64-
"mob": "iceandfire:dread_ghoul",
65-
"mincount": {
66-
"amount": 10,
67-
"hostile": true,
68-
"perplayer": true
69-
},
70-
"result": "deny"
71-
},
72-
{
73-
"dimension": "allthemodium:the_other",
74-
"mob": "iceandfire:dread_thrall",
75-
"mincount": {
76-
"amount": 10,
77-
"hostile": true,
7824
"perplayer": true
7925
},
8026
"result": "deny"
8127
},
8228
{
8329
"dimension": "allthemodium:the_other",
84-
"mob": "iceandfire:dread_horse",
30+
"mob": [
31+
"iceandfire:hydra",
32+
"iceandfire:ghost",
33+
"iceandfire:dread_scuttler",
34+
"iceandfire:dread_beast",
35+
"iceandfire:dread_horse",
36+
"iceandfire:dread_thrall",
37+
"iceandfire:dread_ghoul",
38+
"iceandfire:dread_knight"
39+
],
8540
"mincount": {
8641
"amount": 10,
87-
"hostile": true,
8842
"perplayer": true
8943
},
9044
"result": "deny"
9145
},
9246
{
93-
"dimension": "allthemodium:the_other",
94-
"mob": "iceandfire:dread_beast",
95-
"mincount": {
96-
"amount": 10,
97-
"hostile": true,
98-
"perplayer": true
99-
},
47+
"dimension": "rats:ratlantis",
48+
"mod": [
49+
"ars_nouveau",
50+
"mana-and-artifice"
51+
],
10052
"result": "deny"
10153
},
10254
{
103-
"dimension": "allthemodium:the_other",
104-
"mob": "iceandfire:dread_scuttler",
105-
"mincount": {
106-
"amount": 10,
107-
"hostile": true,
108-
"perplayer": true
109-
},
55+
"dimension": "twilightforest:twilightforest",
56+
"mod": [
57+
"ars_nouveau",
58+
"mana-and-artifice"
59+
],
11060
"result": "deny"
11161
}
11262
]

‎config/resourcefulbees/bees/natural/bees_misc/Icey.json

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
"maxTimeInHive": 1200,
44
"traits": [],
55
"hasHoneycomb": true,
6-
"baseLayerTexture": "/custom/bee",
6+
"baseLayerTexture": "misc/icy_bee",
77
"ColorData": {
8-
"primaryColor": "#86aefd",
9-
"secondaryColor": "#86aefd",
10-
"honeycombColor": "#86aefd",
11-
"primaryLayerTexture": "/custom/primary_layer",
12-
"secondaryLayerTexture": "/custom/secondary_layer",
8+
"primaryColor": "#6B88C0",
9+
"secondaryColor": "#6B88C0",
10+
"honeycombColor": "#6B88C0",
11+
"primaryLayerTexture": "empty_layer",
12+
"secondaryLayerTexture": "empty_layer",
1313
"emissiveLayerTexture": "empty_layer",
14-
"isBeeColored": true,
14+
"isBeeColored": false,
1515
"isRainbowBee": false,
1616
"isGlowing": false,
17-
"glowColor": "#86aefd",
17+
"glowColor": "#6B88C0",
1818
"isEnchanted": false,
1919
"glowingPulse": 0,
20-
"modelType": "default"
20+
"modelType": "GELATINOUS"
2121
},
2222
"CombatData": {
2323
"isPassive": true,
@@ -32,14 +32,12 @@
3232
"type": "BLOCK_TO_ITEM",
3333
"inputID": "resourcefulbees:icey_honeycomb_block",
3434
"outputs": [{
35-
"outputID": "minecraft:ice",
36-
"weight": 80
37-
},
38-
{
39-
"outputID": "resourcefulbees:icey_bee_spawn_egg",
40-
"weight": 20
41-
}
42-
]
35+
"outputID": "minecraft:ice",
36+
"weight": 80
37+
}, {
38+
"outputID": "resourcefulbees:icey_bee_spawn_egg",
39+
"weight": 20
40+
}]
4341
}]
4442
},
4543
"CentrifugeData": {
@@ -85,4 +83,4 @@
8583
"TraitData": {
8684
"hasTraits": false
8785
}
88-
}
86+
}

‎config/resourcefulbees/bees/natural/bees_misc/Lumber.json

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
"maxTimeInHive": 1200,
44
"traits": [],
55
"hasHoneycomb": true,
6-
"baseLayerTexture": "/custom/bee",
6+
"baseLayerTexture": "misc/lumber_bee",
77
"ColorData": {
88
"primaryColor": "#453B2A",
99
"secondaryColor": "#453B2A",
1010
"honeycombColor": "#453B2A",
11-
"primaryLayerTexture": "/custom/primary_layer",
12-
"secondaryLayerTexture": "/custom/secondary_layer",
11+
"primaryLayerTexture": "empty_layer",
12+
"secondaryLayerTexture": "empty_layer",
1313
"emissiveLayerTexture": "empty_layer",
14-
"isBeeColored": true,
14+
"isBeeColored": false,
1515
"isRainbowBee": false,
1616
"isGlowing": false,
1717
"glowColor": "#453B2A",
1818
"isEnchanted": false,
1919
"glowingPulse": 0,
20-
"modelType": "default"
20+
"modelType": "MUSHROOM"
2121
},
2222
"CombatData": {
2323
"isPassive": true,
@@ -32,14 +32,12 @@
3232
"type": "BLOCK_TO_ITEM",
3333
"inputID": "resourcefulbees:lumber_honeycomb_block",
3434
"outputs": [{
35-
"outputID": "mysticalagriculture:wood_essence",
36-
"weight": 80
37-
},
38-
{
39-
"outputID": "resourcefulbees:lumber_bee_spawn_egg",
40-
"weight": 20
41-
}
42-
]
35+
"outputID": "mysticalagriculture:wood_essence",
36+
"weight": 80
37+
}, {
38+
"outputID": "resourcefulbees:lumber_bee_spawn_egg",
39+
"weight": 20
40+
}]
4341
}]
4442
},
4543
"CentrifugeData": {
@@ -85,4 +83,4 @@
8583
"TraitData": {
8684
"hasTraits": false
8785
}
88-
}
86+
}

‎config/resourcefulbees/bees/natural/bees_misc/Mystical.json

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
"maxTimeInHive": 1200,
44
"traits": [],
55
"hasHoneycomb": true,
6-
"baseLayerTexture": "/custom/bee",
6+
"baseLayerTexture": "misc/mystical_bee",
77
"ColorData": {
88
"primaryColor": "#5cea30",
99
"secondaryColor": "#79ef50",
1010
"honeycombColor": "#5cea30",
11-
"primaryLayerTexture": "/custom/primary_layer",
12-
"secondaryLayerTexture": "/custom/secondary_layer",
13-
"emissiveLayerTexture": "empty_layer",
11+
"primaryLayerTexture": "misc/mystical_rainbow_bee",
12+
"secondaryLayerTexture": "empty_layer",
13+
"emissiveLayerTexture": "misc/mystical_rainbow_bee",
1414
"isBeeColored": true,
15-
"isRainbowBee": false,
15+
"isRainbowBee": true,
1616
"isGlowing": false,
1717
"glowColor": "#5cea30",
1818
"isEnchanted": false,
1919
"glowingPulse": 0,
20-
"modelType": "default"
20+
"modelType": "MUSHROOM"
2121
},
2222
"CombatData": {
2323
"isPassive": true,
@@ -32,14 +32,12 @@
3232
"type": "BLOCK_TO_ITEM",
3333
"inputID": "resourcefulbees:mystical_honeycomb_block",
3434
"outputs": [{
35-
"outputID": "resourcefulbees:mystical_honeycomb",
36-
"weight": 80
37-
},
38-
{
39-
"outputID": "resourcefulbees:mystical_bee_spawn_egg",
40-
"weight": 20
41-
}
42-
]
35+
"outputID": "resourcefulbees:mystical_honeycomb",
36+
"weight": 80
37+
}, {
38+
"outputID": "resourcefulbees:mystical_bee_spawn_egg",
39+
"weight": 20
40+
}]
4341
}]
4442
},
4543
"CentrifugeData": {
@@ -85,4 +83,4 @@
8583
"TraitData": {
8684
"hasTraits": false
8785
}
88-
}
86+
}

‎config/resourcefulbees/bees/natural/bees_misc/Sandy.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"glowColor": "#DDD2B7",
1818
"isEnchanted": false,
1919
"glowingPulse": 0,
20-
"modelType": "default"
20+
"modelType": "MUSHROOM"
2121
},
2222
"CombatData": {
2323
"isPassive": true,
@@ -32,14 +32,12 @@
3232
"type": "BLOCK_TO_ITEM",
3333
"inputID": "resourcefulbees:sandy_honeycomb_block",
3434
"outputs": [{
35-
"outputID": "minecraft:sand",
36-
"weight": 80
37-
},
38-
{
39-
"outputID": "resourcefulbees:sandy_bee_spawn_egg",
40-
"weight": 20
41-
}
42-
]
35+
"outputID": "minecraft:sand",
36+
"weight": 80
37+
}, {
38+
"outputID": "resourcefulbees:sandy_bee_spawn_egg",
39+
"weight": 20
40+
}]
4341
}]
4442
},
4543
"CentrifugeData": {
@@ -85,4 +83,4 @@
8583
"TraitData": {
8684
"hasTraits": false
8785
}
88-
}
86+
}

0 commit comments

Comments
 (0)