Merge branch 'develop'

EnigmaticaModpacks · Dec 8, 2024 · 8cf6e0e · 8cf6e0e
2 parents cf958ec + 2d18816
commit 8cf6e0e
Show file tree

Hide file tree

Showing 26 changed files with 922 additions and 708 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,28 @@
+### Enigmatica 10 1.14.2
+
+NeoForge-1.21.1-21.1.83 | [Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica10/blob/master/changelogs/changelog_mods_1.14.2.md) | [Modlist](https://github.com/EnigmaticaModpacks/Enigmatica10/blob/master/changelogs/modlist_1.14.2.md)
+
+#### ⭐ Improvements
+
+-   Unify many crushing recipes across mods [(\#278)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/278)
+-   Add support for Aether stones to Cobblegen Galore [(\#278)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/278)
+-   Add support for new AE processors in PNC, MI, and Oritech [(\#278)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/278)
+
+#### 🦟 Bugs Fixed
+
+- Performance issue with showing Journeymap, fixed by Journeymap
+
+
+---
+
 ### Enigmatica 10 1.14.1
 
 NeoForge-1.21.1-21.1.83 | [Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica10/blob/master/changelogs/changelog_mods_1.14.1.md) | [Modlist](https://github.com/EnigmaticaModpacks/Enigmatica10/blob/master/changelogs/modlist_1.14.1.md)
 
 #### ✔️ Added Mods
 
-* [JourneyMap Integration](https://www.curseforge.com/minecraft/mc-mods/journeymap-integration) (by [frankV](https://www.curseforge.com/members/frankV/projects))
-* [Lithium (Fabric/NeoForge)](https://www.curseforge.com/minecraft/mc-mods/lithium) (by [JellySquid](https://www.curseforge.com/members/JellySquid/projects))
+-   [JourneyMap Integration](https://www.curseforge.com/minecraft/mc-mods/journeymap-integration) (by [frankV](https://www.curseforge.com/members/frankV/projects))
+-   [Lithium (Fabric/NeoForge)](https://www.curseforge.com/minecraft/mc-mods/lithium) (by [JellySquid](https://www.curseforge.com/members/JellySquid/projects))
 
 #### 🦟 Bugs Fixed
 
@@ -23,29 +40,29 @@ If you prefer to play with Tectonic (and avoid **ugly chunk borders near new ter
 
 #### ✔️ Added Mods
 
-* [AdvancedAE](https://www.curseforge.com/minecraft/mc-mods/advancedae) (by [pedroksl](https://www.curseforge.com/members/pedroksl/projects))
-* [Aether Villages](https://www.curseforge.com/minecraft/mc-mods/aether-villages) (by [Aureljz](https://www.curseforge.com/members/Aureljz/projects))
-* [Applied Flux](https://www.curseforge.com/minecraft/mc-mods/applied-flux) (by [GlodBlock](https://www.curseforge.com/members/GlodBlock/projects))
-* [Ars Controle](https://www.curseforge.com/minecraft/mc-mods/ars-controle) (by [qther](https://www.curseforge.com/members/qther/projects))
-* [Cable Facades](https://www.curseforge.com/minecraft/mc-mods/cable-facades) (by [thepigcat76](https://www.curseforge.com/members/thepigcat76/projects))
-* [Corpse x Curios API Compat](https://www.curseforge.com/minecraft/mc-mods/corpse-x-curios-api-compat) (by [Project8gbDeRam](https://www.curseforge.com/members/Project8gbDeRam/projects))
-* [Forgified Fabric API](https://www.curseforge.com/minecraft/mc-mods/forgified-fabric-api) (by [Su5eD](https://www.curseforge.com/members/Su5eD/projects))
-* [Gateways to Eternity](https://www.curseforge.com/minecraft/mc-mods/gateways-to-eternity) (by [Shadows_of_Fire](https://www.curseforge.com/members/Shadows_of_Fire/projects))
-* [Industrial Foregoing Souls](https://www.curseforge.com/minecraft/mc-mods/industrial-foregoing-souls) (by [Buuz135](https://www.curseforge.com/members/Buuz135/projects))
-* [Iron's Spells 'n Spellbooks](https://www.curseforge.com/minecraft/mc-mods/irons-spells-n-spellbooks) (by [Iron431](https://www.curseforge.com/members/Iron431/projects))
-* [Open Sesame](https://www.curseforge.com/minecraft/mc-mods/open-sesame) (by [Quinn451](https://www.curseforge.com/members/Quinn451/projects))
-* [Oritech](https://www.curseforge.com/minecraft/mc-mods/oritech) (by [rearth](https://www.curseforge.com/members/rearth/projects))
-* [oωo (owo-lib)](https://www.curseforge.com/minecraft/mc-mods/owo-lib) (by [gliscowo](https://www.curseforge.com/members/gliscowo/projects))
-* [playerAnimator](https://www.curseforge.com/minecraft/mc-mods/playeranimator) (by [KosmX](https://www.curseforge.com/members/KosmX/projects))
-* [Pretty Pipes](https://www.curseforge.com/minecraft/mc-mods/pretty-pipes) (by [Ellpeck](https://www.curseforge.com/members/Ellpeck/projects))
-* [Pretty Pipes: Fluids](https://www.curseforge.com/minecraft/mc-mods/pretty-pipes-fluids) (by [Quarris](https://www.curseforge.com/members/Quarris/projects))
-* [Structure Layout Optimizer](https://www.curseforge.com/minecraft/mc-mods/structure-layout-optimizer) (by [telepathicgrunt](https://www.curseforge.com/members/telepathicgrunt/projects))
-* [The Aether](https://www.curseforge.com/minecraft/mc-mods/aether) (by [TheAetherTeam](https://www.curseforge.com/members/TheAetherTeam/projects))
+-   [AdvancedAE](https://www.curseforge.com/minecraft/mc-mods/advancedae) (by [pedroksl](https://www.curseforge.com/members/pedroksl/projects))
+-   [Aether Villages](https://www.curseforge.com/minecraft/mc-mods/aether-villages) (by [Aureljz](https://www.curseforge.com/members/Aureljz/projects))
+-   [Applied Flux](https://www.curseforge.com/minecraft/mc-mods/applied-flux) (by [GlodBlock](https://www.curseforge.com/members/GlodBlock/projects))
+-   [Ars Controle](https://www.curseforge.com/minecraft/mc-mods/ars-controle) (by [qther](https://www.curseforge.com/members/qther/projects))
+-   [Cable Facades](https://www.curseforge.com/minecraft/mc-mods/cable-facades) (by [thepigcat76](https://www.curseforge.com/members/thepigcat76/projects))
+-   [Corpse x Curios API Compat](https://www.curseforge.com/minecraft/mc-mods/corpse-x-curios-api-compat) (by [Project8gbDeRam](https://www.curseforge.com/members/Project8gbDeRam/projects))
+-   [Forgified Fabric API](https://www.curseforge.com/minecraft/mc-mods/forgified-fabric-api) (by [Su5eD](https://www.curseforge.com/members/Su5eD/projects))
+-   [Gateways to Eternity](https://www.curseforge.com/minecraft/mc-mods/gateways-to-eternity) (by [Shadows_of_Fire](https://www.curseforge.com/members/Shadows_of_Fire/projects))
+-   [Industrial Foregoing Souls](https://www.curseforge.com/minecraft/mc-mods/industrial-foregoing-souls) (by [Buuz135](https://www.curseforge.com/members/Buuz135/projects))
+-   [Iron's Spells 'n Spellbooks](https://www.curseforge.com/minecraft/mc-mods/irons-spells-n-spellbooks) (by [Iron431](https://www.curseforge.com/members/Iron431/projects))
+-   [Open Sesame](https://www.curseforge.com/minecraft/mc-mods/open-sesame) (by [Quinn451](https://www.curseforge.com/members/Quinn451/projects))
+-   [Oritech](https://www.curseforge.com/minecraft/mc-mods/oritech) (by [rearth](https://www.curseforge.com/members/rearth/projects))
+-   [oωo (owo-lib)](https://www.curseforge.com/minecraft/mc-mods/owo-lib) (by [gliscowo](https://www.curseforge.com/members/gliscowo/projects))
+-   [playerAnimator](https://www.curseforge.com/minecraft/mc-mods/playeranimator) (by [KosmX](https://www.curseforge.com/members/KosmX/projects))
+-   [Pretty Pipes](https://www.curseforge.com/minecraft/mc-mods/pretty-pipes) (by [Ellpeck](https://www.curseforge.com/members/Ellpeck/projects))
+-   [Pretty Pipes: Fluids](https://www.curseforge.com/minecraft/mc-mods/pretty-pipes-fluids) (by [Quarris](https://www.curseforge.com/members/Quarris/projects))
+-   [Structure Layout Optimizer](https://www.curseforge.com/minecraft/mc-mods/structure-layout-optimizer) (by [telepathicgrunt](https://www.curseforge.com/members/telepathicgrunt/projects))
+-   [The Aether](https://www.curseforge.com/minecraft/mc-mods/aether) (by [TheAetherTeam](https://www.curseforge.com/members/TheAetherTeam/projects))
 
 #### ❌ Removed Mods
 
-* [libIPN](https://www.curseforge.com/minecraft/mc-mods/libipn) (by [mirinimi](https://www.curseforge.com/members/mirinimi/projects))
-* [Tectonic](https://www.curseforge.com/minecraft/mc-mods/tectonic) (by [Apollo](https://www.curseforge.com/members/Apollo/projects))
+-   [libIPN](https://www.curseforge.com/minecraft/mc-mods/libipn) (by [mirinimi](https://www.curseforge.com/members/mirinimi/projects))
+-   [Tectonic](https://www.curseforge.com/minecraft/mc-mods/tectonic) (by [Apollo](https://www.curseforge.com/members/Apollo/projects))
 
 #### ⭐ Improvements
 

diff --git a/automation/settings.ps1 b/automation/settings.ps1
@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica10"
 $CLIENT_NAME = "Enigmatica10"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "1.14.1"
+$MODPACK_VERSION = "1.14.2"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "1.14.0"
+$LAST_MODPACK_VERSION = "1.14.1"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS

diff --git a/kubejs/server_scripts/constants/stoneworks.js b/kubejs/server_scripts/constants/stoneworks.js
@@ -16,7 +16,9 @@ const stoneworks = {
         'deeperdarker:gloomslate',
 
         'arts_and_crafts:soapstone',
-        'arts_and_crafts:gypsum'
+        'arts_and_crafts:gypsum',
+
+        'aether:holystone'
     ],
     cobblestones: [
         'minecraft:cobblestone',

diff --git a/kubejs/server_scripts/recipes/actuallyadditions/crushing.js b/kubejs/server_scripts/recipes/actuallyadditions/crushing.js
@@ -13,66 +13,6 @@ ServerEvents.recipes((event) => {
             ],
             id: `${id_prefix}silicon`
         },
-        {
-            ingredient: { tag: `c:gems/certus_quartz` },
-            result: [{ result: { id: 'ae2:certus_quartz_dust', count: 1 } }],
-            id: `${id_prefix}certus_quartz_dust`
-        },
-        {
-            ingredient: { tag: `c:gems/fluix` },
-            result: [{ result: { id: 'ae2:fluix_dust', count: 1 } }],
-            id: `${id_prefix}fluix_dust`
-        },
-        {
-            ingredient: { tag: `c:gems/lignite_coal` },
-            result: [{ result: { id: 'modern_industrialization:lignite_coal_dust', count: 1 } }],
-            id: `${id_prefix}lignite_coal_dust`
-        },
-        {
-            ingredient: { item: 'minecraft:glow_berries' },
-            result: [{ result: { id: 'minecraft:yellow_dye', count: 2 } }],
-            id: `${id_prefix}yellow_dye_from_glow_berries`
-        },
-        {
-            ingredient: { item: 'minecraft:ender_pearl' },
-            result: [{ result: { id: AlmostUnified.getTagTargetItem(`c:dusts/ender_pearl`).getId(), count: 1 } }],
-            id: `${id_prefix}ender_pearl_dust`
-        },
-        {
-            ingredient: { item: 'ae2:sky_stone_block' },
-            result: [{ result: { id: 'ae2:sky_dust', count: 1 } }],
-            id: `${id_prefix}sky_dust`
-        },
-        {
-            ingredient: { tag: 'c:obsidians' },
-            result: [{ result: { id: AlmostUnified.getTagTargetItem(`c:dusts/obsidian`).getId(), count: 4 } }],
-            id: `${id_prefix}obsidian`
-        },
-        {
-            ingredient: { item: 'advanced_ae:shattered_singularity' },
-            result: [{ result: { id: 'advanced_ae:quantum_infused_dust', count: 1 } }],
-            id: `${id_prefix}quantum_infused_dust`
-        },
-        {
-            ingredient: { item: 'oritech:adamant_ingot' },
-            result: [{ result: { id: 'oritech:adamant_dust', count: 1 } }],
-            id: `${id_prefix}adamant_dust`
-        },
-        {
-            ingredient: { item: 'oritech:biosteel_ingot' },
-            result: [{ result: { id: 'oritech:biosteel_dust', count: 1 } }],
-            id: `${id_prefix}biosteel_dust`
-        },
-        {
-            ingredient: { item: 'oritech:duratium_ingot' },
-            result: [{ result: { id: 'oritech:duratium_dust', count: 1 } }],
-            id: `${id_prefix}duratium_dust`
-        },
-        {
-            ingredient: { item: 'oritech:energite_ingot' },
-            result: [{ result: { id: 'oritech:energite_dust', count: 1 } }],
-            id: `${id_prefix}energite_dust`
-        },
         {
             ingredient: { item: 'minecraft:ink_sac' },
             result: [{ result: { id: 'minecraft:black_dye', count: 2 } }],
@@ -132,32 +72,10 @@ ServerEvents.recipes((event) => {
                     }
                 ],
                 id: `${id_prefix}raw_${material.primary}`
-            },
-            {
-                ingredient: { tag: `c:ingots/${material.primary}` },
-                result: [
-                    {
-                        result: {
-                            id: AlmostUnified.getTagTargetItem(`c:dusts/${material.primary}`).getId(),
-                            count: 1
-                        }
-                    },
-                    { result: {}, chance: 0.0 }
-                ],
-                id: `${id_prefix}${material.primary}`
             }
         );
     });
 
-    materials = ['coal', 'charcoal', 'diamond', 'emerald', 'lapis', 'fluorite', 'quartz'];
-    materials.forEach((material) => {
-        recipes.push({
-            ingredient: { tag: `c:gems/${material}` },
-            result: [{ result: { id: AlmostUnified.getTagTargetItem(`c:dusts/${material}`).getId(), count: 1 } }],
-            id: `${id_prefix}${material}_dust`
-        });
-    });
-
     recipes.forEach((recipe) => {
         recipe.type = 'actuallyadditions:crushing';
         event.custom(recipe).id(recipe.id);