Skip to content

Commit

Permalink
Merge pull request EnigmaticaModpacks#5424 from MuteTiefling/develop
Browse files Browse the repository at this point in the history
scoria
  • Loading branch information
MuteTiefling authored Nov 16, 2023
2 parents fc9feaa + 046a97d commit 7ec0a98
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
### Enigmatica 6 & Enigmatica 6: Expert v1.8.0

**Improvements**

- Natural Scoria may now be crafted. Builders rejoice! [\#5349](https://github.com/EnigmaticaModpacks/Enigmatica6/issues/5349)

**Bug fixes**

- Fixed some typos in Ars Nouveau and Tinker's quests [\#5422](https://github.com/EnigmaticaModpacks/Enigmatica6/issues/5422)
Expand Down
2 changes: 1 addition & 1 deletion config/cobblegenrandomizer-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
# ["cobblestone", "minecraft:diamond_block", ["minecraft:diamond_block"]],
# ["cobblestone", "minecraft:dirt", ["forge:dirt"]],
# ["cobblestone", "minecraft:white_wool", ["minecraft:wool"]]]
custom_generators = [["cobblestone", "minecraft:iron_block", ["enigmatica:cobbleworks/cobblestone"]], ["cobblestone", "undergarden:tremblecrust", ["undergarden:tremblecrust"]], ["cobblestone", "byg:dacite_cobblestone", ["byg:dacite_cobblestone"]], ["cobblestone", "byg:ether_stone", ["byg:ether_stone"]], ["cobblestone", "byg:purpur_stone", ["byg:purpur_stone"]], ["cobblestone", "byg:red_rock", ["byg:red_rock"]], ["cobblestone", "byg:scoria_cobblestone", ["byg:scoria_cobblestone"]], ["cobblestone", "byg:soapstone", ["byg:soapstone"]], ["cobblestone", "create:andesite_cobblestone", ["create:andesite_cobblestone"]], ["cobblestone", "create:diorite_cobblestone", ["create:diorite_cobblestone"]], ["cobblestone", "create:granite_cobblestone", ["create:granite_cobblestone"]], ["cobblestone", "quark:cobbedstone", ["quark:cobbedstone"]], ["cobblestone", "undergarden:depthrock", ["undergarden:depthrock"]], ["cobblestone", "undergarden:shiverstone", ["undergarden:shiverstone"]], ["cobblestone", "create:dark_scoria_cobblestone", ["create:dark_scoria_cobblestone"]], ["cobblestone", "create:scoria_cobblestone", ["create:scoria_cobblestone"]], ["cobblestone", "create:gabbro_cobblestone", ["create:gabbro_cobblestone"]], ["cobblestone", "create:dolomite_cobblestone", ["create:dolomite_cobblestone"]], ["cobblestone", "create:weathered_limestone_cobblestone", ["create:weathered_limestone_cobblestone"]], ["cobblestone", "create:limestone_cobblestone", ["create:limestone_cobblestone"]], ["cobblestone", "atmospheric:saffron_travertine", ["atmospheric:saffron_travertine"]], ["cobblestone", "atmospheric:persimmon_travertine", ["atmospheric:persimmon_travertine"]], ["cobblestone", "atmospheric:peach_travertine", ["atmospheric:peach_travertine"]], ["cobblestone", "atmospheric:ivory_travertine", ["atmospheric:ivory_travertine"]], ["cobblestone", "quark:cobbled_deepslate", ["quark:cobbled_deepslate"]], ["cobblestone", "byg:travertine", ["byg:travertine"]], ["cobblestone", "minecraft:blackstone", ["minecraft:blackstone"]], ["cobblestone", "atum:limestone_cracked", ["atum:limestone_cracked"]], ["stone", "minecraft:diamond_block", ["enigmatica:cobbleworks/stone"]], ["stone", "minecraft:andesite", ["minecraft:andesite"]], ["stone", "minecraft:diorite", ["minecraft:diorite"]], ["stone", "minecraft:granite", ["minecraft:granite"]], ["stone", "betterendforge:flavolite", ["betterendforge:flavolite"]], ["stone", "betterendforge:violecite", ["betterendforge:violecite"]], ["stone", "byg:black_sandstone", ["byg:black_sandstone"]], ["stone", "byg:blue_sandstone", ["byg:blue_sandstone"]], ["stone", "byg:dacite", ["byg:dacite"]], ["stone", "byg:purple_sandstone", ["byg:purple_sandstone"]], ["stone", "byg:pink_sandstone", ["byg:pink_sandstone"]], ["stone", "byg:scoria_stone", ["byg:scoria_stone"]], ["stone", "byg:white_sandstone", ["byg:white_sandstone"]], ["stone", "minecraft:red_sandstone", ["minecraft:red_sandstone"]], ["stone", "minecraft:sandstone", ["minecraft:sandstone"]], ["stone", "quark:basalt", ["quark:basalt"]], ["stone", "quark:brimstone", ["quark:brimstone"]], ["stone", "quark:jasper", ["quark:jasper"]], ["stone", "quark:limestone", ["quark:limestone"]], ["stone", "quark:marble", ["quark:marble"]], ["stone", "quark:permafrost", ["quark:permafrost"]], ["stone", "quark:slate", ["quark:slate"]], ["stone", "astralsorcery:marble_raw", ["astralsorcery:marble_raw"]], ["stone", "create:dark_scoria", ["create:dark_scoria"]], ["stone", "create:scoria", ["create:scoria"]], ["stone", "create:gabbro", ["create:gabbro"]], ["stone", "create:dolomite", ["create:dolomite"]], ["stone", "create:weathered_limestone", ["create:weathered_limestone"]], ["stone", "create:limestone", ["create:limestone"]], ["stone", "atmospheric:red_arid_sandstone", ["atmospheric:red_arid_sandstone"]], ["stone", "atmospheric:arid_sandstone", ["atmospheric:arid_sandstone"]], ["stone", "betterendforge:sulphuric_rock", ["betterendforge:sulphuric_rock"]], ["stone", "quark:deepslate", ["quark:deepslate"]], ["stone", "atum:alabaster", ["atum:alabaster"]], ["stone", "atum:porphyry", ["atum:porphyry"]], ["stone", "quark:myalite", ["quark:myalite"]], ["stone", "quark:dusky_myalite", ["quark:dusky_myalite"]]]
custom_generators = [["cobblestone", "atmospheric:ivory_travertine", ["atmospheric:ivory_travertine"]], ["cobblestone", "atmospheric:peach_travertine", ["atmospheric:peach_travertine"]], ["cobblestone", "atmospheric:persimmon_travertine", ["atmospheric:persimmon_travertine"]], ["cobblestone", "atmospheric:saffron_travertine", ["atmospheric:saffron_travertine"]], ["cobblestone", "atum:limestone_cracked", ["atum:limestone_cracked"]], ["cobblestone", "byg:dacite_cobblestone", ["byg:dacite_cobblestone"]], ["cobblestone", "byg:ether_stone", ["byg:ether_stone"]], ["cobblestone", "byg:purpur_stone", ["byg:purpur_stone"]], ["cobblestone", "byg:red_rock", ["byg:red_rock"]], ["cobblestone", "byg:scoria_cobblestone", ["byg:scoria_cobblestone"]], ["cobblestone", "byg:soapstone", ["byg:soapstone"]], ["cobblestone", "byg:travertine", ["byg:travertine"]], ["cobblestone", "create:andesite_cobblestone", ["create:andesite_cobblestone"]], ["cobblestone", "create:dark_scoria_cobblestone", ["create:dark_scoria_cobblestone"]], ["cobblestone", "create:diorite_cobblestone", ["create:diorite_cobblestone"]], ["cobblestone", "create:dolomite_cobblestone", ["create:dolomite_cobblestone"]], ["cobblestone", "create:gabbro_cobblestone", ["create:gabbro_cobblestone"]], ["cobblestone", "create:granite_cobblestone", ["create:granite_cobblestone"]], ["cobblestone", "create:limestone_cobblestone", ["create:limestone_cobblestone"]], ["cobblestone", "create:scoria_cobblestone", ["create:scoria_cobblestone"]], ["cobblestone", "create:weathered_limestone_cobblestone", ["create:weathered_limestone_cobblestone"]], ["cobblestone", "minecraft:blackstone", ["minecraft:blackstone"]], ["cobblestone", "minecraft:iron_block", ["enigmatica:cobbleworks/cobblestone"]], ["cobblestone", "quark:cobbedstone", ["quark:cobbedstone"]], ["cobblestone", "quark:cobbled_deepslate", ["quark:cobbled_deepslate"]], ["cobblestone", "undergarden:depthrock", ["undergarden:depthrock"]], ["cobblestone", "undergarden:shiverstone", ["undergarden:shiverstone"]], ["cobblestone", "undergarden:tremblecrust", ["undergarden:tremblecrust"]], ["stone", "astralsorcery:marble_raw", ["astralsorcery:marble_raw"]], ["stone", "atmospheric:arid_sandstone", ["atmospheric:arid_sandstone"]], ["stone", "atmospheric:red_arid_sandstone", ["atmospheric:red_arid_sandstone"]], ["stone", "atum:alabaster", ["atum:alabaster"]], ["stone", "atum:porphyry", ["atum:porphyry"]], ["stone", "betterendforge:flavolite", ["betterendforge:flavolite"]], ["stone", "betterendforge:sulphuric_rock", ["betterendforge:sulphuric_rock"]], ["stone", "betterendforge:violecite", ["betterendforge:violecite"]], ["stone", "byg:black_sandstone", ["byg:black_sandstone"]], ["stone", "byg:blue_sandstone", ["byg:blue_sandstone"]], ["stone", "byg:dacite", ["byg:dacite"]], ["stone", "byg:pink_sandstone", ["byg:pink_sandstone"]], ["stone", "byg:purple_sandstone", ["byg:purple_sandstone"]], ["stone", "byg:scoria_stone", ["byg:scoria_stone"]], ["stone", "byg:white_sandstone", ["byg:white_sandstone"]], ["stone", "create:dark_scoria", ["create:dark_scoria"]], ["stone", "create:dolomite", ["create:dolomite"]], ["stone", "create:gabbro", ["create:gabbro"]], ["stone", "create:limestone", ["create:limestone"]], ["stone", "create:natural_scoria", ["create:natural_scoria"]], ["stone", "create:scoria", ["create:scoria"]], ["stone", "create:weathered_limestone", ["create:weathered_limestone"]], ["stone", "minecraft:andesite", ["minecraft:andesite"]], ["stone", "minecraft:diamond_block", ["enigmatica:cobbleworks/stone"]], ["stone", "minecraft:diorite", ["minecraft:diorite"]], ["stone", "minecraft:granite", ["minecraft:granite"]], ["stone", "minecraft:red_sandstone", ["minecraft:red_sandstone"]], ["stone", "minecraft:sandstone", ["minecraft:sandstone"]], ["stone", "quark:basalt", ["quark:basalt"]], ["stone", "quark:brimstone", ["quark:brimstone"]], ["stone", "quark:deepslate", ["quark:deepslate"]], ["stone", "quark:dusky_myalite", ["quark:dusky_myalite"]], ["stone", "quark:jasper", ["quark:jasper"]], ["stone", "quark:limestone", ["quark:limestone"]], ["stone", "quark:marble", ["quark:marble"]], ["stone", "quark:myalite", ["quark:myalite"]], ["stone", "quark:permafrost", ["quark:permafrost"]], ["stone", "quark:slate", ["quark:slate"]]]

Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ const generatableStone = [
'astralsorcery:marble_raw',
'create:dark_scoria',
'create:scoria',
'create:natural_scoria',
'create:gabbro',
'create:dolomite',
'create:weathered_limestone',
Expand Down

0 comments on commit 7ec0a98

Please sign in to comment.