Skip to content

Commit

Permalink
Merge pull request #2900 from AllTheMods/Staging
Browse files Browse the repository at this point in the history
Release 1.8.18
  • Loading branch information
jeremiahwinsley authored Jan 21, 2022
2 parents f8f024f + 66f2c44 commit 2d260d0
Show file tree
Hide file tree
Showing 19 changed files with 302 additions and 64 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ body:
label: Modpack Version
description: What version of the pack are you using?
options:
- 1.8.18
- 1.8.17
- 1.8.16
- 1.8.15
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/crash.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ body:
label: Modpack Version
description: What version of the pack are you using?
options:
- 1.8.18
- 1.8.17
- 1.8.16
- 1.8.15
Expand Down
51 changes: 51 additions & 0 deletions changelog/1.8.18.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
## Release 1.8.18

### Mod Additions
- configured-1.5.1-1.16.5.jar
### Mod Updates
- abnormals_core-1.16.5-3.3.1.jar
- AdditionalEnchantedMiner-1.16.5-16.1.11.jar
- appliedenergistics2-8.4.7.jar
- ars_nouveau-1.16.5-1.24.14.jar
- Bookshelf-Forge-1.16.5-10.4.31.jar
- Botania-1.16.5-420.2.jar
- cabletiers-1.16.5-0.544.jar
- CBMultipart-1.16.5-3.0.4.123-universal.jar
- cc-tweaked-1.16.5-1.100.2.jar
- cofh_core-1.16.5-1.4.1.8.jar
- ensorcellation-1.16.5-1.4.1.2.jar
- FluxNetworks-1.16.5-6.2.1.14.jar
- ftb-chunks-forge-1605.3.2-build.115.jar
- geckolib-forge-1.16.5-3.0.61.jar
- getittogetherdrops-1.16.5-v1.1.1.jar
- ImmersivePetroleum-1.16.5-3.3.0-11.jar
- jei-1.16.5-7.7.1.145.jar
- kubejs-immersive-engineering-1605.1.2-build.28.jar
- lootr-1.16.5-0.1.11.36.jar
- lostcities-1.16-4.0.11-beta.jar
- mahoutsukai-1.16.5-v1.34.0.jar
- mcjtylib-1.16-5.1.3.jar
- minecolonies-1.16.5-1.0.352-BETA.jar
- modular-routers-1.16.5-7.5.2-83.jar
- ResourcefulBees-1.16.5-0.10.4.jar
- restrictions-1.16-3.0.6.jar
- rftoolsbase-1.16-2.1.2.jar
- rftoolsbuilder-1.16-3.1.5.jar
- rftoolscontrol-1.16-4.0.14.jar
- rftoolsdim-1.16-7.0.20-beta.jar
- rftoolspower-1.16-3.0.13.jar
- rftoolsstorage-1.16-2.0.16.jar
- rftoolsutility-1.16-3.1.9.jar
- rsrequestify-1.16.5-2.1.6.jar
- simplemagnets-1.1.4-mc1.16.jar
- sophisticatedbackpacks-1.16.5-3.15.1.503.jar
- StorageDrawers-1.16.3-8.5.1.jar
- supermartijn642corelib-1.0.16-mc1.16.5.jar
- thermal_expansion-1.16.5-1.4.2.4.jar
- thermal_foundation-1.16.5-1.4.2.9.jar
- tombstone-6.6.3-1.16.5.jar
- trashcans-1.0.12-mc1.16.jar
- xnet-1.16-3.0.16.jar
### Other Changes
- Fix quest dependency for Slowfall Glyph (#2892)
- Update AllTheModium dimension quests to work around a bug that could leave them unable to be completed.
2 changes: 1 addition & 1 deletion config/allthetweaks-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
[packversionmin]
minor = 8
[packversionminrev]
minorrev = 17
minorrev = 18
59 changes: 49 additions & 10 deletions config/ftbquests/quests/chapters/allthemodium.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -1103,28 +1103,67 @@
icon: "minecraft:stone"
x: -4.5d
y: 7.0d
description: ["Besides abundant ore, Archwood can also be found in the mining dimension."]
hide_dependency_lines: false
dependencies: ["5130BBAD5C542EDB"]
id: "21AC1C7A92CAB0C2"
tasks: [{
id: "59FF7825435AF860"
type: "dimension"
dimension: "allthemodium:mining"
}]
tasks: [
{
id: "59FF7825435AF860"
type: "dimension"
dimension: "allthemodium:mining"
}
{
id: "6C4DC9DB97B8881C"
type: "item"
item: {
id: "itemfilters:or"
Count: 1b
tag: {
items: [
{
id: "ars_nouveau:blue_archwood_sapling"
Count: 1b
}
{
id: "ars_nouveau:purple_archwood_sapling"
Count: 1b
}
{
id: "ars_nouveau:red_archwood_sapling"
Count: 1b
}
{
id: "ars_nouveau:green_archwood_sapling"
Count: 1b
}
]
}
}
}
]
}
{
title: "Piglin Homeworld"
icon: "minecraft:netherrack"
x: -2.5d
y: 7.0d
description: ["Here be dragons - you can find their skeletons scattered across the landscape, or fight a live one if you're feeling brave!"]
hide_dependency_lines: false
dependencies: ["5130BBAD5C542EDB"]
id: "1A5E414C9D25703A"
tasks: [{
id: "2212DFCF11CE8D69"
type: "dimension"
dimension: "allthemodium:the_other"
}]
tasks: [
{
id: "2212DFCF11CE8D69"
type: "dimension"
dimension: "allthemodium:the_other"
}
{
id: "1D06C07E6AB15648"
type: "item"
item: "iceandfire:dragonbone"
}
]
}
{
x: -2.5d
Expand Down
22 changes: 11 additions & 11 deletions config/ftbquests/quests/chapters/ars_nouveau.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@
}]
}
{
x: 2.5d
y: -5.5d
x: 5.5d
y: -6.5d
shape: "rsquare"
dependencies: ["441C0659ED28D935"]
id: "6C4E72C0BF98E8DD"
Expand All @@ -206,10 +206,10 @@
}]
}
{
x: 5.5d
y: -6.5d
x: 1.0d
y: -9.5d
shape: "rsquare"
dependencies: ["441C0659ED28D935"]
dependencies: ["63DD7F5A4441ACE7"]
id: "295703FC5B92D0E6"
tasks: [{
id: "6A60A533BDBCCAD9"
Expand Down Expand Up @@ -254,7 +254,7 @@
}]
}
{
x: -0.5d
x: -1.0d
y: -9.5d
shape: "rsquare"
dependencies: ["63DD7F5A4441ACE7"]
Expand Down Expand Up @@ -326,7 +326,7 @@
}]
}
{
x: 5.5d
x: 5.0d
y: -5.5d
shape: "rsquare"
dependencies: ["441C0659ED28D935"]
Expand Down Expand Up @@ -423,7 +423,7 @@
}]
}
{
x: 0.5d
x: 0.0d
y: -9.5d
shape: "rsquare"
dependencies: ["63DD7F5A4441ACE7"]
Expand Down Expand Up @@ -748,7 +748,7 @@
}]
}
{
x: 4.5d
x: 4.0d
y: -5.5d
shape: "rsquare"
dependencies: ["441C0659ED28D935"]
Expand All @@ -772,7 +772,7 @@
}]
}
{
x: 3.5d
x: 3.0d
y: -5.5d
shape: "rsquare"
dependencies: ["441C0659ED28D935"]
Expand Down Expand Up @@ -1131,7 +1131,7 @@
}]
}
{
x: 6.5d
x: 6.0d
y: -5.5d
shape: "rsquare"
dependencies: ["441C0659ED28D935"]
Expand Down
46 changes: 46 additions & 0 deletions config/resourcefulbees/bees/RBeeDev/Kitten.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"beeVersion": 0.10,
"flower": "tag:minecraft:beds",
"baseLayerTexture": "kitten/bee",
"creator": "Dawn Felstar",
"lore": "Cute little baby kitten bee.",
"loreColor": "rainbow",
"traits": [
"kitten"
],
"customCombDrop": "resourcefulbees:catnip_honeycomb",
"customCombBlockDrop": "resourcefulbees:catnip_honeycomb_block",
"sizeModifier": 0.75,
"maxTimeInHive": 500,
"hasHoneycomb": true,
"ColorData": {
"isBeeColored": false,
"modelType": "KITTEN",
"primaryColor": "#EAA939",
"secondaryColor": "#4C483B"
},
"CentrifugeData": {
"hasCentrifugeOutput": true,
"mainOutput": "minecraft:cat_spawn_egg",
"mainOutputWeight": 0.01,
"bottleOutput": "resourcefulbees:catnip_honey_bottle",
"bottleOutputWeight": 0.1
},
"CombatData": {
"isPassive": false,
"attackDamage": 0,
"baseHealth": 20,
"removeStingerOnAttack": false
},
"SpawnData": {
"canSpawnInWorld": true,
"spawnWeight": 3,
"biomeWhitelist": "tag:rare",
"lightLevel": "DAY",
"minGroupSize": 1,
"maxGroupSize": 1
},
"TraitData": {
"hasTraits": true
}
}
44 changes: 44 additions & 0 deletions config/resourcefulbees/bees/RBeeDev/Oreo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"beeVersion": 0.10,
"flower": "ALL",
"baseLayerTexture": "oreo/oreo_bee",
"creator": "Epic Oreo",
"lore": "A Delicious Bee",
"loreColor": "rainbow",
"traits": [
"oreo"
],
"apiaryOutputAmounts": [
1,
2,
3,
4
],
"customCombDrop": "resourcefulbees:oreo_cookie",
"customCombBlockDrop": "resourcefulbees:oreo_cookie",
"sizeModifier": 1.5,
"maxTimeInHive": 6000,
"hasHoneycomb": true,
"ColorData": {
"isBeeColored": false,
"primaryColor": "#442920",
"secondaryColor": "#e1d9b8"
},
"CombatData": {
"isPassive": false,
"attackDamage": 0,
"baseHealth": 20,
"removeStingerOnAttack": false
},
"SpawnData": {
"canSpawnInWorld": true,
"spawnWeight": 3,
"biomeWhitelist": "tag:rare",
"lightLevel": "DAY",
"minGroupSize": 1,
"maxGroupSize": 1
},
"TraitData": {
"hasTraits": true
}
}
Original file line number Diff line number Diff line change
@@ -1,43 +1,48 @@
{
"beeVersion": 0.10,
"flower": "allthecompressed:atm_star_block",
"maxTimeInHive": 1200,
"traits": [
"starry"
],
"creator": "Lady Lexxie",
"lore": "Reach for the stars!",
"loreColor": "rainbow",
"sizeModifier": 1.25,
"hasHoneycomb": true,
"apiaryOutputAmounts": [
1,
1,
1,
1,
1
],
"apiaryOutputTypes": [
"COMB",
"COMB",
"COMB",
"COMB",
"COMB"
],
"baseLayerTexture": "special/starry_bee_primary_layer",
"baseLayerTexture": "empty_layer",
"ColorData": {
"primaryColor": "#FFA500",
"isBeeColored": true,
"primaryColor": "#FFFFFF",
"secondaryColor": "#FFA500",
"honeycombColor": "#FFA500",
"primaryLayerTexture": "empty_layer",
"secondaryLayerTexture": "special/starry_bee_secondary_layer",
"emissiveLayerTexture": "special/starry_bee_emissive",
"isBeeColored": true,
"primaryLayerTexture": "starry/starry_bee_primary_layer",
"secondaryLayerTexture": "empty_layer",
"emissiveLayerTexture": "starry/starry_bee_emissive",
"isGlowing": true,
"glowColor": "#FFA500",
"glowingPulse": 1,
"modelType": "QUEEN"
},
"CombatData": {
"isInvulnerable": true,
"isPassive": false,
"removeStingerOnAttack": false,
"inflictsPoison": false,
"attackDamage": 10
"baseHealth": 20,
"attackDamage": 0
},
"MutationData": {
"hasMutation": true,
Expand Down Expand Up @@ -83,4 +88,4 @@
"TraitData": {
"hasTraits": true
}
}
}
Loading

0 comments on commit 2d260d0

Please sign in to comment.