WIP: Add Applied Energistics 2 (& Submods) #12

Draft

cswimr wants to merge 8 commits from mod/ae2 into trunk

pull from: mod/ae2

merge into: GalacticFactory:trunk

GalacticFactory:trunk

GalacticFactory:mod/relics-artifacts

Conversation 0 Commits 8 Files changed 25 +502 -15

cswimr commented 2026-04-21 17:49:51 -04:00

Owner

Copy link

Add Applied Energistics 2 (& Submods)

Closes #10. Implements the changes discussed in that issue.

• I carefully read the contribution guidelines.
• I acknowledge that, by submitting this pull request, I permit the GalacticFactory team to license its contents under Version 3 of the Open Software License.

# Add Applied Energistics 2 (& Submods) Closes #10. Implements the changes discussed in that issue. - [x] I carefully read the [contribution guidelines](https://c.csw.im/GalacticFactory/ClockworkAviation/src/branch/trunk/CONTRIBUTING.md). - [x] I acknowledge that, by submitting this pull request, I permit the GalacticFactory team to license its contents under [Version 3 of the Open Software License](https://c.csw.im/GalacticFactory/ClockworkAviation/src/branch/trunk/LICENSE.md).

cswimr added the

mod discussion

label 2026-04-21 17:49:51 -04:00

cswimr self-assigned this 2026-04-21 17:49:51 -04:00

cswimr added 1 commit 2026-04-21 17:49:51 -04:00

add ae2 & submods; disable meteorites 959aa5ed50

cswimr force-pushed mod/ae2 from 959aa5ed50 to 18d9906bf6 2026-04-21 22:49:56 -04:00 Compare

cswimr added 1 commit 2026-04-21 22:53:39 -04:00

add glodium; update modlist 4919941ccc

cswimr added 1 commit 2026-04-21 23:25:05 -04:00

kubejs stuff 94355a4138

cswimr added 1 commit 2026-04-22 10:43:49 -04:00

Merge branch 'trunk' into mod/ae2 31327c5e5a

cswimr added 1 commit 2026-04-23 10:08:32 -04:00

Merge branch 'trunk' into mod/ae2 b7c4d15704

cswimr added 1 commit 2026-04-23 13:45:08 -04:00

Merge branch 'trunk' into mod/ae2 b7ce51200f

cswimr added 1 commit 2026-04-23 14:00:33 -04:00

fix meteorite disabling not working fb2bb87085

cswimr added 1 commit 2026-04-23 18:52:17 -04:00

Merge branch 'trunk' into mod/ae2 8393484d53

All checks were successful

Hide all checks

Actions / Generate Export Artifacts (pull_request) Successful in 13s

Required

Details

Actions / Verify Packwiz Hashes (pull_request) Successful in 30s

Required

Details

This pull request has changes conflicting with the target branch.

• pack.toml

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title WIP: Add Applied Energistics 2 (& Submods) (#12)

Merge commit body Reviewed-on: https://c.csw.im/GalacticFactory/ClockworkAviation/pulls/12

WIP: Add Applied Energistics 2 (& Submods) (#12) Reviewed-on: https://c.csw.im/GalacticFactory/ClockworkAviation/pulls/12 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin mod/ae2:mod/ae2

git switch mod/ae2

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

enhancement

  

kubejs

  

mod discussion

  

mod replacement

  

renovate

This issue is a dependency update propogated by Renovate

  

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

question

More information is needed

  

upstream

Issue is known, but is pending a fix from another entity

  

wontfix

This issue is known, but will not be fixed

No labels

enhancement

kubejs

mod discussion

mod replacement

renovate

bug

duplicate

question

upstream

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

cswimr

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

GalacticFactory/ClockworkAviation!12

No description provided.