Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Feb 1, 2025
2 parents f3f0573 + 020fa17 commit f771d77
Show file tree
Hide file tree
Showing 11 changed files with 817 additions and 390 deletions.
2 changes: 1 addition & 1 deletion .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ Re-run the script `update-server` whenever you want to update to a new modpack v

- [CurseForge (expert)](https://www.curseforge.com/minecraft/modpacks/enigmatica6expert)

- [Discord](https://discord.gg/HnWNd7X)
- [Discord](https://discord.gg/enigmatica)
12 changes: 6 additions & 6 deletions .github/actions/ci/node/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ on:

jobs:
support-requests:
uses: NillerMedDild/.github/.github/workflows/support.yml@master
uses: EnigmaticaModpacks/.github/.github/workflows/support.yml@master
720 changes: 361 additions & 359 deletions MODLIST.md

Large diffs are not rendered by default.

46 changes: 29 additions & 17 deletions automation/node/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion automation/node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@octokit/rest": "^18.12.0",
"axios": "^0.27.2"
"axios": "^0.28.0"
}
}
15 changes: 12 additions & 3 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,25 @@

_Using Forge-1.16.5-36.2.39_ | _[Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica6/blob/master/changelogs/changelog_mods_1.10.0.md)_ | _[Modlist](https://github.com/EnigmaticaModpacks/Enigmatica6/blob/master/changelogs/modlist_1.10.0.md)_

**New Mods**

- [Searchables](https://www.curseforge.com/minecraft/mc-mods/searchables) (by [Jaredlll08](https://www.curseforge.com/members/Jaredlll08/projects))
- [Structure Layout Optimizer](https://www.curseforge.com/minecraft/mc-mods/structure-layout-optimizer) (by [telepathicgrunt](https://www.curseforge.com/members/telepathicgrunt/projects))


**Improvements**

- Add new recipe for converting Celestial Combs to Starmetal [\#5458](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5458) ([MuteTiefling](https://github.com/MuteTiefling))
- Tree of Life structure no longer checks for Wisteria to avoid issues with placement [\#5459](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5459) ([MuteTiefling](https://github.com/MuteTiefling))

**Bug fixes**

- Fix IE assembler being unable to craft capacitors [\#5447](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5447) ([MuteTiefling](https://github.com/MuteTiefling))
- Fix issues with Necrotic Bones in Tinker's quests [\#5464](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5464) ([MuteTiefling](https://github.com/MuteTiefling))
- Remove invalid scene from hive ponder [\#5464](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5464) ([MuteTiefling](https://github.com/MuteTiefling))
- Fixed IE assembler being unable to craft capacitors. [#5447](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5447) ([MuteTiefling](https://github.com/MuteTiefling))
- Resolved issues with Necrotic Bones in Tinker's quests. [#5464](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5464) ([MuteTiefling](https://github.com/MuteTiefling))
- Removed invalid scene from hive ponder. [#5464](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5464) ([MuteTiefling](https://github.com/MuteTiefling))
- Addressed automation issue with Astral bee combs not being processable in the intended multiblock structure. [#5457](https://github.com/EnigmaticaModpacks/Enigmatica6/issues/5457)
- Resolved issue where IE Assembler's fluid crafting required filled buckets instead of using stored fluids. [#5446](https://github.com/EnigmaticaModpacks/Enigmatica6/issues/5446)


### Enigmatica 6 & Enigmatica 6: Expert v1.9.0

Expand Down
42 changes: 42 additions & 0 deletions changelogs/changelog_mods_1.10.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
## Enigmatica6 - 1.9.0 -> 1.10.0

### Added

* [Searchables](https://www.curseforge.com/minecraft/mc-mods/searchables) (by [Jaredlll08](https://www.curseforge.com/members/Jaredlll08/projects))
* [Structure Layout Optimizer](https://www.curseforge.com/minecraft/mc-mods/structure-layout-optimizer) (by [telepathicgrunt](https://www.curseforge.com/members/telepathicgrunt/projects))

### Changed

* [BHMenu-Forge-1.16.5-2.4.1.jar](https://www.curseforge.com/minecraft/mc-mods/bisecthosting-server-integration-menu-forge/files/4743098) -> [BHMenu-Forge-1.16.5-2.4.2.jar](https://www.curseforge.com/minecraft/mc-mods/bisecthosting-server-integration-menu-forge/files/5762045)
* [cloth-config-4.17.101-forge.jar](https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/4633366) -> [cloth-config-4.17.132-forge.jar](https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/5729083)
* [connectedglass-1.1.9-forge-mc1.16.jar](https://www.curseforge.com/minecraft/mc-mods/connected-glass/files/4870871) -> [connectedglass-1.1.12-forge-mc1.16.jar](https://www.curseforge.com/minecraft/mc-mods/connected-glass/files/5656945)
* [Controlling-7.0.0.29.jar](https://www.curseforge.com/minecraft/mc-mods/controlling/files/4421016) -> [Controlling-7.0.0.31.jar](https://www.curseforge.com/minecraft/mc-mods/controlling/files/5165701)
* [CosmeticArmorReworked-1.16.5-v5.jar](https://www.curseforge.com/minecraft/mc-mods/cosmetic-armor-reworked/files/3738137) -> [CosmeticArmorReworked-1.16.5-v5a.jar](https://www.curseforge.com/minecraft/mc-mods/cosmetic-armor-reworked/files/5131968)
* [curiouselytra-forge-1.16.5-4.0.2.4.jar](https://www.curseforge.com/minecraft/mc-mods/elytra-slot/files/3522097) -> [curiouselytra-forge-1.16.5-4.0.2.5.jar](https://www.curseforge.com/minecraft/mc-mods/elytra-slot/files/5408254)
* [EnchantmentDescriptions-1.16.5-7.1.23.jar](https://www.curseforge.com/minecraft/mc-mods/enchantment-descriptions/files/4757009) -> [EnchantmentDescriptions-1.16.5-7.1.27.jar](https://www.curseforge.com/minecraft/mc-mods/enchantment-descriptions/files/5266527)
* [entangled-1.3.16-forge-mc1.16.jar](https://www.curseforge.com/minecraft/mc-mods/entangled/files/4720106) -> [entangled-1.3.20-forge-mc1.16.jar](https://www.curseforge.com/minecraft/mc-mods/entangled/files/5885901)
* [fusion-1.1.0-forge-mc1.16.jar](https://www.curseforge.com/minecraft/mc-mods/fusion-connected-textures/files/4855772) -> [fusion-1.2.3-forge-mc1.16.jar](https://www.curseforge.com/minecraft/mc-mods/fusion-connected-textures/files/6108223)
* [industrial-foregoing-1.16.5-3.2.14.7-16.jar](https://www.curseforge.com/minecraft/mc-mods/industrial-foregoing/files/3525789) -> [industrial-foregoing-1.16.5-3.2.14.8-20.jar](https://www.curseforge.com/minecraft/mc-mods/industrial-foregoing/files/5334823)
* [journeymap-1.16.5-5.8.5p6.jar](https://www.curseforge.com/minecraft/mc-mods/journeymap/files/4012858) -> [journeymap-1.16.5-5.8.6.jar](https://www.curseforge.com/minecraft/mc-mods/journeymap/files/5546771)
* [JustEnoughCalculation-1.16.5-3.8.6.jar](https://www.curseforge.com/minecraft/mc-mods/just-enough-calculation/files/3524695) -> [JustEnoughCalculation-1.16.5-3.9.2.jar](https://www.curseforge.com/minecraft/mc-mods/just-enough-calculation/files/3947666)
* [jei-1.16.5-7.8.0.1009.jar](https://www.curseforge.com/minecraft/mc-mods/jei/files/4371666) -> [jei-1.16.5-7.8.0.1013.jar](https://www.curseforge.com/minecraft/mc-mods/jei/files/5846870)
* [lootr-1.16.5-0.2.18.49.jar](https://www.curseforge.com/minecraft/mc-mods/lootr/files/4596216) -> [lootr-1.16.5-0.2.19.51.jar](https://www.curseforge.com/minecraft/mc-mods/lootr/files/5229088)
* [mcw-bridges-2.1.0-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-bridges/files/4599793) -> [mcw-bridges-3.0.1-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-bridges/files/5465206)
* [mcw-doors-1.1.0forge-mc1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-doors/files/4649900) -> [mcw-doors-1.1.2-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-doors/files/6146365)
* [mcw-fences-1.0.7-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-fences-and-walls/files/4203536) -> [mcw-fences-1.1.2-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-fences-and-walls/files/5442205)
* [mcw-roofs-2.2.4-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-roofs/files/4590021) -> [mcw-roofs-2.3.1-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-roofs/files/5554945)
* [mcw-trapdoors-1.1.2-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-trapdoors/files/4841541) -> [mcw-trapdoors-1.1.4-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-trapdoors/files/5977646)
* [mcw-windows-2.2.0-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-windows/files/4750667) -> [mcw-windows-2.3.0-mc1.16.5forge.jar](https://www.curseforge.com/minecraft/mc-mods/macaws-windows/files/5589351)
* [[1.16.5]_More_Crafting _Tables_Forge_2.3.0.jar](https://www.curseforge.com/minecraft/mc-mods/more-crafting-tables-for-forge/files/4734101) -> [[1.16.5]MoreCraftingTables-2.3.1.jar](https://www.curseforge.com/minecraft/mc-mods/more-crafting-tables-for-forge/files/5286563)
* [moreoverlays-1.18.19-mc1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/more-overlays-updated/files/3924673) -> [moreoverlays-1.18.20-mc1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/more-overlays-updated/files/5377022)
* [refinedcrafterproxy-1.1.0.jar](https://www.curseforge.com/minecraft/mc-mods/refined-crafter-proxy/files/4581365) -> [refinedcrafterproxy-1.1.1.jar](https://www.curseforge.com/minecraft/mc-mods/refined-crafter-proxy/files/5199813)
* [RoadRunner-mc1.16.5-1.4.1.jar](https://www.curseforge.com/minecraft/mc-mods/roadrunner/files/3683120) -> [RoadRunner-mc1.16.5-1.5.2.jar](https://www.curseforge.com/minecraft/mc-mods/roadrunner/files/5730350)
* [SpawnerFix-1.16.2-1.0.0.2.jar](https://www.curseforge.com/minecraft/mc-mods/spawner-fix/files/3161147) -> [SpawnerFix-1.16.2-1.0.0.3.jar](https://www.curseforge.com/minecraft/mc-mods/spawner-fix/files/5962957)
* [supermartijn642corelib-1.1.15-forge-mc1.16.jar](https://www.curseforge.com/minecraft/mc-mods/supermartijn642s-core-lib/files/4788123) -> [supermartijn642corelib-1.1.18-forge-mc1.16.jar](https://www.curseforge.com/minecraft/mc-mods/supermartijn642s-core-lib/files/6034707)
* [supplementaries-1.16.5-0.18.7.jar](https://www.curseforge.com/minecraft/mc-mods/supplementaries/files/4802243) -> [supplementaries-1.16.5-0.18.5.jar](https://www.curseforge.com/minecraft/mc-mods/supplementaries/files/4967874)
* [tetranomicon-1.4-1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/tetranomicon/files/4393255) -> [tetranomicon-1.5.3-1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/tetranomicon/files/5097650)
* [titanium-1.16.5-3.2.8.8-24.jar](https://www.curseforge.com/minecraft/mc-mods/titanium/files/4786603) -> [titanium-1.16.5-3.2.8.9-25.jar](https://www.curseforge.com/minecraft/mc-mods/titanium/files/5174863)
* [ToolStats-1.16.5-6.1.6.jar](https://www.curseforge.com/minecraft/mc-mods/tool-stats/files/4457857) -> [ToolStats-1.16.5-6.1.7.jar](https://www.curseforge.com/minecraft/mc-mods/tool-stats/files/4957714)
* [u_team_core-1.16.5-3.2.1.258.jar](https://www.curseforge.com/minecraft/mc-mods/u-team-core/files/4583205) -> [u_team_core-forge-1.16.5-3.2.1.342.jar](https://www.curseforge.com/minecraft/mc-mods/u-team-core/files/6050163)
* [Undergarden-Tetra Patch-1.3.1-1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/undergarden-tetra-patch/files/4369665) -> [Undergarden-Tetra Patch-1.3.4-1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/undergarden-tetra-patch/files/6100123)

Loading

0 comments on commit f771d77

Please sign in to comment.